diff --git a/modules/basket/controllers/basket.php b/modules/basket/controllers/basket.php index 270c9ecb..2ae4e62e 100644 --- a/modules/basket/controllers/basket.php +++ b/modules/basket/controllers/basket.php @@ -153,13 +153,13 @@ Items Ordered: private function getAddToBasketForm($id){ - $form = new Forge("basket/add_to_basket", "", "post", array("id" => "gAddToBasketForm")); + $form = new Forge("basket/add_to_basket", "", "post", array("id" => "g-add-to-basket-form")); $group = $form->group("add_to_basket")->label(t("Add To Basket")); $group->hidden("id"); $group->dropdown("product") ->label(t("Product")) ->options(product::getProductArray($id)); - $group->input("quantity")->label(t("Quantity"))->id("gQuantity"); + $group->input("quantity")->label(t("Quantity"))->id("g-quantity"); $group->submit("")->value(t("Add")); //$group->submit("proceedToCheckout")->value(t("Proceed To Checkout")); diff --git a/modules/basket/helpers/basket.php b/modules/basket/helpers/basket.php index 5e175303..d4993786 100644 --- a/modules/basket/helpers/basket.php +++ b/modules/basket/helpers/basket.php @@ -42,9 +42,9 @@ class basket_Core { static $format= array( "AUD" => "$", "CAD" => "$", - "EUR" => "€", - "GBP" => "£", - "JPY" => "¥", + "EUR" => "�", + "GBP" => "�", + "JPY" => "�", "USD" => "$", "NZD" => "$", "CHF" => "", @@ -61,15 +61,15 @@ class basket_Core { static function get_configure_form() { - $form = new Forge("admin/configure", "", "post", array("id" => "gConfigureForm")); + $form = new Forge("admin/configure", "", "post", array("id" => "g-configure-form")); $group = $form->group("configure")->label(t("Configure Basket")); - $group->input("email")->label(t("Offline Paying Email Address"))->id("gOrderEmailAddress"); + $group->input("email")->label(t("Offline Paying Email Address"))->id("g-order-email-address"); $group->dropdown("currency") ->label(t("Currency")) ->options(self::$currencies); - $group->checkbox("paypal")->label(t("Use Paypal"))->id("gPaypal"); - $group->input("paypal_account")->label(t("Paypal E-Mail Address"))->id("gPaypalAddress"); + $group->checkbox("paypal")->label(t("Use Paypal"))->id("g-paypal"); + $group->input("paypal_account")->label(t("Paypal E-Mail Address"))->id("g-paypal-address"); $group->submit("")->value(t("Save")); return $form; } diff --git a/modules/basket/helpers/product.php b/modules/basket/helpers/product.php index 27d01577..34e9e745 100644 --- a/modules/basket/helpers/product.php +++ b/modules/basket/helpers/product.php @@ -20,12 +20,12 @@ class product_Core { static function get_add_form_admin() { - $form = new Forge("admin/product_lines/add_product", "", "post", array("id" => "gAddProductForm")); + $form = new Forge("admin/product_lines/add_product", "", "post", array("id" => "g-add-product-form")); $group = $form->group("add_product")->label(t("Add Product")); - $group->input("name")->label(t("Name"))->id("gProductName") + $group->input("name")->label(t("Name"))->id("g-product-name") ->error_messages("in_use", t("There is already a product with that name")); - $group->input("cost")->label(t("Cost"))->id("gCost"); - $group->input("description")->label(t("Description"))->id("gDescription"); + $group->input("cost")->label(t("Cost"))->id("g-cost"); + $group->input("description")->label(t("Description"))->id("g-description"); $group->submit("")->value(t("Add Product")); $product = ORM::factory("product"); $form->add_rules_from($product); @@ -34,13 +34,13 @@ class product_Core { static function get_edit_form_admin($product) { $form = new Forge("admin/product_lines/edit_product/$product->id", "", "post", - array("id" => "gEditProductForm")); + array("id" => "g-edit-product-form")); $group = $form->group("edit_product")->label(t("Edit Product")); - $group->input("name")->label(t("Name"))->id("gProductName")->value($product->name); + $group->input("name")->label(t("Name"))->id("g-product-name")->value($product->name); $group->inputs["name"]->error_messages( "in_use", t("There is already a product with that name")); - $group->input("cost")->label(t("Cost"))->id("gCost")->value($product->cost); - $group->input("description")->label(t("Description"))->id("gDescription")-> + $group->input("cost")->label(t("Cost"))->id("g-cost")->value($product->cost); + $group->input("description")->label(t("Description"))->id("g-description")-> value($product->description); $group->submit("")->value(t("Modify Product")); @@ -51,7 +51,7 @@ class product_Core { static function get_delete_form_admin($product) { $form = new Forge("admin/product_lines/delete_product/$product->id", "", "post", - array("id" => "gDeleteProductForm")); + array("id" => "g-delete-product-form")); $group = $form->group("delete_product")->label( t("Are you sure you want to delete product %name?", array("name" => $product->name))); $group->submit("")->value(t("Delete product %name", array("name" => $product->name))); diff --git a/modules/basket/views/add_to_basket.html.php b/modules/basket/views/add_to_basket.html.php index aad7f892..55b49f5b 100644 --- a/modules/basket/views/add_to_basket.html.php +++ b/modules/basket/views/add_to_basket.html.php @@ -3,6 +3,6 @@
id") ?>" title="" - class="gDialogLink"> + class="g-dialog-link"> Add To Basket
\ No newline at end of file diff --git a/modules/basket/views/add_to_basket_ajax.html.php b/modules/basket/views/add_to_basket_ajax.html.php index f4e38d83..137ecef2 100644 --- a/modules/basket/views/add_to_basket_ajax.html.php +++ b/modules/basket/views/add_to_basket_ajax.html.php @@ -1,5 +1,5 @@ -
+
<?= $item->title?>
diff --git a/modules/basket/views/admin_configure.html.php b/modules/basket/views/admin_configure.html.php index 5f3ae012..7ee7f09e 100644 --- a/modules/basket/views/admin_configure.html.php +++ b/modules/basket/views/admin_configure.html.php @@ -1,5 +1,5 @@ -
+

diff --git a/modules/basket/views/admin_product_lines.html.php b/modules/basket/views/admin_product_lines.html.php index c543afad..b0ee1322 100644 --- a/modules/basket/views/admin_product_lines.html.php +++ b/modules/basket/views/admin_product_lines.html.php @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ ?> -

+
" - class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all" + class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" title=""> @@ -31,8 +31,8 @@ -
- +
+
@@ -41,7 +41,7 @@ $product): ?> - "> + "> @@ -51,14 +51,14 @@ - diff --git a/modules/basket/views/checkout.html.php b/modules/basket/views/checkout.html.php index f651d633..1786969e 100644 --- a/modules/basket/views/checkout.html.php +++ b/modules/basket/views/checkout.html.php @@ -53,12 +53,12 @@ function so(){ } } -
+

