diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/helpers/gallery_theme.php | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/module.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/login.html.php | 4 | ||||
| -rw-r--r-- | modules/organize/css/organize.css | 2 | ||||
| -rw-r--r-- | modules/organize/views/organize_dialog.html.php | 2 | ||||
| -rw-r--r-- | modules/tag/views/admin_tags.html.php | 50 | ||||
| -rw-r--r-- | modules/user/module.info | 5 |
7 files changed, 34 insertions, 33 deletions
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php index 49a458b7..3fcaca67 100644 --- a/modules/gallery/helpers/gallery_theme.php +++ b/modules/gallery/helpers/gallery_theme.php @@ -102,7 +102,7 @@ class gallery_theme_Core { } static function credits() { - return "<li class=\"first\">" . + return "<li class=\"g-first\">" . t(module::get_var("gallery", "credits"), array("url" => "http://gallery.menalto.com", "version" => gallery::VERSION)) . "</li>"; diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php index 27bc3784..da334370 100644 --- a/modules/gallery/helpers/module.php +++ b/modules/gallery/helpers/module.php @@ -98,7 +98,7 @@ class module_Core { $m->active = self::is_active($module_name); $m->code_version = $m->version; $m->version = self::get_version($module_name); - $m->locked = false; + $m->locked = !empty($m->no_module_admin); } // Lock certain modules diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php index ae709c7c..0e0d9039 100644 --- a/modules/gallery/views/login.html.php +++ b/modules/gallery/views/login.html.php @@ -1,13 +1,13 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <ul id="g-login-menu" class="g-inline"> <? if ($user->guest): ?> - <li class="first"> + <li class="g-first"> <a href="<?= url::site("login/ajax") ?>" title="<?= t("Login to Gallery")->for_html_attr() ?>" id="g-login-link" class="g-dialog-link"><?= t("Login") ?></a> </li> <? else: ?> - <li class="first"> + <li class="g-first"> <? if (identity::is_writable()): ?> <?= t('Logged in as %name', array('name' => html::mark_clean( '<a href="' . url::site("form/edit/users/{$user->id}") . diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css index afa89229..89c6c027 100644 --- a/modules/organize/css/organize.css +++ b/modules/organize/css/organize.css @@ -14,7 +14,7 @@ width: 75%; } -#g-organize .yui-gf .first { +#g-organize .yui-gf .g-first { width: 25%; } diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 7dcb01d9..cf8e9004 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -9,7 +9,7 @@ <h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1> <div id="bd"> <div class="yui-gf"> - <div class="yui-u first"> + <div class="yui-u g-first"> <h3><?= t("Albums") ?></h3> </div> <div id="g-action-status" class="g-message-block yui-u"> diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 3e333817..10d7921a 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -28,34 +28,32 @@ </caption> <tr> <td> - <? foreach ($tags as $i => $tag): ?> - <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?> + <? foreach ($tags as $i => $tag): ?> + <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?> - <? if ($i == 0): /* first letter */ ?> - <strong><?= html::clean($current_letter) ?></strong> - <ul> - <? elseif ($last_letter != $current_letter): /* new letter */ ?> - <? if ($column_tag_count > $tags_per_column): /* new column */ ?> - </td> - <td> - <? $column_tag_count = 0 ?> - <? endif ?> - </ul> - <strong><?= html::clean($current_letter) ?></strong> - <ul> + <? if ($i == 0): /* first letter */ ?> + <strong><?= html::clean($current_letter) ?></strong> + <ul> + <? elseif ($last_letter != $current_letter): /* new letter */ ?> + </ul> + <? if ($column_tag_count > $tags_per_column): /* new column */ ?> + <? $column_tag_count = 0 ?> + </td> + <td> <? endif ?> - - <li> - <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span> - <span class="g-understate">(<?= $tag->count ?>)</span> - <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" - class="g-dialog-link g-delete-link g-button"> - <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a> - </li> - - <? $column_tag_count++ ?> - <? $last_letter = $current_letter ?> - <? endforeach /* $tags */ ?> + <strong><?= html::clean($current_letter) ?></strong> + <ul> + <? endif ?> + <li> + <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span> + <span class="g-understate">(<?= $tag->count ?>)</span> + <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" + class="g-dialog-link g-delete-link g-button"> + <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a> + </li> + <? $column_tag_count++ ?> + <? $last_letter = $current_letter ?> + <? endforeach ?> </ul> </td> </tr> diff --git a/modules/user/module.info b/modules/user/module.info index 8a9af407..36a2179a 100644 --- a/modules/user/module.info +++ b/modules/user/module.info @@ -1,3 +1,6 @@ name = "Users and Groups" -description = "Provides user and group management" +description = "Gallery 3 user and group management" version = 1 + +; Don't show this module on the module administration screen +no_module_admin = 1 |