From 3e6ba7acc3291f2268cbe9c9bef0a492b557babb Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 4 Oct 2009 00:27:22 -0600
Subject: Renamed most, if not all css selectors from gName to g-name. Moved a
 few shared images from wind to lib. Deleted unused images in the admin_wind.
 This will likely break a few ajax features.

---
 .../gallery/views/admin_advanced_settings.html.php |  8 +++----
 .../views/admin_block_photo_stream.html.php        |  2 +-
 modules/gallery/views/admin_dashboard.html.php     | 22 ++++++++---------
 modules/gallery/views/admin_graphics.html.php      | 10 ++++----
 modules/gallery/views/admin_graphics_gd.html.php   |  8 +++----
 .../views/admin_graphics_graphicsmagick.html.php   |  6 ++---
 .../views/admin_graphics_imagemagick.html.php      |  6 ++---
 modules/gallery/views/admin_graphics_none.html.php |  2 +-
 modules/gallery/views/admin_languages.html.php     | 12 +++++-----
 modules/gallery/views/admin_maintenance.html.php   | 26 ++++++++++----------
 .../views/admin_maintenance_show_log.html.php      |  8 +++----
 .../gallery/views/admin_maintenance_task.html.php  | 24 +++++++++----------
 modules/gallery/views/admin_modules.html.php       |  4 ++--
 modules/gallery/views/admin_sidebar.html.php       | 24 +++++++++----------
 .../gallery/views/admin_sidebar_blocks.html.php    |  2 +-
 modules/gallery/views/admin_theme_options.html.php |  2 +-
 modules/gallery/views/admin_themes.html.php        | 20 ++++++++--------
 modules/gallery/views/form.html.php                |  4 ++--
 modules/gallery/views/l10n_client.html.php         |  6 ++---
 modules/gallery/views/move_browse.html.php         | 14 +++++------
 modules/gallery/views/permissions_browse.html.php  | 14 +++++------
 modules/gallery/views/permissions_form.html.php    | 10 ++++----
 modules/gallery/views/simple_uploader.html.php     | 28 +++++++++++-----------
 modules/gallery/views/welcome_message.html.php     |  6 ++---
 .../gallery/views/welcome_message_loader.html.php  |  4 ++--
 25 files changed, 136 insertions(+), 136 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 6ad265ac..422bd8f7 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminAdvancedSettings">
+<div id="g-admin-advanced-settings">
   <h1> <?= t("Advanced Settings") ?> </h1>
   <p>
     <?= t("Here are internal Gallery configuration settings.  Most of these settings are accessible elsewhere in the administrative console.") ?>
   </p>
-  <ul id="gMessage">
-    <li class="gWarning">
+  <ul id="g-action-status">
+    <li class="g-warning">
       <b><?= t("Change these values at your own risk!") ?></b>
     </li>
   </ul>
@@ -23,7 +23,7 @@
       <td> <?= html::clean($var->name) ?> </td>
       <td>
         <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
-          class="g-dialogLink"
+          class="g-dialog-link"
           title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>">
           <? if ($var->value): ?>
           <?= html::clean($var->value) ?>
diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
index 4968c39b..f9725eee 100644
--- a/modules/gallery/views/admin_block_photo_stream.html.php
+++ b/modules/gallery/views/admin_block_photo_stream.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
 <? foreach ($photos as $photo): ?>
-  <li class="gItem gPhoto">
+  <li class="g-item g-photo">
     <a href="<?= $photo->url() ?>" title="<?= html::purify($photo->title)->for_html_attr() ?>">
       <img <?= photo::img_dimensions($photo->width, $photo->height, 72) ?>
         src="<?= $photo->thumb_url() ?>" alt="<?= html::purify($photo->title)->for_html_attr() ?>" />
diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index 148de65f..154aa172 100644
--- a/modules/gallery/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
@@ -3,34 +3,34 @@
   update_blocks = function() {
     $.get(<?= html::js_string(url::site("admin/dashboard/reorder")) ?>,
           {"csrf": "<?= $csrf ?>",
-           "dashboard_center[]": $("#gAdminDashboard").sortable(
+           "dashboard_center[]": $("#g-admin-dashboard").sortable(
              "toArray", {attribute: "block_id"}),
-           "dashboard_sidebar[]": $("#gAdminDashboardSidebar").sortable(
+           "dashboard_sidebar[]": $("#g-admin-dashboard-sidebar").sortable(
              "toArray", {attribute: "block_id"})});
   };
 
   $(document).ready(function(){
-    $("#gAdminDashboard .gBlock .ui-widget-header").addClass("gDraggable");
-    $("#gAdminDashboard").sortable({
-      connectWith: ["#gAdminDashboardSidebar"],
+    $("#g-admin-dashboard .g-block .ui-widget-header").addClass("g-draggable");
+    $("#g-admin-dashboard").sortable({
+      connectWith: ["#g-admin-dashboard-sidebar"],
       cursor: "move",
       handle: $(".ui-widget-header"),
       opacity: 0.6,
-      placeholder: "gDropTarget",
+      placeholder: "g-drop-target",
       stop: update_blocks
     });
 
-    $("#gAdminDashboardSidebar .gBlock .ui-widget-header").addClass("gDraggable");
-    $("#gAdminDashboardSidebar").sortable({
-      connectWith: ["#gAdminDashboard"],
+    $("#g-admin-dashboard-sidebar .g-block .ui-widget-header").addClass("g-draggable");
+    $("#g-admin-dashboard-sidebar").sortable({
+      connectWith: ["#g-admin-dashboard"],
       cursor: "move",
       handle: $(".ui-widget-header"),
       opacity: 0.6,
-      placeholder: "gDropTarget",
+      placeholder: "g-drop-target",
       stop: update_blocks
     });
   });
 </script>
-<div id="gAdminDashboard">
+<div id="g-admin-dashboard">
   <?= $blocks ?>
 </div>
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index f4c300ae..95d0618c 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -1,18 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(document).ready(function() {
-    $(".gAvailable .gBlock").equal_heights();
+    $(".g-available .g-block").equal_heights();
     select_toolkit = function(el) {
-      if (!$(this).hasClass("gUnavailable")) {
+      if (!$(this).hasClass("g-unavailable")) {
         window.location = <?= html::js_string(url::site("admin/graphics/choose/__TK__?csrf=$csrf")) ?>
           .replace("__TK__", $(this).attr("id"));
       }
     };
-    $("#gAdminGraphics div.gAvailable .gBlock").click(select_toolkit);
+    $("#g-admin-graphics div.g-available .g-block").click(select_toolkit);
   });
 </script>
 
-<div id="gAdminGraphics">
+<div id="g-admin-graphics">
   <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.") ?>
@@ -25,7 +25,7 @@
   <?= new View("admin_graphics_$active.html", array("tk" => $tk->$active, "is_active" => true)) ?>
   <? endif ?>
 
-  <div class="gAvailable">
+  <div class="g-available">
     <h2> <?= t("Available Toolkits") ?> </h2>
     <? foreach (array_keys((array)$tk) as $id): ?>
     <? if ($id != $active): ?>
diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php
index 08c19234..1cc9dc9e 100644
--- a/modules/gallery/views/admin_graphics_gd.html.php
+++ b/modules/gallery/views/admin_graphics_gd.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gd" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? " gInstalledToolkit" : " gUnavailable" ?>">
+<div id="gd" class="g-block<?= $is_active ? " g-selected" : "" ?><?= $tk->installed ? " g-installed-toolkit" : " g-unavailable" ?>">
   <img class="logo" width="170" height="110" src="<?= url::file("modules/gallery/images/gd.png"); ?>" alt="<? t("Visit the GD lib project site") ?>" />
   <h3> <?= t("GD") ?> </h3>
   <p>
@@ -7,7 +7,7 @@
         array("url" => "http://www.boutell.com/gd")) ?>
   </p>
   <? if ($tk->installed && $tk->rotate): ?>
-  <div class="gModuleStatus gInfo">
+  <div class="g-module-status g-info">
     <?= t("You have GD version %version.", array("version" => $tk->version)) ?>
   </div>
   <p>
@@ -15,7 +15,7 @@
   </p>
   <? elseif ($tk->installed): ?>
   <? if ($tk->error): ?>
-  <p class="gModuleStatus gWarning">
+  <p class="g-module-status g-warning">
     <?= $tk->error ?>
   </p>
   <? endif ?>
@@ -23,7 +23,7 @@
     <a class="g-button ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? else: ?>
-  <div class="gModuleStatus gInfo">
+  <div class="g-module-status g-info">
     <?= t("You do not have GD installed.") ?>
   </div>
   <? endif ?>
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
index 6ee15bc3..5dae1442 100644
--- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php
+++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="graphicsmagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? "  gInstalledToolkit" : " gUnavailable" ?>">
+<div id="graphicsmagick" class="g-block<?= $is_active ? " g-selected" : "" ?><?= $tk->installed ? "  g-installed-toolkit" : " g-unavailable" ?>">
   <img class="logo" width="107" height="76" src="<?= url::file("modules/gallery/images/graphicsmagick.png"); ?>" alt="<? t("Visit the GraphicsMagick project site") ?>" />
   <h3> <?= t("GraphicsMagick") ?> </h3>
   <p>
@@ -7,14 +7,14 @@
         array("url" => "http://www.graphicsmagick.org")) ?>
   </p>
   <? if ($tk->installed): ?>
-  <div class="gModuleStatus gInfo">
+  <div class="g-module-status g-info">
     <?= t("GraphicsMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
   </div>
   <p>
     <a class="g-button ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a>
   </p>
   <? else: ?>
-  <div class="gModuleStatus gWarning">
+  <div class="g-module-status g-warning">
     <?= $tk->error ?>
   </div>
   <? endif ?>
diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
index aeef4919..9c1a9909 100644
--- a/modules/gallery/views/admin_graphics_imagemagick.html.php
+++ b/modules/gallery/views/admin_graphics_imagemagick.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="imagemagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? "  gInstalledToolkit" : " gUnavailable" ?>">
+<div id="imagemagick" class="g-block<?= $is_active ? " g-selected" : "" ?><?= $tk->installed ? "  g-installed-toolkit" : " g-unavailable" ?>">
   <img class="logo" width="114" height="118" src="<?= url::file("modules/gallery/images/imagemagick.jpg"); ?>" alt="<? t("Visit the ImageMagick project site") ?>" />
   <h3> <?= t("ImageMagick") ?> </h3>
   <p>
@@ -7,14 +7,14 @@
         array("url" => "http://www.imagemagick.org")) ?>
   </p>
   <? if ($tk->installed): ?>
-  <div class="gModuleStatus gInfo">
+  <div class="g-module-status g-info">
     <?= t("ImageMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
   </div>
   <p>
     <a class="g-button ui-state-default ui-corner-all"><?= t("Activate ImageMagick") ?></a>
   </p>
   <? elseif ($tk->error): ?>
-  <div class="gModuleStatus gWarning">
+  <div class="g-module-status g-warning">
     <?= $tk->error ?>
   </div>
   <? endif ?>
diff --git a/modules/gallery/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
index e6923a5a..3ac6b4fb 100644
--- a/modules/gallery/views/admin_graphics_none.html.php
+++ b/modules/gallery/views/admin_graphics_none.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 
-<div id="none" class="gModuleStatus gWarning gBlock">
+<div id="none" class="g-module-status g-warning g-block">
   <h3> <?= t("No Active Toolkit") ?> </h3>
   <p>
     <?= t("We were unable to detect a graphics program.  You must install one of the toolkits below in order to use many Gallery features.") ?>
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index d6f50516..74f48b76 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gLanguages">
+<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>
 
-  <form id="gLanguagesForm" method="post" action="<?= url::site("admin/languages/save") ?>">
+  <form id="g-languages-form" method="post" action="<?= url::site("admin/languages/save") ?>">
     <?= access::csrf_form_field() ?>
     <table>
       <tr>
@@ -52,7 +52,7 @@
       }
     });
     
-    $("#gLanguagesForm").ajaxForm({
+    $("g-languages-form").ajaxForm({
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
@@ -65,7 +65,7 @@
   </script>
 </div>
 
-<div id="gTranslations">
+<div id="g-translations">
   <h1> <?= t("Translations") ?> </h1>
   <p>
     <?= t("Create your own translations and share them with the rest of the Gallery community.") ?>
@@ -73,9 +73,9 @@
 
   <h3><?= t("Translating Gallery") ?></h3>
 
-  <div class="gBlock">
+  <div class="g-block">
     <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
-       class="gDocLink ui-state-default ui-corner-all ui-icon ui-icon-help"
+       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>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 4c79c25b..94582dc8 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminMaintenance">
+<div id="g-admin-maintenance">
   <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="gAvailableTasks">
+  <div id="g-available-tasks">
     <h2> <?= t("Available Tasks") ?> </h2>
     <table>
       <tr>
@@ -21,7 +21,7 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= log::severity_class($task->severity) ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>">
         <td class="<?= log::severity_class($task->severity) ?>">
           <?= $task->name ?>
         </td>
@@ -30,7 +30,7 @@
         </td>
         <td>
           <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
-            class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all">
+            class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
             <?= t("run") ?>
           </a>
         </td>
@@ -41,7 +41,7 @@
   </div>
 
   <? if ($running_tasks->count()): ?>
-  <div id="gRunningTasks">
+  <div id="g-running-tasks">
     <h2> <?= t("Running Tasks") ?> </h2>
     <table>
       <tr>
@@ -69,8 +69,8 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= $task->state == "stalled" ? "gWarning" : "" ?>">
-        <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
+      <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>
@@ -100,7 +100,7 @@
             <?= t("cancel") ?>
           </a>
           <? if ($task->state == "stalled"): ?>
-          <a class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"
+          <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>
@@ -114,7 +114,7 @@
   <? endif ?>
 
   <? if ($finished_tasks->count()): ?>
-  <div id="gFinishedTasks">
+  <div id="g-finished-tasks">
     <h2> <?= t("Finished Tasks") ?> </h2>
     <table>
       <tr>
@@ -142,8 +142,8 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= $task->state == "success" ? "gSuccess" : "gError" ?>">
-        <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
+      <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>
@@ -170,12 +170,12 @@
             <?= t("remove") ?>
           </a>
           <? if ($task->get_log()): ?>
-          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialogLink g-button ui-state-default ui-corner-all">
+          <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-dialogLink g-button" ui-state-default ui-corner-all>
+          <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">
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index c61db871..e6ed97b3 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -9,11 +9,11 @@
 appendTo('body').submit().remove();
   };
 </script>
-<div id="gTaskLog-dialog">
+<div id="g-task-log-dialog">
   <h1> <?= $task->name ?> </h1>
-  <div class="gTaskLog">
+  <div class="g-task-log">
     <pre><?= html::purify($task->get_log()) ?></pre>
   </div>
-  <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
-  <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
+  <button id="g-close" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
+  <button id="g-save" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
 </div>
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index c0bc0d43..53972b70 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -4,7 +4,7 @@
   var animation = null;
   var delta = 1;
   animate_progress_bar = function() {
-    var current_value = parseInt($(".gProgressBar div").css("width").replace("%", ""));
+    var current_value = parseInt($(".g-progress-bar div").css("width").replace("%", ""));
     if (target_value > current_value) {
       // speed up
       delta = Math.min(delta + 0.04, 3);
@@ -14,10 +14,10 @@
     }
 
     if (target_value == 100) {
-      $(".gProgressBar").progressbar("value", 100);
+      $(".g-progress-bar").progressbar("value", 100);
     } else if (current_value != target_value || delta != 1) {
       var new_value = Math.min(current_value + delta, target_value);
-      $(".gProgressBar").progressbar("value", new_value);
+      $(".g-progress-bar").progressbar("value", new_value);
       animation = setTimeout(function() { animate_progress_bar(target_value); }, 100);
     } else {
       animation = null;
@@ -35,30 +35,30 @@
         if (!animation) {
           animate_progress_bar();
         }
-        $("#gStatus").html("" + data.task.status);
+        $("#g-status").html("" + data.task.status);
         if (data.task.done) {
-          $("#gPauseButton").hide();
-          $("#gDoneButton").show();
+          $("#g-pause-button").hide();
+          $("#g-done-button").show();
         } else {
           setTimeout(update, 100);
         }
       }
     });
   }
-  $(".gProgressBar").progressbar({value: 0});
+  $(".g-progress-bar").progressbar({value: 0});
   update();
   dismiss = function() {
     window.location.reload();
   }
 </script>
-<div id="gProgress">
+<div id="g-progress">
   <h1> <?= $task->name ?> </h1>
-  <div class="gProgressBar"></div>
-  <div id="gStatus">
+  <div class="g-progress-bar"></div>
+  <div id="g-status">
     <?= t("Starting up...") ?>
   </div>
   <div class="g-txt-right">
-    <button id="gPauseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
-    <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
+    <button id="g-pause-button" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
+    <button id="g-done-button" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
   </div>
 </div>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 058844b4..75f4f0c5 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gModules">
+<div id="g-modules">
   <h1> <?= t("Gallery Modules") ?> </h1>
   <p>
     <?= t("Power up your Gallery by adding more modules! Each module provides new cool features.") ?>
@@ -16,7 +16,7 @@
       </tr>
       <? $i = 0 ?>
       <? foreach ($available as $module_name => $module_info):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?>">
+      <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>
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index 62b59ac1..3137a2a6 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -1,20 +1,20 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(function() {
-    $(".gAdminBlocksList ul").sortable({
-      connectWith: ".sortableBlocks",
+    $(".g-admin-blocks-list ul").sortable({
+      connectWith: ".g-sortable-blocks",
       opacity: .7,
       placeholder: "ui-state-highlight",
       update: function(event,ui) {
-        if ($(this).attr("id") == "gActiveBlocks") {
+        if ($(this).attr("id") == "g-active-blocks") {
           var active_blocks = "";
-          $("ul#gActiveBlocks li").each(function(i) {
+          $("ul#g-active-blocks li").each(function(i) {
             active_blocks += "&block["+i+"]="+$(this).attr("ref");
           });
-          $.getJSON($("#gSiteBlocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
+          $.getJSON($("#g-site-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
             if (data.result == "success") {
-              $("ul#gAvailableBlocks").html(data.available);
-              $("ul#gActiveBlocks").html(data.active);
+              $("ul#g-available-blocks").html(data.available);
+              $("ul#g-active-blocks").html(data.active);
             }
           });
         }
@@ -26,19 +26,19 @@
 <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="gSiteBlocks" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
-  <div class="gAdminBlocksList">
+    <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="gAvailableBlocks" class="sortableBlocks">
+      <ul id="g-available-blocks" class="g-sortable-blocks">
       <?= $available ?>
       </ul>
     </div>
   </div>
-  <div class="gAdminBlocksList">
+  <div class="g-admin-blocks-list">
     <div><h3><?= t("Active Blocks") ?></h3></div>
     <div>
-      <ul id="gActiveBlocks" class="sortableBlocks">
+      <ul id="g-active-blocks" class="g-sortable-blocks">
       <?= $active ?>
       </ul>
     </div>
diff --git a/modules/gallery/views/admin_sidebar_blocks.html.php b/modules/gallery/views/admin_sidebar_blocks.html.php
index a1a71743..48aa3f05 100644
--- a/modules/gallery/views/admin_sidebar_blocks.html.php
+++ b/modules/gallery/views/admin_sidebar_blocks.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 
 <? foreach ($blocks as $ref => $text): ?>
-<li class="gDraggable" ref="<?= $ref ?>"><?= $text ?></li>
+<li class="g-draggable" ref="<?= $ref ?>"><?= $text ?></li>
 <? endforeach ?>
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index 724e6438..ed091d4b 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminThemeOptions">
+<div id="g-admin-themeOptions">
   <h1> <?= t("Theme Options") ?> </h1>
 
   <?= $form ?>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index d0ffc414..714b3af8 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -12,9 +12,9 @@
   <?= 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="gSiteTheme">
+<div id="g-site-theme">
   <h2> <?= t("Gallery theme") ?> </h2>
-  <div class="gBlock gSelected">
+  <div class="g-block g-selected">
     <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
     <h3> <?= $themes[$site]->name ?> </h3>
@@ -24,13 +24,13 @@
   </div>
 
   <h2> <?= t("Available Gallery themes") ?> </h2>
-  <div class="gAvailable">
+  <div class="g-available">
     <? $count = 0 ?>
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->site) continue ?>
     <? if ($id == $site) continue ?>
-    <div class="gBlock">
-      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+    <div class="g-block">
+      <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>
@@ -50,9 +50,9 @@
   </div>
 </div>
 
-<div id="gAdminTheme">
+<div id="g-admin-theme">
   <h2> <?= t("Admin theme") ?> </h2>
-  <div class="gBlock gSelected">
+  <div class="g-block g-selected">
     <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
     <h3> <?= $themes[$admin]->name ?> </h3>
@@ -62,13 +62,13 @@
   </div>
 
   <h2> <?= t("Available admin themes") ?> </h2>
-  <div class="gAvailable">
+  <div class="g-available">
     <? $count = 0 ?>
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->admin) continue ?>
     <? if ($id == $admin) continue ?>
-    <div class="gBlock">
-      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+    <div class="g-block">
+      <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>
diff --git a/modules/gallery/views/form.html.php b/modules/gallery/views/form.html.php
index 730d77cb..6bc622fd 100644
--- a/modules/gallery/views/form.html.php
+++ b/modules/gallery/views/form.html.php
@@ -44,7 +44,7 @@ if (!function_exists("DrawForm")) {
         print $input->render();
       } else {
         if ($input->error_messages()) {
-          print "$prefix<li class=\"gError\">\n";
+          print "$prefix<li class=\"g-error\">\n";
         } else {
           print "$prefix<li>\n";
         }
@@ -58,7 +58,7 @@ if (!function_exists("DrawForm")) {
         }
         if ($input->error_messages()) {
           foreach ($input->error_messages() as $error_message) {
-            print "$prefix  <p class=\"gError\">\n";
+            print "$prefix  <p class=\"g-error\">\n";
             print "$prefix    $error_message\n";
             print "$prefix  </p>\n";
           }
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index a7f001aa..f4da52dc 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -2,8 +2,8 @@
 <div id="l10n-client" class="hidden">
   <div class="labels">
     <span id="l10n-client-toggler">
-      <a id="gMinimizeL10n">_</a>
-      <a id="gCloseL10n" title="<?= t("Stop the translation mode")->for_html_attr() ?>"
+      <a id="g-minimize-l10n">_</a>
+      <a id="g-close-l10n" title="<?= t("Stop the translation mode")->for_html_attr() ?>"
          href="<?= html::clean_attribute(url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token())) ?>">X</a>
     </span>
     <div class="label strings"><h2><?= t("Page Text") ?>
@@ -37,7 +37,7 @@
       <p id="source-text-tmp-space" style="display:none"></p>
     </div>
     <div class="translation">
-      <form method="post" action="<?= url::site("l10n_client/save") ?>" id="gL10nClientSaveForm">
+      <form method="post" action="<?= url::site("l10n_client/save") ?>" id="g-l10n-client-save-form">
         <?= access::csrf_form_field() ?>
         <?= form::hidden("l10n-message-key") ?>
         <?= form::textarea("l10n-edit-translation", "", ' rows="5" class="translationField"') ?>
diff --git a/modules/gallery/views/move_browse.html.php b/modules/gallery/views/move_browse.html.php
index 99728ecc..ce3fc2fd 100644
--- a/modules/gallery/views/move_browse.html.php
+++ b/modules/gallery/views/move_browse.html.php
@@ -3,14 +3,14 @@
  var load_tree = function(target_id, locked) {
    var load_url = "<?= url::site("move/show_sub_tree/{$source->id}/__TARGETID__") ?>";
    var node = $("#node_" + target_id);
-   $("#gMove .node a").removeClass("selected");
+   $("#g-move .node a").removeClass("selected");
    node.find("a:first").addClass("selected");
    if (locked) {
-     $("#gMoveButton").attr("disabled", "disabled");
-     $("#gMove form input[name=target_id]").attr("value", "");
+     $("#g-move-button").attr("disabled", "disabled");
+     $("#g-move form input[name=target_id]").attr("value", "");
    } else {
-     $("#gMoveButton").removeAttr("disabled");
-     $("#gMove form input[name=target_id]").attr("value", target_id);
+     $("#g-move-button").removeAttr("disabled");
+     $("#g-move form input[name=target_id]").attr("value", target_id);
    }
    var sub_tree = $("#tree_" + target_id);
    if (sub_tree.length) {
@@ -33,7 +33,7 @@
   <? t("Move this album to a new album") ?>
   <? endif ?>
 </h1>
-<div id="gMove">
+<div id="g-move">
   <ul id="tree_0">
     <li id="node_1" class="node">
       <?= $tree ?>
@@ -42,6 +42,6 @@
   <form method="post" action="<?= url::site("move/save/$source->id") ?>">
     <?= access::csrf_form_field() ?>
     <input type="hidden" name="target_id" value="" />
-    <input type="submit" id="gMoveButton" value="<?= t("Move")->for_html_attr() ?>" disabled="disabled"/>
+    <input type="submit" id="g-move-button" value="<?= t("Move")->for_html_attr() ?>" disabled="disabled"/>
   </form>
 </div>
diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 519734d6..540f2735 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -5,7 +5,7 @@
     $.ajax({
       url: form_url.replace("__ITEM__", id),
       success: function(data) {
-          $("#gEditPermissionForm").html(data);
+          $("#g-edit-permissions-form").html(data);
           $(".active").removeClass("active");
           $("#item-" + id).addClass("active");
       }
@@ -19,15 +19,15 @@
       url: action_url.replace("__CMD__", cmd).replace("__GROUP__", group_id).
            replace("__PERM__", perm_id).replace("__ITEM__", item_id),
       success: function(data) {
-        $("#gEditPermissionForm").load(form_url.replace("__ITEM__", item_id));
+        $("#g-edit-permissions-form").load(form_url.replace("__ITEM__", item_id));
       }
     });
   }
 </script>
-<div id="gPermissions">
+<div id="g-permissions">
   <? if (!$htaccess_works): ?>
-  <ul id="gMessage">
-    <li class="gError">
+  <ul id="g-action-status">
+    <li class="g-error">
       <?= t("Oh no!  Your server needs a configuration change in order for you to hide photos!  Ask your server administrator to enable <a %mod_rewrite_attrs>mod_rewrite</a> and set <a %apache_attrs><i>AllowOverride FileInfo Options</i></a> to fix this.",
             array("mod_rewrite_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html" target="_blank"'),
                   "apache_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride" target="_blank"'))) ?>
@@ -37,7 +37,7 @@
 
   <p><?= t("Edit permissions for album:") ?></p>
 
-  <ul class="gBreadcrumbs">
+  <ul class="g-breadcrumbs">
     <? foreach ($parents as $parent): ?>
     <li id="item-<?= $parent->id ?>">
       <? if (access::can("edit", $parent)): ?>
@@ -56,7 +56,7 @@
     </li>
   </ul>
 
-  <div id="gEditPermissionForm">
+  <div id="g-edit-permissions-form">
     <?= $form ?>
   </div>
 </div>
diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index f5639439..e2871adb 100644
--- a/modules/gallery/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
@@ -19,7 +19,7 @@
         <? $lock = access::locked_by($group, $permission->name, $item) ?>
 
         <? if ($lock): ?>
-          <td class="gDenied">
+          <td class="g-denied">
             <img src="<?= url::file(gallery::find_file("images", "ico-denied.png")) ?>"
                  title="<?= t('denied and locked through parent album')->for_html_attr() ?>"
                  alt="<?= t('denied icon')->for_html_attr() ?>" />
@@ -30,7 +30,7 @@
         <? else: ?>
           <? if ($intent === access::INHERIT): ?>
             <? if ($allowed): ?>
-              <td class="gAllowed">
+              <td class="g-allowed">
                 <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)" title="<?= t('allowed through parent album, click to allow explicitly')->for_html_attr() ?>">
                   <img src="<?= url::file(gallery::find_file("images", "ico-success-pale.png")) ?>" alt="<?= t('passive allowed icon')->for_html_attr() ?>" />
                 </a>
@@ -40,7 +40,7 @@
                 </a>
               </td>
             <? else: ?>
-              <td class="gDenied">
+              <td class="g-denied">
                 <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                   title="<?= t('click to allow')->for_html_attr() ?>">
                   <img src="<?= url::file(gallery::find_file("images", "ico-success-gray.png")) ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
@@ -53,7 +53,7 @@
             <? endif ?>
 
           <? elseif ($intent === access::DENY): ?>
-            <td class="gDenied">
+            <td class="g-denied">
               <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                 title="<?= t('click to allow')->for_html_attr() ?>">
                 <img src="<?= url::file(gallery::find_file("images", "ico-success-gray.png")) ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
@@ -68,7 +68,7 @@
               <? endif ?>
             </td>
           <? elseif ($intent === access::ALLOW): ?>
-            <td class="gAllowed">
+            <td class="g-allowed">
               <? if ($item->id == 1): ?>
                 <img src="<?= url::file(gallery::find_file("images", "ico-success.png")) ?>" title="<?= t("allowed")->for_html_attr() ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
               <? else: ?>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 6e66d241..ddad1fc4 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -4,16 +4,16 @@
 <script type="text/javascript" src="<?= url::file("lib/jquery.scrollTo.js") ?>"></script>
 
 <!-- hack to set the title for the dialog -->
-<form id="gAddPhotosForm" action="<?= url::site("simple_uploader/finish?csrf=$csrf") ?>">
+<form id="g-add-photos-form" action="<?= url::site("simple_uploader/finish?csrf=$csrf") ?>">
   <fieldset>
     <legend> <?= t("Add photos to %album_title", array("album_title" => html::purify($item->title))) ?> </legend>
   </fieldset>
 </form>
 
-<div id="gAddPhotos">
+<div id="g-add-photos">
   <? if (ini_get("suhosin.session.encrypt")): ?>
-  <ul id="gMessage">
-    <li class="gError">
+  <ul id="g-action-status">
+    <li class="g-error">
       <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
           array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
       "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
@@ -24,7 +24,7 @@
   <p>
     <?= t("Photos will be uploaded to album: ") ?>
   </p>
-  <ul class="gBreadcrumbs">
+  <ul class="g-breadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
     <li> <?= html::clean($parent->title) ?> </li>
     <? endforeach ?>
@@ -36,14 +36,14 @@
     <span id="g-uploadstatus"></span>
     <a id="g-cancelupload" title="<?= t("Cancel all the pending uploads")->for_html_attr() ?>" onclick="swfu.cancelQueue();"><?= t("cancel") ?></a>
   </div>
-  <div id="gAddPhotosCanvas" style="text-align: center;">
-    <div id="gAddPhotosQueue"></div>
-    <div id="gEditPhotosQueue"></div>
+  <div id="g-add-photos-canvas" style="text-align: center;">
+    <div id="g-add-photos-queue"></div>
+    <div id="g-edit-photos-queue"></div>
   </div>
-  <span id="gChooseFilesButtonPlaceholder"></span>
+  <span id="g-choose-files-placeholder"></span>
 
   <!-- Proxy the done request back to our form, since its been ajaxified -->
-  <button class="ui-state-default ui-corner-all" onclick="$('#gAddPhotosForm').submit()">
+  <button class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit()">
     <?= t("Done") ?>
   </button>
 </div>
@@ -68,7 +68,7 @@
     button_image_url: <?= html::js_string(url::file(gallery::find_file("images", "select-photos-backg.png"))) ?>,
     button_width: "202",
     button_height: "45",
-    button_placeholder_id: "gChooseFilesButtonPlaceholder",
+    button_placeholder_id: "g-choose-files-placeholder",
     button_text: <?= json_encode('<span class="swfUploadFont">' . t("Select photos...") . '</span>') ?>,
     button_text_style: ".swfUploadFont { color: #2E6E9E; font-size: 16px; font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-weight: bold; }",
     button_text_left_padding: 30,
@@ -91,7 +91,7 @@
   function File_Progress(file) {
     this.box = $("#" + file.id);
     if (!this.box.length) {
-      $("#gAddPhotosQueue").append(
+      $("#g-add-photos-queue").append(
         "<div class=\"box\" id=\"" + file.id + "\">" +
         "<div class=\"title\"></div>" +
         "<div class=\"status\"></div>" +
@@ -163,7 +163,7 @@
     var fp = new File_Progress(file);
     fp.title.html(file.name);
     fp.set_status("uploading", <?= t("Uploading...")->for_js() ?>);
-    $("#gAddPhotosCanvas").scrollTo(fp.box, 1000);
+    $("#g-add-photos-canvas").scrollTo(fp.box, 1000);
 
     // move file select button
     $("#SWFUpload_0").css({'left': '0', 'top': '0'});
@@ -243,6 +243,6 @@
   // This event comes from the Queue Plugin
   function queue_complete(num_files_uploaded) {
     var status_msg = <?= t("Uploaded: __COUNT__")->for_js() ?>;
-    $("#gUploadStatus").html(status_msg.replace("__COUNT__", num_files_uploaded));
+    $("#g-upload-status").html(status_msg.replace("__COUNT__", num_files_uploaded));
   }
 </script>
diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php
index 021e5772..4acdb156 100644
--- a/modules/gallery/views/welcome_message.html.php
+++ b/modules/gallery/views/welcome_message.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gWelcomeMessage">
+<div id="g-welcome-message">
   <h1 style="display: none">
     <?= t("Welcome to Gallery 3!") ?>
   </h1>
@@ -17,12 +17,12 @@
   <p>
     <a href="<?= url::site("form/edit/users/{$user->id}") ?>"
       title="<?= t("Edit Your Profile")->for_html_attr() ?>"
-      id="gAfterInstallChangePasswordLink"
+      id="g-after-install-change-password-link"
       class="g-button ui-state-default ui-corners-all">
       <?= t("Change Password Now") ?>
     </a>
     <script>
-      $("#gAfterInstallChangePasswordLink").gallery_dialog();
+      $("#g-after-install-change-password-link").gallery_dialog();
     </script>
   </p>
 
diff --git a/modules/gallery/views/welcome_message_loader.html.php b/modules/gallery/views/welcome_message_loader.html.php
index 2c6bffca..818e2072 100644
--- a/modules/gallery/views/welcome_message_loader.html.php
+++ b/modules/gallery/views/welcome_message_loader.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<span id="gWelcomeMessageLink"
+<span id="g-welcome-messageLink"
       title="<?= t("Welcome to Gallery 3")->for_html_attr() ?>"
       href="<?= url::site("welcome_message") ?>"/>
 <script type="text/javascript">
-  $(document).ready(function(){$("#gWelcomeMessageLink").gallery_dialog({immediate: true});});
+  $(document).ready(function(){$("#g-welcome-messageLink").gallery_dialog({immediate: true});});
 </script>
-- 
cgit v1.2.3