diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-04-24 22:57:24 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-04-24 22:57:24 -0700 |
| commit | 41bc967808bff9add8f75b441169a4ba46213f24 (patch) | |
| tree | 2ba2e4c2c204a43f509fb87674550aef8f6ca261 /modules | |
| parent | 10f117238a4302092fdfb71a02542281f2b2d356 (diff) | |
| parent | 1950f9c46652d76b8734df3b08bfcf4a4ffeb6fb (diff) | |
Merge branch 'master' of git://github.com/ckieffer/gallery3
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/g2_import/views/admin_g2_import.html.php | 4 | ||||
| -rw-r--r-- | modules/gallery/controllers/admin_theme_options.php | 1 | ||||
| -rw-r--r-- | modules/gallery/views/admin_block_welcome.html.php | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index cf5e4755..2f4a1b28 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -112,8 +112,8 @@ $("document").ready(function() { </p> <? endif ?> </div> - <div id="g-admin-g2-import-notes"> - <ul class="enumeration"> + <div id="g-admin-g2-import-notes" class="g-text"> + <ul> <li> <?= t("Gallery 3 does not support per-user / per-item permissions. <b>Review permissions!</b>") ?> </li> diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php index a968a56d..d9323ea0 100644 --- a/modules/gallery/controllers/admin_theme_options.php +++ b/modules/gallery/controllers/admin_theme_options.php @@ -108,7 +108,6 @@ class Admin_Theme_Options_Controller extends Admin_Controller { module::event("theme_edit_form", $form); - $group = $form->group("buttons"); $group->submit("")->value(t("Save")); return $form; } diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php index d8c96187..d3765d19 100644 --- a/modules/gallery/views/admin_block_welcome.html.php +++ b/modules/gallery/views/admin_block_welcome.html.php @@ -2,7 +2,7 @@ <p> <?= t("This is your administration dashboard and it provides a quick overview of status messages, recent updates, and frequently used options. Add or remove blocks and rearrange them to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options and settings. Here are a few of the most used options to get you started.") ?> </p> -<ul> +<ul class="g-text"> <li> <?= t("General Settings - choose your <a href=\"%graphics_url\">graphics</a> and <a href=\"%language_url\">language</a> settings.", array("graphics_url" => html::mark_clean(url::site("admin/graphics")), |