diff options
Diffstat (limited to 'modules')
18 files changed, 852 insertions, 815 deletions
diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php index 22c60c97..d273be5b 100644 --- a/modules/akismet/views/admin_akismet.html.php +++ b/modules/akismet/views/admin_akismet.html.php @@ -1,17 +1,18 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-admin-akismet"> +<div id="g-admin-akismet" class="g-block"> <h1> <?= t("Akismet Spam Filtering") ?> </h1> <p> <?= t("Akismet is a free, automated spam filtering service. In order to use it, you need to sign up for a <a href=\"%api_key_url\">Wordpress.com API Key</a>, which is also free. Your comments will be automatically relayed to <a href=\"%akismet_url\">Akismet.com</a> where they'll be scanned for spam. Spam messages will be flagged accordingly and hidden from your vistors until you approve or delete them.", array("api_key_url" => "http://wordpress.com/api-keys", "akismet_url" => "http://akismet.com")) ?> </p> + <div class="g-block-content"> + <? if ($valid_key): ?> + <div class="g-module-status g-success"> + <?= t("Your API Key is valid. Your comments will be filtered!") ?> + </div> + <? endif ?> - <? if ($valid_key): ?> - <div class="g-module-status g-success"> - <?= t("Your API Key is valid. Your comments will be filtered!") ?> + <?= $form ?> </div> - <? endif ?> - - <?= $form ?> </div> diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 8f719f05..82e071a8 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -34,165 +34,168 @@ } </script> -<div id="g-admin-comments"> +<div id="g-admin-comments" class="g-block"> <h1> <?= t("Manage Comments") ?> </h1> - <!-- @todo: Highlight active menu option --> - <div id="g-admin-comments-menu" class="ui-helper-clearfix"> - <?= $menu ?> - </div> + <div class="g-block-content"> + <!-- @todo: Highlight active menu option --> + <div id="g-admin-comments-menu" class="ui-helper-clearfix"> + <?= $menu ?> + </div> - <!-- @todo: Remove after setting active option? --> - <h2> - <? if ($state == "published"): ?> - <?= t("Approved Comments") ?> - <? elseif ($state == "unpublished"): ?> - <?= t("Comments Awaiting Moderation") ?> - <? elseif ($state == "spam"): ?> - <?= t("Spam Comments") ?> - <? elseif ($state == "deleted"): ?> - <?= t("Recently Deleted Comments") ?> - <? endif ?> - </h2> + <!-- @todo: Remove after setting active option? --> + <h2> + <? if ($state == "published"): ?> + <?= t("Approved Comments") ?> + <? elseif ($state == "unpublished"): ?> + <?= t("Comments Awaiting Moderation") ?> + <? elseif ($state == "spam"): ?> + <?= t("Spam Comments") ?> + <? elseif ($state == "deleted"): ?> + <?= t("Recently Deleted Comments") ?> + <? endif ?> + </h2> - <? if ($state == "spam"): ?> - <div> - <? $spam_caught = module::get_var("comment", "spam_caught") ?> - <? if ($spam_caught > 0): ?> - <p> - <?= t2("Gallery has caught %count spam for you since you installed spam filtering.", - "Gallery has caught %count spam for you since you installed spam filtering.", - $spam_caught) ?> - </p> - <? endif ?> - <p> - <? if ($counts->spam): ?> - <?= t2("There is currently one comment in your spam queue. You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.", - "There are currently %count comments in your spam queue. You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam. All spam messages will be deleted after 7 days automatically.", - $counts->spam) ?> - </p> - <p> - <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>"> - <?= t("Delete all spam") ?> - </a> - <? else: ?> - <?= t("Your spam queue is empty!") ?> + <? if ($state == "spam"): ?> + <div> + <? $spam_caught = module::get_var("comment", "spam_caught") ?> + <? if ($spam_caught > 0): ?> + <p> + <?= t2("Gallery has caught %count spam for you since you installed spam filtering.", + "Gallery has caught %count spam for you since you installed spam filtering.", + $spam_caught) ?> + </p> <? endif ?> - </p> - </div> - <? endif ?> + <p> + <? if ($counts->spam): ?> + <?= t2("There is currently one comment in your spam queue. You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.", + "There are currently %count comments in your spam queue. You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam. All spam messages will be deleted after 7 days automatically.", + $counts->spam) ?> + </p> + <p> + <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>"> + <?= t("Delete all spam") ?> + </a> + <? else: ?> + <?= t("Your spam queue is empty!") ?> + <? endif ?> + </p> + </div> + <? endif ?> - <? if ($state == "deleted"): ?> - <div> - <p> - <?= t("These are messages that have been recently deleted. They will be permanently erased automatically after 7 days.") ?> - </p> - </div> - <? endif ?> + <? if ($state == "deleted"): ?> + <div> + <p> + <?= t("These are messages that have been recently deleted. They will be permanently erased automatically after 7 days.") ?> + </p> + </div> + <? endif ?> - <table id="g-admin-comments-list"> - <tr> - <th> - <?= t("Author") ?> - </th> - <th> - <?= t("Comment") ?> - </th> - <th> - <?= t("Actions") ?> - </th> - </tr> - <? foreach ($comments as $i => $comment): ?> - <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>"> - <td> - <a href="#"> - <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>" - class="g-avatar" - alt="<?= html::clean_attribute($comment->author_name()) ?>" - width="40" - height="40" /> - </a> - <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>" - title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p> - </td> - <td> - <div class="g-right"> - <? $item = $comment->item() ?> - <div class="g-item g-photo"> - <a href="<?= $item->url() ?>"> - <? if ($item->has_thumb()): ?> - <img src="<?= $item->thumb_url() ?>" - alt="<?= html::purify($item->title)->for_html_attr() ?>" - <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?> - /> - <? else: ?> - <?= t("No thumbnail") ?> - <? endif ?> - </a> + <table id="g-admin-comments-list"> + <tr> + <th> + <?= t("Author") ?> + </th> + <th> + <?= t("Comment") ?> + </th> + <th> + <?= t("Actions") ?> + </th> + </tr> + <? foreach ($comments as $i => $comment): ?> + <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>"> + <td> + <a href="#"> + <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>" + class="g-avatar" + alt="<?= html::clean_attribute($comment->author_name()) ?>" + width="40" + height="40" /> + </a> + <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>" + title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p> + </td> + <td> + <div class="g-right"> + <? $item = $comment->item() ?> + <div class="g-item g-photo"> + <a href="<?= $item->url() ?>"> + <? if ($item->has_thumb()): ?> + <img src="<?= $item->thumb_url() ?>" + alt="<?= html::purify($item->title)->for_html_attr() ?>" + <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?> + /> + <? else: ?> + <?= t("No thumbnail") ?> + <? endif ?> + </a> + </div> </div> - </div> - <p><?= gallery::date($comment->created) ?></p> - <?= nl2br(html::purify($comment->text)) ?> - </td> - <td> - <ul class="g-buttonset-vertical"> - <? if ($comment->state != "unpublished"): ?> - <li> - <a href="javascript:set_state('unpublished',<?=$comment->id?>)" - class="g-button ui-state-default ui-icon-left"> - <span class="ui-icon ui-icon-check"></span> - <?= t("Unapprove") ?> - </a> - </li> - <? endif ?> - <? if ($comment->state != "published"): ?> - <li> - <a href="javascript:set_state('published',<?=$comment->id?>)" - class="g-button ui-state-default ui-icon-left"> - <span class="ui-icon ui-icon-check"></span> - <?= t("Approve") ?> - </a> - </li> - <? endif ?> - <? if ($comment->state != "spam"): ?> - <li> - <a href="javascript:set_state('spam',<?=$comment->id?>)" - class="g-button ui-state-default ui-icon-left"> - <span class="ui-icon ui-icon-cancel"></span> - <?= t("Spam") ?> - </a> - </li> - <? endif ?> - <!-- - <li> - <a href="javascript:reply(<?=$comment->id?>)" - class="g-button ui-state-default ui-icon-left"> - <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span> - <?= t("Reply") ?> - </a> - </li> - <li> - <a href="javascript:Edit(<?=$comment->id?>)" - class="g-button ui-state-default ui-icon-left"> - <span class="ui-icon ui-icon-pencil"></span> - <?= t("Edit") ?> - </a> - </li> - --> - <li> - <a href="javascript:set_state('deleted',<?=$comment->id?>)" - class="g-button ui-state-default ui-icon-left"> - <span class="ui-icon ui-icon-trash"></span> - <?= t("Delete") ?> - </a> - </li> - </ul> - </td> - </tr> - <? endforeach ?> - </table> + <p><?= gallery::date($comment->created) ?></p> + <?= nl2br(html::purify($comment->text)) ?> + </td> + <td> + <ul class="g-buttonset-vertical"> + <? if ($comment->state != "unpublished"): ?> + <li> + <a href="javascript:set_state('unpublished',<?=$comment->id?>)" + class="g-button ui-state-default ui-icon-left"> + <span class="ui-icon ui-icon-check"></span> + <?= t("Unapprove") ?> + </a> + </li> + <? endif ?> + <? if ($comment->state != "published"): ?> + <li> + <a href="javascript:set_state('published',<?=$comment->id?>)" + class="g-button ui-state-default ui-icon-left"> + <span class="ui-icon ui-icon-check"></span> + <?= t("Approve") ?> + </a> + </li> + <? endif ?> + <? if ($comment->state != "spam"): ?> + <li> + <a href="javascript:set_state('spam',<?=$comment->id?>)" + class="g-button ui-state-default ui-icon-left"> + <span class="ui-icon ui-icon-cancel"></span> + <?= t("Spam") ?> + </a> + </li> + <? endif ?> + <!-- + <li> + <a href="javascript:reply(<?=$comment->id?>)" + class="g-button ui-state-default ui-icon-left"> + <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span> + <?= t("Reply") ?> + </a> + </li> + <li> + <a href="javascript:Edit(<?=$comment->id?>)" + class="g-button ui-state-default ui-icon-left"> + <span class="ui-icon ui-icon-pencil"></span> + <?= t("Edit") ?> + </a> + </li> + --> + <li> + <a href="javascript:set_state('deleted',<?=$comment->id?>)" + class="g-button ui-state-default ui-icon-left"> + <span class="ui-icon ui-icon-trash"></span> + <?= t("Delete") ?> + </a> + </li> + </ul> + </td> + </tr> + <? endforeach ?> + </table> - <div class="g-pager"> - <?= $pager ?> + <div class="g-pager"> + <?= $pager ?> + </div> + </div> </div> diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php index f75adc60..5d07eb68 100644 --- a/modules/digibug/views/admin_digibug.html.php +++ b/modules/digibug/views/admin_digibug.html.php @@ -1,18 +1,16 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-admin-digibug"> - <div class="g-admin-digibug-intro"> - <img id="Digibug-logo" src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>"> - <h2> <?= t("Digibug Photo Printing") ?> </h2> +<div class="g-block"> + <img src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>" alt="Digibug logo" class="g-right"/> + <h1> <?= t("Digibug Photo Printing") ?> </h1> + <div class="g-block-content"> <p> <?= t("Turn your photos into a wide variety of prints, gifts and games!") ?> </p> - <ul> <li class="g-module-status g-success"> <?= t("You're ready to print photos!") ?> </li> </ul> - <p> <?= t("You don't need an account with Digibug, but if you <a href=\"%signup_url\">register with Digibug</a> and enter your Digibug id in the <a href=\"%advanced_settings_url\">Advanced Settings</a> page you can make money off of your photos!", array("signup_url" => "http://www.digibug.com/signup.php", diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index fd8ae63c..e1443aa7 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -1,94 +1,96 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-admin-g2-import"> +<div id="g-admin-g2-import" class="g-block"> <h1> <?= t("Gallery 2 Import") ?> </h1> <p> <?= t("Import your Gallery 2 users, photos, movies, comments and tags into your new Gallery 3 installation.") ?> </p> - <div id="g-admin-g2-import-notes"> - <h2> <?= t("Notes") ?> </h2> - <p> - <?= t("The import process is a work in progress with some known issues:") ?> - </p> - <ul> - <li> - <?= t("Permissions are <b>not imported</b>. You will have to set them again manually (for now).") ?> - </li> - <li> - <?= t("The only supported image formats are JPG, PNG and GIF. Other formats will be skipped.") ?> - </li> - <li> - <?= t("The only supported movie formats are FLV and MP4. Other formats will be skipped.") ?> - </li> - <li> - <?= t("The eAccelerator PHP performance extension is known to cause issues. If you're using eAccelerator and having problems, please disable it while you do your import. One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?> - </li> - </ul> - </div> - <?= $form ?> - - <? if (g2_import::is_initialized()): ?> - <div id="g-admin-g2-import-details"> - <h2> <?= t("Import") ?> </h2> - <ul id="g-action-status" class="g-message-block"> - <li class="g-success"> - <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?> - </li> - <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?> - <li class="g-warning"> - <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.", - array("g2_pixels" => $g2_sizes["thumb"]["size"], - "g3_pixels" => $thumb_size, - "url" => html::mark_clean(url::site("admin/theme_options")))) ?> - </li> - <? endif ?> - - <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?> - <li class="g-warning"> - <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.", - array("g2_pixels" => $g2_sizes["resize"]["size"], - "g3_pixels" => $resize_size, - "url" => html::mark_clean(url::site("admin/theme_options")))) ?> - </li> - <? endif ?> - </ul> - - <div class="g-info"> + <div class="g-block-content"> + <div id="g-admin-g2-import-notes"> + <h2> <?= t("Notes") ?> </h2> <p> - <?= t("Your Gallery 2 has the following importable data in it") ?> + <?= t("The import process is a work in progress with some known issues:") ?> </p> <ul> <li> - <?= t2("1 user", "%count users", $g2_stats["users"]) ?> + <?= t("Permissions are <b>not imported</b>. You will have to set them again manually (for now).") ?> </li> <li> - <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?> + <?= t("The only supported image formats are JPG, PNG and GIF. Other formats will be skipped.") ?> </li> <li> - <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?> + <?= t("The only supported movie formats are FLV and MP4. Other formats will be skipped.") ?> </li> <li> - <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?> + <?= t("The eAccelerator PHP performance extension is known to cause issues. If you're using eAccelerator and having problems, please disable it while you do your import. One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?> </li> - <li> - <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?> + </ul> + </div> + <?= $form ?> + + <? if (g2_import::is_initialized()): ?> + <div id="g-admin-g2-import-details"> + <h2> <?= t("Import") ?> </h2> + <ul id="g-action-status" class="g-message-block"> + <li class="g-success"> + <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?> </li> - <li> - <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?> + <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?> + <li class="g-warning"> + <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.", + array("g2_pixels" => $g2_sizes["thumb"]["size"], + "g3_pixels" => $thumb_size, + "url" => html::mark_clean(url::site("admin/theme_options")))) ?> </li> - <li> - <?= t2("1 tagged photo/movie/album", - "%count tagged photos/movies/albums", $g2_stats["tags"]) ?> + <? endif ?> + + <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?> + <li class="g-warning"> + <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.", + array("g2_pixels" => $g2_sizes["resize"]["size"], + "g3_pixels" => $resize_size, + "url" => html::mark_clean(url::site("admin/theme_options")))) ?> </li> + <? endif ?> </ul> - </div> - <p> - <a class="g-button g-dialog-link ui-state-default ui-corner-all" - href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>"> - <?= t("Begin import!") ?> - </a> - </p> + <div class="g-info"> + <p> + <?= t("Your Gallery 2 has the following importable data in it") ?> + </p> + <ul> + <li> + <?= t2("1 user", "%count users", $g2_stats["users"]) ?> + </li> + <li> + <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?> + </li> + <li> + <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?> + </li> + <li> + <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?> + </li> + <li> + <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?> + </li> + <li> + <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?> + </li> + <li> + <?= t2("1 tagged photo/movie/album", + "%count tagged photos/movies/albums", $g2_stats["tags"]) ?> + </li> + </ul> + </div> + + <p> + <a class="g-button g-dialog-link ui-state-default ui-corner-all" + href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>"> + <?= t("Begin import!") ?> + </a> + </p> + </div> + <? endif ?> </div> - <? endif ?> </div> diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php index 8af1dd85..ccc631c7 100644 --- a/modules/gallery/controllers/admin_languages.php +++ b/modules/gallery/controllers/admin_languages.php @@ -112,7 +112,8 @@ class Admin_Languages_Controller extends Admin_Controller { $server_link = l10n_client::server_api_key_url(); $group->input("api_key") ->label(empty($api_key) - ? t("This is a unique key that will allow you to send translations to the remote server. To get your API key go to %server-link.", + ? t("This is a unique key that will allow you to send translations to the remote + server. To get your API key go to %server-link.", array("server-link" => html::mark_clean(html::anchor($server_link)))) : t("API Key")) ->value($api_key) diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php index 95d0618c..0f4c0dd8 100644 --- a/modules/gallery/views/admin_graphics.html.php +++ b/modules/gallery/views/admin_graphics.html.php @@ -12,26 +12,28 @@ }); </script> -<div id="g-admin-graphics"> +<div id="g-admin-graphics" class="g-block ui-helper-clearfix"> <h1> <?= t("Graphics Settings") ?> </h1> <p> <?= t("Gallery needs a graphics toolkit in order to manipulate your photos. Please choose one from the list below.") ?> </p> - <h2> <?= t("Active Toolkit") ?> </h2> - <? if ($active == "none"): ?> - <?= new View("admin_graphics_none.html") ?> - <? else: ?> - <?= new View("admin_graphics_$active.html", array("tk" => $tk->$active, "is_active" => true)) ?> - <? endif ?> - - <div class="g-available"> - <h2> <?= t("Available Toolkits") ?> </h2> - <? foreach (array_keys((array)$tk) as $id): ?> - <? if ($id != $active): ?> - <?= new View("admin_graphics_$id.html", array("tk" => $tk->$id, "is_active" => false)) ?> + <div class="g-block-content"> + <h2> <?= t("Active Toolkit") ?> </h2> + <? if ($active == "none"): ?> + <?= new View("admin_graphics_none.html") ?> + <? else: ?> + <?= new View("admin_graphics_$active.html", array("tk" => $tk->$active, "is_active" => true)) ?> <? endif ?> - <? endforeach ?> + + <div class="g-available"> + <h2> <?= t("Available Toolkits") ?> </h2> + <? foreach (array_keys((array)$tk) as $id): ?> + <? if ($id != $active): ?> + <?= new View("admin_graphics_$id.html", array("tk" => $tk->$id, "is_active" => false)) ?> + <? endif ?> + <? endforeach ?> + </div> </div> </div> diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php index 74f48b76..311672de 100644 --- a/modules/gallery/views/admin_languages.html.php +++ b/modules/gallery/views/admin_languages.html.php @@ -1,103 +1,112 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-languages"> - <h1> <?= t("Languages") ?> </h1> - <p> - <?= t("Install new languages, update installed ones and set the default language for your Gallery.") ?> - </p> +<script type="text/javascript"> + var old_default_locale = <?= html::js_string($default_locale) ?>; - <form id="g-languages-form" method="post" action="<?= url::site("admin/languages/save") ?>"> - <?= access::csrf_form_field() ?> - <table> - <tr> - <th> <?= t("Installed") ?> </th> - <th> <?= t("Language") ?> </th> - <th> <?= t("Default language") ?> </th> - </tr> - <? $i = 0 ?> - <? foreach ($available_locales as $code => $display_name): ?> - <? if ($i == (count($available_locales)/2)): ?> - <table> - <tr> - <th> <?= t("Installed") ?> </th> - <th> <?= t("Language") ?> </th> - <th> <?= t("Default language") ?> </th> - </tr> - <? endif ?> + $("input[name='installed_locales[]']").change(function (event) { + if (this.checked) { + $("input[type='radio'][value='" + this.value + "']").enable(); + } else { + if ($("input[type='radio'][value='" + this.value + "']").selected()) { // if you deselect your default language, switch to some other installed language + $("input[type='radio'][value='" + old_default_locale + "']").attr("checked", "checked"); + } + $("input[type='radio'][value='" + this.value + "']").attr("disabled", "disabled"); + } + }); - <tr class="<?= (isset($installed_locales[$code])) ? "installed" : "" ?><?= ($default_locale == $code) ? " default" : "" ?>"> - <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td> - <td> <?= $display_name ?> </td> - <td> - <?= form::radio("default_locale", $code, ($default_locale == $code), ((isset($installed_locales[$code]))?'':'disabled="disabled"') ) ?> - </td> - </tr> - <? $i++ ?> + $("g-languages-form").ajaxForm({ + dataType: "json", + success: function(data) { + if (data.result == "success") { + el = $('<a href="' + <?= html::js_string(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?> + '"></a>'); // this is a little hack to trigger the update_l10n task in a dialog + el.gallery_dialog(); + el.trigger('click'); + } + } + }); +</script> - <? endforeach ?> - </table> - <input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" /> - </form> +<div class="g-block"> + <h1> <?= t("Languages and Translation") ?> </h1> - <script type="text/javascript"> - var old_default_locale = <?= html::js_string($default_locale) ?>; + <div class="g-block-content"> - $("input[name='installed_locales[]']").change(function (event) { - if (this.checked) { - $("input[type='radio'][value='" + this.value + "']").enable(); - } else { - if ($("input[type='radio'][value='" + this.value + "']").selected()) { // if you deselect your default language, switch to some other installed language - $("input[type='radio'][value='" + old_default_locale + "']").attr("checked", "checked"); - } - $("input[type='radio'][value='" + this.value + "']").attr("disabled", "disabled"); - } - }); - - $("g-languages-form").ajaxForm({ - dataType: "json", - success: function(data) { - if (data.result == "success") { - el = $('<a href="' + <?= html::js_string(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?> + '"></a>'); // this is a little hack to trigger the update_l10n task in a dialog - el.gallery_dialog(); - el.trigger('click'); - } - } - }); - </script> -</div> - -<div id="g-translations"> - <h1> <?= t("Translations") ?> </h1> - <p> - <?= t("Create your own translations and share them with the rest of the Gallery community.") ?> - </p> + <div id="g-languages" class="g-block"> + <h2> <?= t("Languages") ?> </h2> + <p> + <?= t("Install new languages, update installed ones and set the default language for your Gallery.") ?> + </p> - <h3><?= t("Translating Gallery") ?></h3> + <div class="g-block-content ui-helper-clearfix"> + <form id="g-languages-form" method="post" action="<?= url::site("admin/languages/save") ?>"> + <?= access::csrf_form_field() ?> + <table class="g-left"> + <tr> + <th> <?= t("Installed") ?> </th> + <th> <?= t("Language") ?> </th> + <th> <?= t("Default language") ?> </th> + </tr> + <? $i = 0 ?> + <? foreach ($available_locales as $code => $display_name): ?> + <? if ($i == (count($available_locales)/2)): ?> + <table> + <tr> + <th> <?= t("Installed") ?> </th> + <th> <?= t("Language") ?> </th> + <th> <?= t("Default language") ?> </th> + </tr> + <? endif ?> + <tr class="<?= (isset($installed_locales[$code])) ? "g-installed" : "" ?><?= ($default_locale == $code) ? " g-default" : "" ?>"> + <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td> + <td> <?= $display_name ?> </td> + <td> + <?= form::radio("default_locale", $code, ($default_locale == $code), ((isset($installed_locales[$code]))?'':'disabled="disabled"') ) ?> + </td> + </tr> + <? $i++ ?> + <? endforeach ?> + </table> + <input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" /> + </form> + </div> + </div> - <div class="g-block"> - <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank" - class="g-doc-link ui-state-default ui-corner-all ui-icon ui-icon-help" - title="<?= t("Localization documentation")->for_html_attr() ?>"> - <?= t("Localization documentation") ?> - </a> + <div id="g-translations" class="g-block"> + <h2> <?= t("Translations") ?> </h2> + <p> + <?= t("Create your own translations and share them with the rest of the Gallery community.") ?> + </p> - <p><?= t("<strong>Step 1:</strong> Make sure the target language is installed and up to date (check above).") ?></p> + <div class="g-block-content"> + <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank" + class="g-right ui-state-default ui-corner-all ui-icon ui-icon-help" + title="<?= t("Localization documentation")->for_html_attr() ?>"> + <?= t("Localization documentation") ?> + </a> - <p><?= t("<strong>Step 2:</strong> Make sure you have selected the right target language (currently %default_locale).", - array("default_locale" => locales::display_name())) ?></p> + <h3><?= t("Translating Gallery") ?></h3> - <p><?= t("<strong>Step 3:</strong> Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p> + <p><?= t("Follow these steps to begin translating Gallery.") ?></p> - <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>" - class="g-button ui-state-default ui-corner-all ui-icon-left"> - <span class="ui-icon ui-icon-power"></span> - <? if (Session::instance()->get("l10n_mode", false)): ?> - <?= t("Stop translation mode") ?> - <? else: ?> - <?= t("Start translation mode") ?> - <? endif ?> - </a> -</div> + <ul> + <li><?= t("Make sure the target language is installed and up to date (check above).") ?></li> + <li><?= t("Make sure you have selected the right target language (currently %default_locale).", + array("default_locale" => locales::display_name())) ?></li> + <li><?= t("Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></li> + </ul> + <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>" + class="g-button ui-state-default ui-corner-all ui-icon-left"> + <span class="ui-icon ui-icon-power"></span> + <? if (Session::instance()->get("l10n_mode", false)): ?> + <?= t("Stop translation mode") ?> + <? else: ?> + <?= t("Start translation mode") ?> + <? endif ?> + </a> -<h3><?= t("Sharing your translations") ?></h3> - <?= $share_translations_form ?> + <h3><?= t("Sharing your translations") ?></h3> + <?= $share_translations_form ?> + </div> + </div> + + </div> </div> diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index 94582dc8..73a4bef8 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -1,193 +1,195 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-admin-maintenance"> +<div id="g-admin-maintenance" class="g-block"> <h1> <?= t("Maintenance Tasks") ?> </h1> <p> <?= t("Occasionally your Gallery will require some maintenance. Here are some tasks you can use to keep it running smoothly.") ?> </p> - <div id="g-available-tasks"> - <h2> <?= t("Available Tasks") ?> </h2> - <table> - <tr> - <th> - <?= t("Name") ?> - </th> - <th> - <?= t("Description") ?> - </th> - <th> - <?= t("Action") ?> - </th> - </tr> - <? $i = 0; ?> - <? foreach ($task_definitions as $task): ?> - <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>"> - <td class="<?= log::severity_class($task->severity) ?>"> - <?= $task->name ?> - </td> - <td> - <?= $task->description ?> - </td> - <td> - <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>" - class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> - <?= t("run") ?> - </a> - </td> - </tr> - <? $i++ ?> - <? endforeach ?> - </table> - </div> - - <? if ($running_tasks->count()): ?> - <div id="g-running-tasks"> - <h2> <?= t("Running Tasks") ?> </h2> - <table> - <tr> - <th> - <?= t("Last Updated") ?> - </th> - <th> - <?= t("Name") ?> - </th> - <th> - <?= t("Status") ?> - </th> - <th> - <?= t("Info") ?> - </th> - <th> - <?= t("Owner") ?> - </th> - <th> - <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>" - class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> - <?= t("cancel all") ?></a> - <?= t("Action") ?> - </th> - </tr> - <? $i = 0; ?> - <? foreach ($running_tasks as $task): ?> - <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>"> - <td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>"> - <?= gallery::date_time($task->updated) ?> - </td> - <td> - <?= $task->name ?> - </td> - <td> - <? if ($task->done): ?> - <? if ($task->state == "cancelled"): ?> - <?= t("Cancelled") ?> - <? endif ?> - <?= t("Close") ?> - <? elseif ($task->state == "stalled"): ?> - <?= t("Stalled") ?> - <? else: ?> - <?= t("%percent_complete% Complete", array("percent_complete" => $task->percent_complete)) ?> - <? endif ?> - </td> - <td> - <?= $task->status ?> - </td> - <td> - <?= html::clean($task->owner()->name) ?> - </td> - <td> - <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" - class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> - <?= t("cancel") ?> - </a> - <? if ($task->state == "stalled"): ?> - <a class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all" - href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>"> - <?= t("resume") ?> - </a> - <? endif ?> - </td> - </tr> - <? $i++ ?> - <? endforeach ?> - </table> - </div> - <? endif ?> + <div class="g-block-content"> + <div id="g-available-tasks"> + <h2> <?= t("Available Tasks") ?> </h2> + <table> + <tr> + <th> + <?= t("Name") ?> + </th> + <th> + <?= t("Description") ?> + </th> + <th> + <?= t("Action") ?> + </th> + </tr> + <? $i = 0; ?> + <? foreach ($task_definitions as $task): ?> + <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>"> + <td class="<?= log::severity_class($task->severity) ?>"> + <?= $task->name ?> + </td> + <td> + <?= $task->description ?> + </td> + <td> + <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>" + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> + <?= t("run") ?> + </a> + </td> + </tr> + <? $i++ ?> + <? endforeach ?> + </table> + </div> - <? if ($finished_tasks->count()): ?> - <div id="g-finished-tasks"> - <h2> <?= t("Finished Tasks") ?> </h2> - <table> - <tr> - <th> - <?= t("Last Updated") ?> - </th> - <th> - <?= t("Name") ?> - </th> - <th> - <?= t("Status") ?> - </th> - <th> - <?= t("Info") ?> - </th> - <th> - <?= t("Owner") ?> - </th> - <th> - <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>" + <? if ($running_tasks->count()): ?> + <div id="g-running-tasks"> + <h2> <?= t("Running Tasks") ?> </h2> + <table> + <tr> + <th> + <?= t("Last Updated") ?> + </th> + <th> + <?= t("Name") ?> + </th> + <th> + <?= t("Status") ?> + </th> + <th> + <?= t("Info") ?> + </th> + <th> + <?= t("Owner") ?> + </th> + <th> + <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>" class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> - <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a> - <?= t("Action") ?> - </th> - </tr> - <? $i = 0; ?> - <? foreach ($finished_tasks as $task): ?> - <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>"> - <td class="<?= $task->state == "success" ? "g-success" : "g-error" ?>"> - <?= gallery::date_time($task->updated) ?> - </td> - <td> - <?= $task->name ?> - </td> - <td> - <? if ($task->state == "success"): ?> - <?= t("Success") ?> - <? elseif ($task->state == "error"): ?> - <?= t("Failed") ?> - <? elseif ($task->state == "cancelled"): ?> - <?= t("Cancelled") ?> - <? endif ?> - </td> - <td> - <?= $task->status ?> - </td> - <td> - <?= html::clean($task->owner()->name) ?> - </td> - <td> - <? if ($task->done): ?> - <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> - <?= t("remove") ?> - </a> - <? if ($task->get_log()): ?> - <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all"> - <?= t("browse log") ?> - </a> - <? endif ?> - <? else: ?> - <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all> - <?= t("resume") ?> - </a> - <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> - <?= t("cancel") ?> - </a> - <? endif ?> - </ul> - </td> - </tr> - <? endforeach ?> - <? $i++ ?> - </table> + <?= t("cancel all") ?></a> + <?= t("Action") ?> + </th> + </tr> + <? $i = 0; ?> + <? foreach ($running_tasks as $task): ?> + <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>"> + <td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>"> + <?= gallery::date_time($task->updated) ?> + </td> + <td> + <?= $task->name ?> + </td> + <td> + <? if ($task->done): ?> + <? if ($task->state == "cancelled"): ?> + <?= t("Cancelled") ?> + <? endif ?> + <?= t("Close") ?> + <? elseif ($task->state == "stalled"): ?> + <?= t("Stalled") ?> + <? else: ?> + <?= t("%percent_complete% Complete", array("percent_complete" => $task->percent_complete)) ?> + <? endif ?> + </td> + <td> + <?= $task->status ?> + </td> + <td> + <?= html::clean($task->owner()->name) ?> + </td> + <td> + <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" + class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> + <?= t("cancel") ?> + </a> + <? if ($task->state == "stalled"): ?> + <a class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all" + href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>"> + <?= t("resume") ?> + </a> + <? endif ?> + </td> + </tr> + <? $i++ ?> + <? endforeach ?> + </table> + </div> + <? endif ?> + + <? if ($finished_tasks->count()): ?> + <div id="g-finished-tasks"> + <h2> <?= t("Finished Tasks") ?> </h2> + <table> + <tr> + <th> + <?= t("Last Updated") ?> + </th> + <th> + <?= t("Name") ?> + </th> + <th> + <?= t("Status") ?> + </th> + <th> + <?= t("Info") ?> + </th> + <th> + <?= t("Owner") ?> + </th> + <th> + <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>" + class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> + <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a> + <?= t("Action") ?> + </th> + </tr> + <? $i = 0; ?> + <? foreach ($finished_tasks as $task): ?> + <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>"> + <td class="<?= $task->state == "success" ? "g-success" : "g-error" ?>"> + <?= gallery::date_time($task->updated) ?> + </td> + <td> + <?= $task->name ?> + </td> + <td> + <? if ($task->state == "success"): ?> + <?= t("Success") ?> + <? elseif ($task->state == "error"): ?> + <?= t("Failed") ?> + <? elseif ($task->state == "cancelled"): ?> + <?= t("Cancelled") ?> + <? endif ?> + </td> + <td> + <?= $task->status ?> + </td> + <td> + <?= html::clean($task->owner()->name) ?> + </td> + <td> + <? if ($task->done): ?> + <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> + <?= t("remove") ?> + </a> + <? if ($task->get_log()): ?> + <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all"> + <?= t("browse log") ?> + </a> + <? endif ?> + <? else: ?> + <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all> + <?= t("resume") ?> + </a> + <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> + <?= t("cancel") ?> + </a> + <? endif ?> + </ul> + </td> + </tr> + <? endforeach ?> + <? $i++ ?> + </table> + </div> + <? endif ?> </div> - <? endif ?> </div> diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php index 75f4f0c5..4c4976f8 100644 --- a/modules/gallery/views/admin_modules.html.php +++ b/modules/gallery/views/admin_modules.html.php @@ -1,32 +1,34 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-modules"> +<div class="g-block ui-helper-clearfix"> <h1> <?= t("Gallery Modules") ?> </h1> <p> <?= t("Power up your Gallery by adding more modules! Each module provides new cool features.") ?> </p> - <form method="post" action="<?= url::site("admin/modules/save") ?>"> - <?= access::csrf_form_field() ?> - <table> - <tr> - <th> <?= t("Installed") ?> </th> - <th> <?= t("Name") ?> </th> - <th> <?= t("Version") ?> </th> - <th> <?= t("Description") ?> </th> - </tr> - <? $i = 0 ?> - <? foreach ($available as $module_name => $module_info): ?> - <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>"> - <? $data = array("name" => $module_name); ?> - <? if ($module_info->locked) $data["disabled"] = 1; ?> - <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td> - <td> <?= t($module_info->name) ?> </td> - <td> <?= $module_info->version ?> </td> - <td> <?= t($module_info->description) ?> </td> - </tr> - <? $i++ ?> - <? endforeach ?> - </table> - <input type="submit" value="<?= t("Update")->for_html_attr() ?>"/> - </form> + <div class="g-block-content"> + <form method="post" action="<?= url::site("admin/modules/save") ?>"> + <?= access::csrf_form_field() ?> + <table> + <tr> + <th> <?= t("Installed") ?> </th> + <th> <?= t("Name") ?> </th> + <th> <?= t("Version") ?> </th> + <th> <?= t("Description") ?> </th> + </tr> + <? $i = 0 ?> + <? foreach ($available as $module_name => $module_info): ?> + <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>"> + <? $data = array("name" => $module_name); ?> + <? if ($module_info->locked) $data["disabled"] = 1; ?> + <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td> + <td> <?= t($module_info->name) ?> </td> + <td> <?= $module_info->version ?> </td> + <td> <?= t($module_info->description) ?> </td> + </tr> + <? $i++ ?> + <? endforeach ?> + </table> + <input type="submit" value="<?= t("Update")->for_html_attr() ?>" /> + </form> + </div> </div> diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php index b4f339ae..ea950b54 100644 --- a/modules/gallery/views/admin_sidebar.html.php +++ b/modules/gallery/views/admin_sidebar.html.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <script type="text/javascript"> $(function() { - $(".g-admin-blocks-list ul").sortable({ + $(".g-blocks-list ul").sortable({ connectWith: ".g-sortable-blocks", opacity: .7, placeholder: "g-target", @@ -11,7 +11,7 @@ $("ul#g-active-blocks li").each(function(i) { active_blocks += "&block["+i+"]="+$(this).attr("ref"); }); - $.getJSON($("#g-site-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) { + $.getJSON($("#g-admin-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) { if (data.result == "success") { $("ul#g-available-blocks").html(data.available); $("ul#g-active-blocks").html(data.active); @@ -22,25 +22,28 @@ }).disableSelection(); }); </script> -<h1> <?= t("Manage Sidebar") ?> </h1> -<p> - <?= t("Select and drag blocks from the available column to the active column to add to the sidebar; remove by dragging the other way.") ?> -</p> - <div id="g-site-blocks" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>"> - <div class="g-admin-blocks-list"> - <div><h3><?= t("Available Blocks") ?></h3></div> - <div> - <ul id="g-available-blocks" class="g-sortable-blocks"> - <?= $available ?> - </ul> +<div class="g-block"> + <h1> <?= t("Manage Sidebar") ?> </h1> + <p> + <?= t("Select and drag blocks from the available column to the active column to add to the sidebar; remove by dragging the other way.") ?> + </p> + + <div id="g-admin-blocks" class="g-block-content ui-helper-clearfix" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>"> + <div class="g-block g-left"> + <h3><?= t("Available Blocks") ?></h3> + <div class="g-blocks-list g-block-content"> + <ul id="g-available-blocks" class="g-sortable-blocks"> + <?= $available ?> + </ul> + </div> </div> - </div> - <div class="g-admin-blocks-list"> - <div><h3><?= t("Active Blocks") ?></h3></div> - <div> - <ul id="g-active-blocks" class="g-sortable-blocks"> - <?= $active ?> - </ul> + <div class="g-block g-left"> + <h3><?= t("Active Blocks") ?></h3> + <div class="g-blocks-list g-block-content"> + <ul id="g-active-blocks" class="g-sortable-blocks"> + <?= $active ?> + </ul> + </div> </div> </div> </div> diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php index e09be728..a4bf1c4e 100644 --- a/modules/gallery/views/admin_theme_options.html.php +++ b/modules/gallery/views/admin_theme_options.html.php @@ -1,6 +1,8 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-admin-theme-options"> +<div class="g-block"> <h1> <?= t("Theme Options") ?> </h1> + <div class="g-block-content"> <?= $form ?> + </div> </div> diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index f7e77a01..dda18265 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -7,83 +7,88 @@ } </script> -<h1> <?= t("Theme Choice") ?> </h1> -<p> - <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface. Click a theme to preview and activate it.") ?> -</p> +<div class="g-block ui-helper-clearfix"> + <h1> <?= t("Theme Choice") ?> </h1> + <p> + <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface. Click a theme to preview and activate it.") ?> + </p> -<div id="g-site-theme"> - <h2> <?= t("Gallery theme") ?> </h2> - <div class="g-block g-selected ui-helper-clearfix"> - <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>" - alt="<?= html::clean_attribute($themes[$site]->name) ?>" /> - <h3> <?= $themes[$site]->name ?> </h3> - <p> - <?= $themes[$site]->description ?> - </p> - </div> + <div class="g-block-content"> + <div id="g-site-theme"> + <h2> <?= t("Gallery theme") ?> </h2> + <div class="g-block g-selected ui-helper-clearfix"> + <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>" + alt="<?= html::clean_attribute($themes[$site]->name) ?>" /> + <h3> <?= $themes[$site]->name ?> </h3> + <p> + <?= $themes[$site]->description ?> + </p> + </div> - <h2> <?= t("Available Gallery themes") ?> </h2> - <div class="g-available"> - <? $count = 0 ?> - <? foreach ($themes as $id => $info): ?> - <? if (!$info->site) continue ?> - <? if ($id == $site) continue ?> - <div class="g-block ui-helper-clearfix"> - <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>"> - <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>" - alt="<?= html::clean_attribute($info->name) ?>" /> - <h3> <?= $info->name ?> </h3> + <h2> <?= t("Available Gallery themes") ?> </h2> + <div class="g-available"> + <? $count = 0 ?> + <? foreach ($themes as $id => $info): ?> + <? if (!$info->site) continue ?> + <? if ($id == $site) continue ?> + <div class="g-block ui-helper-clearfix"> + <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>"> + <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>" + alt="<?= html::clean_attribute($info->name) ?>" /> + <h3> <?= $info->name ?> </h3> + <p> + <?= $info->description ?> + </p> + </a> + </div> + <? $count++ ?> + <? endforeach ?> + + <? if (!$count): ?> <p> - <?= $info->description ?> + <?= t("There are no other site themes available.") ?> </p> - </a> + <? endif ?> + </div> </div> - <? $count++ ?> - <? endforeach ?> - <? if (!$count): ?> - <p> - <?= t("There are no other site themes available.") ?> - </p> - <? endif ?> - </div> -</div> + <div id="g-admin-theme"> + <h2> <?= t("Admin theme") ?> </h2> + <div class="g-block g-selected ui-helper-clearfix"> + <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>" + alt="<?= html::clean_attribute($themes[$admin]->name) ?>" /> + <h3> <?= $themes[$admin]->name ?> </h3> + <p> + <?= $themes[$admin]->description ?> + </p> + </div> -<div id="g-admin-theme"> - <h2> <?= t("Admin theme") ?> </h2> - <div class="g-block g-selected ui-helper-clearfix"> - <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>" - alt="<?= html::clean_attribute($themes[$admin]->name) ?>" /> - <h3> <?= $themes[$admin]->name ?> </h3> - <p> - <?= $themes[$admin]->description ?> - </p> - </div> + <h2> <?= t("Available admin themes") ?> </h2> + <div class="g-available"> + <? $count = 0 ?> + <? foreach ($themes as $id => $info): ?> + <? if (!$info->admin) continue ?> + <? if ($id == $admin) continue ?> + <div class="g-block ui-helper-clearfix"> + <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>"> + <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>" + alt="<?= html::clean_attribute($info->name) ?>" /> + <h3> <?= $info->name ?> </h3> + <p> + <?= $info->description ?> + </p> + </a> + </div> + <? $count++ ?> + <? endforeach ?> - <h2> <?= t("Available admin themes") ?> </h2> - <div class="g-available"> - <? $count = 0 ?> - <? foreach ($themes as $id => $info): ?> - <? if (!$info->admin) continue ?> - <? if ($id == $admin) continue ?> - <div class="g-block ui-helper-clearfix"> - <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>"> - <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>" - alt="<?= html::clean_attribute($info->name) ?>" /> - <h3> <?= $info->name ?> </h3> + <? if (!$count): ?> <p> - <?= $info->description ?> + <?= t("There are no other admin themes available.") ?> </p> - </a> + <? endif ?> + </div> </div> - <? $count++ ?> - <? endforeach ?> - - <? if (!$count): ?> - <p> - <?= t("There are no other admin themes available.") ?> - </p> - <? endif ?> + </div> </div>
\ No newline at end of file diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php index 3e964801..a0af3ba8 100644 --- a/modules/recaptcha/views/admin_recaptcha.html.php +++ b/modules/recaptcha/views/admin_recaptcha.html.php @@ -1,5 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-admin-recaptcha"> +<div class="g-block"> <h1> <?= t("reCAPTCHA Challenge Filtering") ?> </h1> <p> <?= t("reCAPTCHA is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows. In order to use it, you need to sign up for a <a href=\"%domain_url\">reCAPTCHA Public/Private Key pair</a>, which is also free. Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.", @@ -7,27 +7,29 @@ "recaptcha_url" => html::mark_clean("http://recaptcha.net"))) ?> </p> - <?= $form ?> -</div> + <div class="g-block-content"> + <?= $form ?> -<? if ($public_key && $private_key): ?> -<div id="g-admin-recaptcha-test" class="g-block"> - <h2> <?= t("reCAPTCHA Test") ?> </h2> - <p> - <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?> - </p> + <? if ($public_key && $private_key): ?> + <div id="g-admin-recaptcha-test"> + <h2> <?= t("reCAPTCHA Test") ?> </h2> + <p> + <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?> + </p> - <div id="g-recaptcha"/> - <script type="text/javascript" src="http://api.recaptcha.net/js/recaptcha_ajax.js"></script> - <script type="text/javascript"> - Recaptcha.create("<?= $public_key ?>", "g-recaptcha", { - callback: Recaptcha.focus_response_field, - lang: "en", - custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>}, - theme: "white" - }); - </script> + <div id="g-recaptcha"> + <script type="text/javascript" src="http://api.recaptcha.net/js/recaptcha_ajax.js"></script> + <script type="text/javascript"> + Recaptcha.create("<?= $public_key ?>", "g-recaptcha", { + callback: Recaptcha.focus_response_field, + lang: "en", + custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>}, + theme: "white" + }); + </script> + </div> + </div> + <? endif ?> + </div> </div> -<? endif ?> - diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php index e447ee6d..eae767af 100644 --- a/modules/server_add/views/admin_server_add.html.php +++ b/modules/server_add/views/admin_server_add.html.php @@ -1,25 +1,22 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-server-add-admin"> - <h2> - <?= t("Add From Server Admininstration") ?> - </h2> - <div id="g-authorized-path"> - <h3><?= t("Authorized Paths") ?></h3> +<div class="g-block"> + <h1> <?= t("Add From Server Admininstration") ?> </h1> + <div class="g-block-content"> + <h2><?= t("Authorized Paths") ?></h2> <ul<? if (!empty($paths)): ?> style="display: none;"<? endif ?>> <li class="g-module-status g-info"><?= t("No Authorized image source paths defined yet") ?></li> </ul> - <ul id="g-path-list"> + <ul> <? foreach ($paths as $id => $path): ?> <li class="ui-icon-left"> + <span class="ui-icon ui-icon-folder-open"></span> + <?= html::clean($path) ?> <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&csrf=$csrf") ?>" id="icon_<?= $id?>" - class="g-remove-dir ui-icon ui-icon-trash"> - X - </a> - <?= html::clean($path) ?> + class="g-remove-dir"><span class="ui-icon ui-icon-trash">X</span></a> </li> <? endforeach ?> </ul> + <?= $form ?> </div> - <?= $form ?> </div> diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index 41fa4d41..4ed88e03 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -37,7 +37,7 @@ function editInPlace(element) { closeEditInPlaceForms(); // create edit form - var tag_id = $(this).attr('id').substr(5); + var tag_id = $(this).attr('rel'); var tag_name = $(this).html(); var tag_width = $(this).width(); $(this).parent().data("revert", $(this).parent().html()); @@ -67,7 +67,7 @@ function editInPlace(element) { console.log("success"); if (data.result == "success") { closeEditInPlaceForms(); // close form - $("#g-tag-" + data.tag_id).text(data.new_tagname); // update tagname + $(".g-tag[rel=" + data.tag_id + "]").text(data.new_tagname); // update tagname window.location.reload(); } else if (data.result == "error") { console.log("error"); diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 7771f7fe..67ba4d95 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -1,5 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<script> +<script type="text/javascript"> var TAG_RENAME_URL = <?= html::js_string(url::site("admin/tags/rename/__ID__")) ?>; $("document").ready(function() { // using JS for adding link titles to avoid running t() for each tag @@ -15,49 +15,50 @@ var cancel_i18n = <?= html::js_string(t("cancel")->for_html_attr()) ?>; </script> -<h2> - <?= t("Tag Admin") ?> -</h2> - <? $tags_per_column = $tags->count()/5 ?> <? $column_tag_count = 0 ?> -<table id="g-tag-admin"> - <caption class="g-understate"> - <?= t2("There is one tag", "There are %count tags", $tags->count()) ?> - </caption> - <tr> - <td> - <? 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 ?> +<div class="g-block"> + <h1> <?= t("Tag Admin") ?> </h1> + + <div class="g-block-content"> + <table id="g-tag-admin"> + <caption class="g-understate"> + <?= t2("There is one tag", "There are %count tags", $tags->count()) ?> + </caption> + <tr> + <td> + <? foreach ($tags as $i => $tag): ?> + <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?> - </ul> - <strong><?= html::clean($current_letter) ?></strong> - <ul> - <? endif ?> + <? 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> + <? endif ?> - <li> - <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= 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> + <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 */ ?> - </ul> - </td> - </tr> -</table> + <? $column_tag_count++ ?> + <? $last_letter = $current_letter ?> + <? endforeach /* $tags */ ?> + </ul> + </td> + </tr> + </table> + </div> +</div> diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 2f8d8673..aae39c8c 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -41,88 +41,93 @@ }); } </script> -<div class="g-block"> - <a href="<?= url::site("admin/users/add_user_form") ?>" - class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" - title="<?= t("Create a new user")->for_html_attr() ?>"> - <span class="ui-icon ui-icon-circle-plus"></span> - <?= t("Add a new user") ?> - </a> - <h2> - <?= t("User Admin") ?> - </h2> +<div class="g-block"> + <h1> <?= t("Users and Groups") ?> </h1> <div class="g-block-content"> - <table id="g-user-admin-list"> - <tr> - <th><?= t("Username") ?></th> - <th><?= t("Full name") ?></th> - <th><?= t("Email") ?></th> - <th><?= t("Last login") ?></th> - <th><?= t("Actions") ?></th> - </tr> + <div class="g-block"> + <a href="<?= url::site("admin/users/add_user_form") ?>" + class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" + title="<?= t("Create a new user")->for_html_attr() ?>"> + <span class="ui-icon ui-icon-circle-plus"></span> + <?= t("Add a new user") ?> + </a> - <? foreach ($users as $i => $user): ?> - <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>"> - <td id="user-<?= $user->id ?>" class="core-info g-draggable"> - <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>" - title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>" - alt="<?= html::clean_attribute($user->name) ?>" - width="20" - height="20" /> - <?= html::clean($user->name) ?> - </td> - <td> - <?= html::clean($user->full_name) ?> - </td> - <td> - <?= html::clean($user->email) ?> - </td> - <td> - <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?> - </td> - <td class="g-actions"> - <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>" - open_text="<?= t("close") ?>" - class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> - <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text"><?= t("edit") ?></span></a> - <? if (user::active()->id != $user->id && !$user->guest): ?> - <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>" - class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left"> - <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a> - <? else: ?> - <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>" - class="g-button ui-state-disabled ui-corner-all ui-icon-left"> - <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span> - <? endif ?> - </td> - </tr> - <? endforeach ?> - </table> - </div> -</div> + <h2> <?= t("User Admin") ?> </h2> -<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() ?>"> - <span class="ui-icon ui-icon-circle-plus"></span> - <?= t("Add a new group") ?> - </a> + <div class="g-block-content"> + <table id="g-user-admin-list"> + <tr> + <th><?= t("Username") ?></th> + <th><?= t("Full name") ?></th> + <th><?= t("Email") ?></th> + <th><?= t("Last login") ?></th> + <th><?= t("Actions") ?></th> + </tr> - <h2> - <?= t("Group Admin") ?> - </h2> + <? foreach ($users as $i => $user): ?> + <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>"> + <td id="user-<?= $user->id ?>" class="core-info g-draggable"> + <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>" + title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>" + alt="<?= html::clean_attribute($user->name) ?>" + width="20" + height="20" /> + <?= html::clean($user->name) ?> + </td> + <td> + <?= html::clean($user->full_name) ?> + </td> + <td> + <?= html::clean($user->email) ?> + </td> + <td> + <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?> + </td> + <td class="g-actions"> + <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>" + open_text="<?= t("close") ?>" + class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> + <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text"><?= t("edit") ?></span></a> + <? if (user::active()->id != $user->id && !$user->guest): ?> + <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>" + class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left"> + <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a> + <? else: ?> + <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>" + class="g-button ui-state-disabled ui-corner-all ui-icon-left"> + <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span> + <? endif ?> + </td> + </tr> + <? endforeach ?> + </table> + </div> + </div> - <div class="g-block-content"> - <ul> - <? foreach ($groups as $i => $group): ?> - <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" /> - <? $v = new View("admin_users_group.html"); $v->group = $group; ?> - <?= $v ?> - </li> - <? endforeach ?> - </ul> - </div> + <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() ?>"> + <span class="ui-icon ui-icon-circle-plus"></span> + <?= t("Add a new group") ?> + </a> + + <h2> + <?= t("Group Admin") ?> + </h2> + + <div class="g-block-content"> + <ul> + <? foreach ($groups as $i => $group): ?> + <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" /> + <? $v = new View("admin_users_group.html"); $v->group = $group; ?> + <?= $v ?> + </li> + <? endforeach ?> + </ul> + </div> + </div> + </div> </div> diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php index d034066a..af38cb41 100644 --- a/modules/watermark/views/admin_watermarks.html.php +++ b/modules/watermark/views/admin_watermarks.html.php @@ -1,37 +1,39 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="#g-watermarks"> +<div class="g-block"> <h1> <?= t("Watermarks") ?> </h1> <p> <?= t("You can have one watermark for your Gallery. This watermark will be applied to all thumbnails and resized images, but it will not be applied to your full size images. To make sure that your guests can only see watermarked images, you should restrict access to your full size images.") ?> </p> - <? if (empty($name)): ?> - <a href="<?= url::site("admin/watermarks/form_add") ?>" - title="<?= t("Upload a watermark")->for_html_attr() ?>" - class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a> - <? else: ?> - <h2> <?= t("Active Watermark") ?> </h2> - <p> - <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?> - </p> - <div> - <div class="image"> - <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>"/> - <p> - <?= t("Position: %position", array("position" => watermark::position($position))) ?> - </p> - <p> - <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?> - </p> - </div> - <div class="controls"> - <a href="<?= url::site("admin/watermarks/form_edit") ?>" - title="<?= t("Edit Watermark")->for_html_attr() ?>" - class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a> - <a href="<?= url::site("admin/watermarks/form_delete") ?>" - title="<?= t("Delete Watermark")->for_html_attr() ?>" - class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a> + <div class="g-block-content"> + <? if (empty($name)): ?> + <a href="<?= url::site("admin/watermarks/form_add") ?>" + title="<?= t("Upload a watermark")->for_html_attr() ?>" + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a> + <? else: ?> + <h2> <?= t("Active Watermark") ?> </h2> + <p> + <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?> + </p> + <div> + <div class="g-photo"> + <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>" /> + <p> + <?= t("Position: %position", array("position" => watermark::position($position))) ?> + </p> + <p> + <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?> + </p> + </div> + <div class="controls"> + <a href="<?= url::site("admin/watermarks/form_edit") ?>" + title="<?= t("Edit Watermark")->for_html_attr() ?>" + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a> + <a href="<?= url::site("admin/watermarks/form_delete") ?>" + title="<?= t("Delete Watermark")->for_html_attr() ?>" + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a> + </div> </div> + <? endif ?> </div> - <? endif ?> </div> |