Payment Details

After you have confirmed the order we will get in contact with you to arrange payment.

-" class="left gButtonLink ui-state-default ui-corner-all ui-icon-left"> +" class="left g-button ui-state-default ui-corner-all ui-icon-left"> - +
diff --git a/modules/basket/views/confirm_order.html.php b/modules/basket/views/confirm_order.html.php index 0f6ebee9..da04a5f6 100644 --- a/modules/basket/views/confirm_order.html.php +++ b/modules/basket/views/confirm_order.html.php @@ -22,10 +22,10 @@ function so(){document.confirm.submit();} -
+

Basket Summary

-
-
name) ?> description) ?> + id") ?>" open_text="" - class="gPanelLink gButtonLink ui-state-default ui-corner-all ui-icon-left"> - + class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> + id") ?>" - class="gDialogLink gButtonLink ui-state-default ui-corner-all ui-icon-left"> + class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left">
+
+
@@ -33,8 +33,7 @@ function so(){document.confirm.submit();} contents as $key => $prod_details): ?> - "> - + "> - + - "> + "> -
getItem(); ?>
@@ -50,12 +49,11 @@ function so(){document.confirm.submit();}
cost)) ?>
Total Costcost())?>
@@ -74,9 +72,9 @@ E-mail : email ?>
Telephone : phone ?>
-" class="left gButtonLink ui-state-default ui-corner-all ui-icon-left"> +" class="g-left g-button ui-state-default ui-corner-all ui-icon-left"> - +
diff --git a/modules/basket/views/order_complete.html.php b/modules/basket/views/order_complete.html.php index 1287f058..078297eb 100644 --- a/modules/basket/views/order_complete.html.php +++ b/modules/basket/views/order_complete.html.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ ?> -
+

Thankyou for your order

