Merge branch 'master' into talmdal_dev

Conflicts:
	lib/gallery.common.css
	themes/admin_wind/views/admin.html.php
	themes/night_wind/views/sidebar.html.php
	themes/wind/views/sidebar.html.php
This commit is contained in:
Tim Almdal
2009-10-18 09:28:48 -07:00
26 changed files with 171 additions and 187 deletions

View File

@@ -106,7 +106,7 @@
</div>
</div>
<div id="g-group-admin" class="g-block g-clearfix">
<div id="g-group-admin" class="g-block ui-helper-clearfix">
<a href="<?= url::site("admin/users/add_group_form") ?>"
class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
title="<?= t("Create a new group")->for_html_attr() ?>">