You will be contacted soon to arrange payment and delivery.
\ No newline at end of file diff --git a/modules/basket/views/view_basket.html.php b/modules/basket/views/view_basket.html.php index e1e51f17..bb506e06 100644 --- a/modules/basket/views/view_basket.html.php +++ b/modules/basket/views/view_basket.html.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ ?> -
+
contents ) && count($basket->contents) > 0): ?> @@ -28,14 +28,14 @@ var d=document.paypal_form.submit(); } + class="g-right g-button ui-state-default ui-corner-all ui-icon-right"> " - class="right gButtonLink ui-state-default ui-corner-all ui-icon-right"> + class="g-right g-button ui-state-default ui-corner-all ui-icon-right"> " - class="right gButtonLink ui-state-default ui-corner-all ui-icon-right"> + class="g-right g-button ui-state-default ui-corner-all ui-icon-right"> @@ -43,10 +43,10 @@ -
+
contents ) && count($basket->contents) > 0): ?> - +
@@ -58,7 +58,7 @@ contents as $key => $prod_details): ?> - "> + "> - - "> + "> @@ -103,14 +103,14 @@ + class="g-right g-button ui-state-default ui-corner-all ui-icon-right"> " - class="right gButtonLink ui-state-default ui-corner-all ui-icon-right"> + class="g-right g-button ui-state-default ui-corner-all ui-icon-right"> " - class="right gButtonLink ui-state-default ui-corner-all ui-icon-right"> + class="g-right g-button ui-state-default ui-corner-all ui-icon-right"> diff --git a/modules/batchtag/helpers/batchtag_theme.php b/modules/batchtag/helpers/batchtag_theme.php index bb9a08cb..190604f2 100644 --- a/modules/batchtag/helpers/batchtag_theme.php +++ b/modules/batchtag/helpers/batchtag_theme.php @@ -33,13 +33,13 @@ class batchtag_theme_Core { // Make a new sidebar block. $block = new Block(); - $block->css_id = "gBatchTag"; + $block->css_id = "g-batch-tag"; $block->title = t("Batch Tag"); $block->content = new View("batchtag_block.html"); // Make a new form to place in the sidebar block. $form = new Forge("batchtag/tagitems", "", "post", - array("id" => "gBatchTagForm")); + array("id" => "g-batch-tag-form")); $label = t("Tag everything in this album:"); $group = $form->group("add_tag")->label("Add Tag"); $group->input("name")->label($label)->rules("required|length[1,64]"); diff --git a/modules/contactowner/controllers/admin_contactowner.php b/modules/contactowner/controllers/admin_contactowner.php index f5972c09..1f19bec7 100644 --- a/modules/contactowner/controllers/admin_contactowner.php +++ b/modules/contactowner/controllers/admin_contactowner.php @@ -67,7 +67,7 @@ class Admin_ContactOwner_Controller extends Admin_Controller { private function _get_admin_form() { // Make a new Form. $form = new Forge("admin/contactowner/saveprefs", "", "post", - array("id" => "gContactOwnerAdminForm")); + array("id" => "g-contact-owner-adminForm")); // Make an array for the different types of link codes. $add_contactlinks = $form->group("contactOwnerLinks"); diff --git a/modules/contactowner/controllers/contactowner.php b/modules/contactowner/controllers/contactowner.php index 845454a5..631c27e7 100644 --- a/modules/contactowner/controllers/contactowner.php +++ b/modules/contactowner/controllers/contactowner.php @@ -28,7 +28,7 @@ class ContactOwner_Controller extends Controller { // Make a new form with a couple of text boxes. $form = new Forge("contactowner/sendemail", "", "post", - array("id" => "gContactOwnerSendForm")); + array("id" => "g-contact-owner-send-form")); $sendmail_fields = $form->group("contactOwner"); $sendmail_fields->input("email_to")->label(t("To:"))->value(module::get_var("contactowner", "contact_owner_name")); $sendmail_fields->input("email_from")->label(t("From:"))->value(user::active()->email); @@ -62,7 +62,7 @@ class ContactOwner_Controller extends Controller { // Make a new form with a couple of text boxes. $form = new Forge("contactowner/sendemail", "", "post", - array("id" => "gContactOwnerSendForm")); + array("id" => "g-contact-owner-send-form")); $sendmail_fields = $form->group("contactOwner"); $sendmail_fields->input("email_to")->label(t("To:"))->value($userDetails[0]->name); $sendmail_fields->input("email_from")->label(t("From:"))->value(user::active()->email); diff --git a/modules/contactowner/helpers/contactowner_theme.php b/modules/contactowner/helpers/contactowner_theme.php index 2286219b..bc243c0a 100644 --- a/modules/contactowner/helpers/contactowner_theme.php +++ b/modules/contactowner/helpers/contactowner_theme.php @@ -36,7 +36,7 @@ class contactowner_theme_Core { // Create a new block to display the links in. $block = new Block(); - $block->css_id = "gContactOwner"; + $block->css_id = "g-contact-owner"; $block->title = t("Contact:"); $block->content = new View("contactowner_block.html"); diff --git a/modules/contactowner/views/admin_contactowner.html.php b/modules/contactowner/views/admin_contactowner.html.php index 328e5820..08100e22 100644 --- a/modules/contactowner/views/admin_contactowner.html.php +++ b/modules/contactowner/views/admin_contactowner.html.php @@ -1,5 +1,5 @@ -
+

diff --git a/modules/contactowner/views/contactowner_block.html.php b/modules/contactowner/views/contactowner_block.html.php index c113564b..93ff8594 100644 --- a/modules/contactowner/views/contactowner_block.html.php +++ b/modules/contactowner/views/contactowner_block.html.php @@ -1,5 +1,5 @@ -
    +
    • diff --git a/modules/developer/js/developer.js b/modules/developer/js/developer.js index 27eee6bd..065a7316 100644 --- a/modules/developer/js/developer.js +++ b/modules/developer/js/developer.js @@ -1,6 +1,6 @@ var module_success = function(data) { - $("#gDeveloperAdmin").append('
      '); - $("#gModuleProgress").progressbar(); + $("#g-developer-admin").append('
      '); + $("#g-module-progress").progressbar(); var task = data.task; var url = data.url; @@ -10,7 +10,7 @@ var module_success = function(data) { while (!done) { $.ajax({async: false, success: function(data, textStatus) { - $("#gModuleProgress").progressbar("value", data.task.percent_complete); + $("#g-module-progress").progressbar("value", data.task.percent_complete); done = data.task.done; }, error: function(XMLHttpRequest, textStatus, errorThrown) { diff --git a/modules/developer/views/admin_controller.txt.php b/modules/developer/views/admin_controller.txt.php index 87fa082f..126470f5 100644 --- a/modules/developer/views/admin_controller.txt.php +++ b/modules/developer/views/admin_controller.txt.php @@ -47,7 +47,7 @@ class Admin__Controller extends Admin_Controller { private function _get_form() { $form = new Forge("admin//handler", "", "post", - array("id" => "gAdminForm")); + array("id" => "g-adminForm")); $group = $form->group("group"); $group->input("text")->label(t("Text"))->rules("required"); $group->submit("submit")->value(t("Submit")); diff --git a/modules/developer/views/admin_developer.html.php b/modules/developer/views/admin_developer.html.php index 46b89fe6..9608baff 100644 --- a/modules/developer/views/admin_developer.html.php +++ b/modules/developer/views/admin_developer.html.php @@ -1,14 +1,14 @@ -
      +

      -
      +
      diff --git a/modules/developer/views/admin_developer_test_data.html.php b/modules/developer/views/admin_developer_test_data.html.php index 3a1e3b8c..7e3cf92b 100644 --- a/modules/developer/views/admin_developer_test_data.html.php +++ b/modules/developer/views/admin_developer_test_data.html.php @@ -1,25 +1,25 @@ - "post", "id" => "gGenerateTestData"), $hidden) ?> + "post", "id" => "g-generate-test-data"), $hidden) ?>


      @@ -29,64 +29,64 @@

        -
      • class="gError"> +
      • class="g-error">
        - - "gGenerateAlbums", "name" => "generate_albums", "class" => "gGenerateCheckbox", "style" => "display:inline", "checked" => !empty($form["generate_albums"])), ".gRadioAlbum") ?> + + "g-generate-albums", "name" => "generate_albums", "class" => "g-generate-checkbox", "style" => "display:inline", "checked" => !empty($form["generate_albums"])), ".g-radio-album") ?> - "album_$number", "name" => "albums", "style" => "display:inline", "checked" => $number == 10, "disabled" => true, "class" => "gRadioAlbum"), $number) ?> + "album_$number", "name" => "albums", "style" => "display:inline", "checked" => $number == 10, "disabled" => true, "class" => "g-radio-album"), $number) ?>
        -

        +

        • -
      • class="gError"> +
      • class="g-error">
        - - "gGeneratePhotos", "name" => "generate_photos", "class" => "gGenerateCheckbox", "style" => "display:inline", "checked" => !empty($form["generate_photos"])), ".gRadioPhoto") ?> + + "g-generate-photos", "name" => "generate_photos", "class" => "g-generate-checkbox", "style" => "display:inline", "checked" => !empty($form["generate_photos"])), ".g-radio-photo") ?> - "photo_$number", "name" => "photos", "style" => "display:inline", "checked" => $number == 10, "disabled" => true, "class" => "gRadioPhoto"), $number) ?> + "photo_$number", "name" => "photos", "style" => "display:inline", "checked" => $number == 10, "disabled" => true, "class" => "g-radio-photo"), $number) ?>
        -

        +

        • -
      • class="gError"> +
      • class="g-error">
        - - "gGenerateComments", "name" => "generate_comments", "class" => "gGenerateCheckbox", "style" => "display:inline", "checked" => !empty($form["generate_comments"])), ".gRadioComment") ?> + + "g-generate-comments", "name" => "generate_comments", "class" => "g-generate-checkbox", "style" => "display:inline", "checked" => !empty($form["generate_comments"])), ".g-radio-comment") ?> - "comment_$number", "name" => "comments", "style" => "display:inline", "checked" => $number == 10, "disabled" => true, "class" => "gRadioComment"), $number) ?> + "comment_$number", "name" => "comments", "style" => "display:inline", "checked" => $number == 10, "disabled" => true, "class" => "g-radio-comment"), $number) ?>
        -

        +

        • -
      • class="gError"> +
      • class="g-error">
        - - "gGenerateTags", "name" => "generate_tags", "class" => "gGenerateCheckbox", "style" => "display:inline", "checked" => !empty($form["generate_tags"])), ".gRadioTag") ?> + + "g-generate-tags", "name" => "generate_tags", "class" => "g-generate-checkbox", "style" => "display:inline", "checked" => !empty($form["generate_tags"])), ".g-radio-tag") ?> - "tag_$number", "name" => "tags", "style" => "display:inline", "checked" => $number == 10, "disabled" => true, "class" => "gRadioTag"), $number) ?> + "tag_$number", "name" => "tags", "style" => "display:inline", "checked" => $number == 10, "disabled" => true, "class" => "g-radio-tag"), $number) ?>
        -

        +

      • - "gGenerateData", "name" => "generate", "class" => "submit", "style" => "clear:both!important"), t("Generate")) ?> + "g-generate-data", "name" => "generate", "class" => "submit", "style" => "clear:both!important"), t("Generate")) ?>
      diff --git a/modules/developer/views/admin_html.txt.php b/modules/developer/views/admin_html.txt.php index 5408cdab..3d230d1c 100644 --- a/modules/developer/views/admin_html.txt.php +++ b/modules/developer/views/admin_html.txt.php @@ -1,7 +1,7 @@ " ?> -
      +

      " ?>

      diff --git a/modules/developer/views/block.txt.php b/modules/developer/views/block.txt.php index 1a9bfb6a..f94e122a 100644 --- a/modules/developer/views/block.txt.php +++ b/modules/developer/views/block.txt.php @@ -34,14 +34,14 @@ class _block { $block = new Block(); switch ($block_id) { case "": - $block->css_id = "gAdmin"; + $block->css_id = "g--admin"; $block->title = t(" Dashboard Block"); $block->content = new View("admin__block.html"); $block->content->item = ORM::factory("item", 1); break; case "": - $block->css_id = "gSite"; + $block->css_id = "g--site"; $block->title = t(" Sidebar Block"); $block->content = new View("_block.html"); diff --git a/modules/developer/views/block_html.txt.php b/modules/developer/views/block_html.txt.php index b0e07a1a..9942259d 100644 --- a/modules/developer/views/block_html.txt.php +++ b/modules/developer/views/block_html.txt.php @@ -1,10 +1,10 @@ " ?> -
      +
      url() ?>\">" ?> - thumb_tag(array(\"class\" => \"gThumbnail\")) ?>" ?> + thumb_tag(array(\"class\" => \"g-thumbnail\")) ?>" ?>
      diff --git a/modules/developer/views/controller.txt.php b/modules/developer/views/controller.txt.php index 8e27afc5..7504f7ea 100644 --- a/modules/developer/views/controller.txt.php +++ b/modules/developer/views/controller.txt.php @@ -43,7 +43,7 @@ class _Controller extends Controller { private function _get_form() { $form = new Forge("/handler", "", "post", - array("id" => "gForm")); + array("id" => "g--form")); $group = $form->group("group")->label(t(" Handler")); $group->input("text")->label(t("Text"))->rules("required"); $group->submit("submit")->value(t("Submit")); diff --git a/modules/developer/views/developer_module.html.php b/modules/developer/views/developer_module.html.php index 9cc106a8..74ad2097 100644 --- a/modules/developer/views/developer_module.html.php +++ b/modules/developer/views/developer_module.html.php @@ -3,21 +3,21 @@ "post"), $hidden) ?>
        -
      • class="gError"> +
      • class="g-error"> -

        +

        -

        +

        • -
      • class="gError"> +
      • class="g-error"> -

        +

      • @@ -37,7 +37,7 @@
    • - "gGenerateModule", "name" => "generate", "class" => "submit", "style" => "clear:both!important"), t("Generate")) ?> + "g-generate-module", "name" => "generate", "class" => "submit", "style" => "clear:both!important"), t("Generate")) ?>
    diff --git a/modules/developer/views/mptt_tree.html.php b/modules/developer/views/mptt_tree.html.php index 1d6e9de9..db6d4ffd 100644 --- a/modules/developer/views/mptt_tree.html.php +++ b/modules/developer/views/mptt_tree.html.php @@ -1,9 +1,9 @@ -
    +

    -
    +
    diff --git a/modules/displaytags/helpers/displaytags_theme.php b/modules/displaytags/helpers/displaytags_theme.php index 1269556b..529ac5de 100644 --- a/modules/displaytags/helpers/displaytags_theme.php +++ b/modules/displaytags/helpers/displaytags_theme.php @@ -31,7 +31,7 @@ class displaytags_theme { // If the current item has at least one tag, display it/them. if (count($tagsItem) > 0) { $block = new Block(); - $block->css_id = "gDisplayTags"; + $block->css_id = "g-display-tags"; $block->title = t("Tags"); $block->content = new View("displaytags_block.html"); $block->content->tags = $tagsItem; diff --git a/modules/displaytags/views/displaytags_block.html.php b/modules/displaytags/views/displaytags_block.html.php index e6bcef11..509d8acf 100644 --- a/modules/displaytags/views/displaytags_block.html.php +++ b/modules/displaytags/views/displaytags_block.html.php @@ -1,5 +1,5 @@ -
    +
    ">name) ?>, diff --git a/modules/downloadfullsize/controllers/admin_downloadfullsize.php b/modules/downloadfullsize/controllers/admin_downloadfullsize.php index fcf627bd..5fa099cc 100644 --- a/modules/downloadfullsize/controllers/admin_downloadfullsize.php +++ b/modules/downloadfullsize/controllers/admin_downloadfullsize.php @@ -71,7 +71,7 @@ class Admin_DownloadFullsize_Controller extends Admin_Controller { private function _get_admin_form() { // Make a new Form. $form = new Forge("admin/downloadfullsize/saveprefs", "", "post", - array("id" => "gDownloadFullsizeAdminForm")); + array("id" => "g-download-fullsize-adminForm")); // Make an array for the different types of download links. $linkOptions["fButton"] = array(t("Show Floppy Disk Link"), module::get_var("downloadfullsize", "fButton")); diff --git a/modules/downloadfullsize/css/downloadfullsize_menu.css b/modules/downloadfullsize/css/downloadfullsize_menu.css index 50059088..a608a66a 100644 --- a/modules/downloadfullsize/css/downloadfullsize_menu.css +++ b/modules/downloadfullsize/css/downloadfullsize_menu.css @@ -1,3 +1,3 @@ -#gViewMenu #gDownloadFullsizeLink { +#g-view-menu #g-download-fullsize-link { background-image: url('../images/ico-view-downloadfullsize.png'); } diff --git a/modules/downloadfullsize/helpers/downloadfullsize_event.php b/modules/downloadfullsize/helpers/downloadfullsize_event.php index 8fdf5f18..bb4deb70 100644 --- a/modules/downloadfullsize/helpers/downloadfullsize_event.php +++ b/modules/downloadfullsize/helpers/downloadfullsize_event.php @@ -27,7 +27,7 @@ class downloadfullsize_event_Core { ->id("downloadfullsize") ->label(t("Download Fullsize Image")) ->url($downloadLink) - ->css_id("gDownloadFullsizeLink")); + ->css_id("g-download-fullsize-link")); } } } @@ -41,7 +41,7 @@ class downloadfullsize_event_Core { ->id("downloadfullsize") ->label(t("Download Video")) ->url($downloadLink) - ->css_id("gDownloadFullsizeLink")); + ->css_id("g-download-fullsize-link")); } } } diff --git a/modules/downloadfullsize/helpers/downloadfullsize_theme.php b/modules/downloadfullsize/helpers/downloadfullsize_theme.php index a1d8114b..a8ab828e 100644 --- a/modules/downloadfullsize/helpers/downloadfullsize_theme.php +++ b/modules/downloadfullsize/helpers/downloadfullsize_theme.php @@ -31,7 +31,7 @@ class downloadfullsize_theme { if ($item && $item->is_movie() && access::can("view_full", $item)) { if (module::get_var("downloadfullsize", "tButton")) { $block = new Block(); - $block->css_id = "gDownloadFullsize"; + $block->css_id = "g-download-fullsize"; $block->title = t("Download"); $block->content = new View("downloadfullsize_block.html"); @@ -44,7 +44,7 @@ class downloadfullsize_theme { if ($item && $item->is_photo() && access::can("view_full", $item)) { if (module::get_var("downloadfullsize", "tButton")) { $block = new Block(); - $block->css_id = "gDownloadFullsize"; + $block->css_id = "g-download-fullsize"; $block->title = t("Download"); $block->content = new View("downloadfullsize_block.html"); diff --git a/modules/downloadfullsize/views/admin_downloadfullsize.html.php b/modules/downloadfullsize/views/admin_downloadfullsize.html.php index d978054d..5dc5cef6 100644 --- a/modules/downloadfullsize/views/admin_downloadfullsize.html.php +++ b/modules/downloadfullsize/views/admin_downloadfullsize.html.php @@ -1,5 +1,5 @@ -
    +

    diff --git a/modules/downloadfullsize/views/downloadfullsize_block.html.php b/modules/downloadfullsize/views/downloadfullsize_block.html.php index 58c209b5..1cd59b5e 100644 --- a/modules/downloadfullsize/views/downloadfullsize_block.html.php +++ b/modules/downloadfullsize/views/downloadfullsize_block.html.php @@ -1,18 +1,18 @@ item->is_photo()) { ?> -
    +
    item") ?>" title="" - class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="g-button ui-icon-left ui-state-default ui-corner-all">
    item->is_movie()) { ?> -
    +
    item") ?>" title="" - class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="g-button ui-icon-left ui-state-default ui-corner-all">
    diff --git a/modules/dynamic/controllers/admin_dynamic.php b/modules/dynamic/controllers/admin_dynamic.php index 50dac459..a2bdb829 100644 --- a/modules/dynamic/controllers/admin_dynamic.php +++ b/modules/dynamic/controllers/admin_dynamic.php @@ -54,7 +54,7 @@ class Admin_Dynamic_Controller extends Admin_Controller { private function _get_form() { $form = new Forge("admin/dynamic/handler", "", "post", - array("id" => "gAdminForm")); + array("id" => "g-admin-form")); foreach (array("updates", "popular") as $album) { $album_defn = unserialize(module::get_var("dynamic", $album)); diff --git a/modules/dynamic/helpers/dynamic_theme.php b/modules/dynamic/helpers/dynamic_theme.php index ba355098..c3cbc3d0 100644 --- a/modules/dynamic/helpers/dynamic_theme.php +++ b/modules/dynamic/helpers/dynamic_theme.php @@ -27,7 +27,7 @@ class dynamic_theme { } if (!empty($albums)) { $block = new Block(); - $block->css_id = "gDynamic"; + $block->css_id = "g-dynamic"; $block->title = t("Dynamic Albums"); $block->content = new View("dynamic_block.html"); $block->content->albums = $albums; diff --git a/modules/dynamic/views/admin_dynamic.html.php b/modules/dynamic/views/admin_dynamic.html.php index cd7ccfea..69b1eda8 100644 --- a/modules/dynamic/views/admin_dynamic.html.php +++ b/modules/dynamic/views/admin_dynamic.html.php @@ -1,5 +1,5 @@ -
    +

    diff --git a/modules/dynamic/views/dynamic_block.html.php b/modules/dynamic/views/dynamic_block.html.php index d14c2900..febf5d3f 100644 --- a/modules/dynamic/views/dynamic_block.html.php +++ b/modules/dynamic/views/dynamic_block.html.php @@ -1,5 +1,5 @@ -
    +
      $text): ?>
    • diff --git a/modules/embedlinks/controllers/admin_embedlinks.php b/modules/embedlinks/controllers/admin_embedlinks.php index 57b71cd3..a5040d07 100644 --- a/modules/embedlinks/controllers/admin_embedlinks.php +++ b/modules/embedlinks/controllers/admin_embedlinks.php @@ -79,7 +79,7 @@ class Admin_EmbedLinks_Controller extends Admin_Controller { private function _get_admin_form() { // Make a new Form. $form = new Forge("admin/embedlinks/saveprefs", "", "post", - array("id" => "gEmbedLinksAdminForm")); + array("id" => "g-embed-links-adminForm")); // Make an array for the different types of link codes. $linkCodes["HTMLCode"] = array(t("Show HTML Links"), module::get_var("embedlinks", "HTMLCode")); diff --git a/modules/embedlinks/helpers/embedlinks_theme.php b/modules/embedlinks/helpers/embedlinks_theme.php index dd4d3369..251b7e5c 100644 --- a/modules/embedlinks/helpers/embedlinks_theme.php +++ b/modules/embedlinks/helpers/embedlinks_theme.php @@ -23,7 +23,7 @@ class embedlinks_theme_Core { // display links to the current album in the theme sidebar. if ($theme->item()->is_album() && module::get_var("embedlinks", "InPageLinks")) { $block = new Block(); - $block->css_id = "gMetadata"; + $block->css_id = "g-metadata"; $block->title = t("Links"); $block->content = new View("embedlinks_album_block.html"); return $block; @@ -36,7 +36,7 @@ class embedlinks_theme_Core { // to open up the dialog window. if (module::get_var("embedlinks", "DialogLinks")) { $block = new Block(); - $block->css_id = "gMetadata"; + $block->css_id = "g-metadata"; $block->title = t("Link To This Page:"); $block->content = new View("embedlinks_sidebar.html"); return $block; @@ -49,7 +49,7 @@ class embedlinks_theme_Core { // of the page. if (module::get_var("embedlinks", "InPageLinks")) { $block = new Block(); - $block->css_id = "gMetadata"; + $block->css_id = "g-metadata"; $block->title = t("Links"); $block->content = new View("embedlinks_photo_block.html"); return $block; diff --git a/modules/embedlinks/views/admin_embedlinks.html.php b/modules/embedlinks/views/admin_embedlinks.html.php index 060ded3a..9aa272c3 100644 --- a/modules/embedlinks/views/admin_embedlinks.html.php +++ b/modules/embedlinks/views/admin_embedlinks.html.php @@ -1,5 +1,5 @@ -
      + diff --git a/modules/embedlinks/views/embedlinks_album_block.html.php b/modules/embedlinks/views/embedlinks_album_block.html.php index 85a38a92..220bf74d 100644 --- a/modules/embedlinks/views/embedlinks_album_block.html.php +++ b/modules/embedlinks/views/embedlinks_album_block.html.php @@ -5,7 +5,7 @@ input[type="text"] { } -
getItem(); ?> @@ -76,19 +76,19 @@ cost?> cost)) ?> + + class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> + " - class="gButtonLink ui-state-default ui-corner-all ui-icon-left"> + class="g-button ui-state-default ui-corner-all ui-icon-left">
Total Cost
+
@@ -25,7 +25,7 @@ input[type="text"] { -
+
@@ -45,7 +45,7 @@ input[type="text"] { -
+
diff --git a/modules/embedlinks/views/embedlinks_bbcodedialog.html.php b/modules/embedlinks/views/embedlinks_bbcodedialog.html.php index ea83bb0f..3b7cace1 100644 --- a/modules/embedlinks/views/embedlinks_bbcodedialog.html.php +++ b/modules/embedlinks/views/embedlinks_bbcodedialog.html.php @@ -5,10 +5,10 @@ input[type="text"] { }

-
+
+
diff --git a/modules/embedlinks/views/embedlinks_fullurldialog.html.php b/modules/embedlinks/views/embedlinks_fullurldialog.html.php index dfefb75a..2b40c8a1 100644 --- a/modules/embedlinks/views/embedlinks_fullurldialog.html.php +++ b/modules/embedlinks/views/embedlinks_fullurldialog.html.php @@ -5,10 +5,10 @@ input[type="text"] { }

-
+
+
diff --git a/modules/embedlinks/views/embedlinks_htmldialog.html.php b/modules/embedlinks/views/embedlinks_htmldialog.html.php index 2524648a..5847e8cc 100644 --- a/modules/embedlinks/views/embedlinks_htmldialog.html.php +++ b/modules/embedlinks/views/embedlinks_htmldialog.html.php @@ -5,10 +5,10 @@ input[type="text"] { }

-
+
-
+
diff --git a/modules/embedlinks/views/embedlinks_photo_block.html.php b/modules/embedlinks/views/embedlinks_photo_block.html.php index a45c042b..baf4c2e2 100644 --- a/modules/embedlinks/views/embedlinks_photo_block.html.php +++ b/modules/embedlinks/views/embedlinks_photo_block.html.php @@ -7,7 +7,7 @@ input[type="text"] {

-
+
@@ -90,7 +90,7 @@ input[type="text"] {

-
+
@@ -166,7 +166,7 @@ input[type="text"] {

-
+
diff --git a/modules/embedlinks/views/embedlinks_sidebar.html.php b/modules/embedlinks/views/embedlinks_sidebar.html.php index 72b60859..21d8b7f3 100644 --- a/modules/embedlinks/views/embedlinks_sidebar.html.php +++ b/modules/embedlinks/views/embedlinks_sidebar.html.php @@ -1,7 +1,7 @@ id}") ?>" title="" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
@@ -9,7 +9,7 @@ id}") ?>" title="" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> @@ -17,7 +17,7 @@ id}") ?>" title="" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> diff --git a/modules/gmaps/helpers/gmaps_theme.php b/modules/gmaps/helpers/gmaps_theme.php index 582eccfe..0eec4e79 100644 --- a/modules/gmaps/helpers/gmaps_theme.php +++ b/modules/gmaps/helpers/gmaps_theme.php @@ -21,7 +21,7 @@ class gmaps_theme_Core { static function sidebar_blocks($theme) { if ($theme->item()) { $block = new Block(); - $block->css_id = "gMaps"; + $block->css_id = "g-maps"; $block->title = t("Location"); $block->content = new View("gmaps_block.html"); return $block; diff --git a/modules/google_analytics/controllers/admin_google_analytics.php b/modules/google_analytics/controllers/admin_google_analytics.php index cf3eef5a..ee9d1736 100644 --- a/modules/google_analytics/controllers/admin_google_analytics.php +++ b/modules/google_analytics/controllers/admin_google_analytics.php @@ -43,7 +43,7 @@ class Admin_Google_Analytics_Controller extends Admin_Controller { } private function _get_form() { - $form = new Forge("admin/google_analytics/handler", "", "post", array("id" => "gAdminForm")); + $form = new Forge("admin/google_analytics/handler", "", "post", array("id" => "g-admin-form")); $group = $form->group("google_analytics_code"); $group->input("analytics_code")->label(t('Enter the Web-Property-ID given by Google.'))->rules("required")->value(module::get_var("google_analytics", "code")); $group->submit("submit")->value(t("Save")); diff --git a/modules/google_analytics/views/admin_google_analytics.html.php b/modules/google_analytics/views/admin_google_analytics.html.php index 328fcb73..e516f35a 100644 --- a/modules/google_analytics/views/admin_google_analytics.html.php +++ b/modules/google_analytics/views/admin_google_analytics.html.php @@ -1,5 +1,5 @@ -
+

diff --git a/modules/keeporiginal/helpers/keeporiginal_event.php b/modules/keeporiginal/helpers/keeporiginal_event.php index 2dbf19be..ca7fd91a 100644 --- a/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/modules/keeporiginal/helpers/keeporiginal_event.php @@ -108,7 +108,7 @@ class keeporiginal_event_Core { ->append(Menu::factory("link") ->id("restore") ->label(t("Restore original")) - ->css_id("gKeepOriginalLink") + ->css_id("g-keep-originals-link") ->url(url::site("keeporiginal/restore/" . $item->id))); } } diff --git a/modules/latestupdates/helpers/latestupdates_theme.php b/modules/latestupdates/helpers/latestupdates_theme.php index 8a5f1dae..69f3d72e 100644 --- a/modules/latestupdates/helpers/latestupdates_theme.php +++ b/modules/latestupdates/helpers/latestupdates_theme.php @@ -26,7 +26,7 @@ class latestupdates_theme_Core { $albumID = $theme->item->is_album() ? $theme->item->id : $theme->item->parent_id; $block = new Block(); - $block->css_id = "gUpdatesBlock"; + $block->css_id = "g-updates-block"; $block->title = t("Updates"); $block->content = new View("latestupdates_block.html"); $block->content->update_links = array( diff --git a/modules/latestupdates/views/latestupdates_block.html.php b/modules/latestupdates/views/latestupdates_block.html.php index 0cc708ae..b1dd9074 100644 --- a/modules/latestupdates/views/latestupdates_block.html.php +++ b/modules/latestupdates/views/latestupdates_block.html.php @@ -1,5 +1,5 @@ -