diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-10-04 00:27:22 -0600 | 
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-10-04 00:27:22 -0600 | 
| commit | 3e6ba7acc3291f2268cbe9c9bef0a492b557babb (patch) | |
| tree | 079c1bd09ab1cfcf35524f2e541c586a95f205e4 /modules/comment | |
| parent | 9145331fd420ec3fe86833a7b9567ec42f1d84e8 (diff) | |
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.
Diffstat (limited to 'modules/comment')
| -rw-r--r-- | modules/comment/helpers/comment.php | 20 | ||||
| -rw-r--r-- | modules/comment/helpers/comment_block.php | 2 | ||||
| -rw-r--r-- | modules/comment/helpers/comment_event.php | 2 | ||||
| -rw-r--r-- | modules/comment/helpers/comment_theme.php | 2 | ||||
| -rw-r--r-- | modules/comment/js/comment.js | 26 | ||||
| -rw-r--r-- | modules/comment/views/admin_block_recent_comments.html.php | 4 | ||||
| -rw-r--r-- | modules/comment/views/admin_comments.html.php | 20 | ||||
| -rw-r--r-- | modules/comment/views/comment.html.php | 6 | ||||
| -rw-r--r-- | modules/comment/views/comments.html.php | 14 | 
9 files changed, 48 insertions, 48 deletions
| diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php index f74a8644..7b2332a8 100644 --- a/modules/comment/helpers/comment.php +++ b/modules/comment/helpers/comment.php @@ -65,12 +65,12 @@ class comment_Core {    }    static function get_add_form($item) { -    $form = new Forge("comments", "", "post", array("id" => "gAddCommentForm")); +    $form = new Forge("comments", "", "post", array("id" => "g-comment-form"));      $group = $form->group("add_comment")->label(t("Add comment")); -    $group->input("name")   ->label(t("Name"))            ->id("gAuthor"); -    $group->input("email")  ->label(t("Email (hidden)"))  ->id("gEmail"); -    $group->input("url")    ->label(t("Website (hidden)"))->id("gUrl"); -    $group->textarea("text")->label(t("Comment"))         ->id("gText"); +    $group->input("name")   ->label(t("Name"))            ->id("g-author"); +    $group->input("email")  ->label(t("Email (hidden)"))  ->id("g-email"); +    $group->input("url")    ->label(t("Website (hidden)"))->id("g-url"); +    $group->textarea("text")->label(t("Comment"))         ->id("g-text");      $group->hidden("item_id")->value($item->id);      module::event("comment_add_form", $form);      $group->submit("")->value(t("Add")); @@ -90,12 +90,12 @@ class comment_Core {    static function get_edit_form($comment) {      $form = new Forge("comments/{$comment->id}?_method=put", "", "post", -                      array("id" => "gEditCommentForm")); +                      array("id" => "g-edit-comment-form"));      $group = $form->group("edit_comment")->label(t("Edit comment")); -    $group->input("name")   ->label(t("Author"))          ->id("gAuthor"); -    $group->input("email")  ->label(t("Email (hidden)"))  ->id("gEmail"); -    $group->input("url")    ->label(t("Website (hidden)"))->id("gUrl"); -    $group->textarea("text")->label(t("Comment"))         ->id("gText"); +    $group->input("name")   ->label(t("Author"))          ->id("g-author"); +    $group->input("email")  ->label(t("Email (hidden)"))  ->id("g-email"); +    $group->input("url")    ->label(t("Website (hidden)"))->id("g-url"); +    $group->textarea("text")->label(t("Comment"))         ->id("g-text");      $group->submit("")->value(t("Edit"));      $group->text = $comment->text; diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php index b989be6b..c00c6c51 100644 --- a/modules/comment/helpers/comment_block.php +++ b/modules/comment/helpers/comment_block.php @@ -26,7 +26,7 @@ class comment_block_Core {      $block = new Block();      switch ($block_id) {      case "recent_comments": -      $block->css_id = "gRecentComments"; +      $block->css_id = "g-recent-comments";        $block->title = t("Recent Comments");        $block->content = new View("admin_block_recent_comments.html");        $block->content->comments = diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php index 0234aea9..2199eb7f 100644 --- a/modules/comment/helpers/comment_event.php +++ b/modules/comment/helpers/comment_event.php @@ -36,7 +36,7 @@ class comment_event_Core {                 ->id("comments")                 ->label(t("View comments on this item"))                 ->url("#comments") -               ->css_id("gCommentsLink")); +               ->css_id("g-comments-link"));    }    static function item_index_data($item, $data) { diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php index e9b402f6..10c855db 100644 --- a/modules/comment/helpers/comment_theme.php +++ b/modules/comment/helpers/comment_theme.php @@ -25,7 +25,7 @@ class comment_theme_Core {    static function photo_bottom($theme) {      $block = new Block; -    $block->css_id = "gComments"; +    $block->css_id = "g-comments";      $block->title = t("Comments");      $block->anchor = "comments"; diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js index 6e985626..96370fb1 100644 --- a/modules/comment/js/comment.js +++ b/modules/comment/js/comment.js @@ -1,43 +1,43 @@  $("document").ready(function() { -  $("#gAddCommentButton").click(function(event) { +  $("#g-admin-comment-button").click(function(event) {      event.preventDefault(); -    if (!$("#gAddCommentForm").length) { +    if (!$("#g-comment-form").length) {        $.get($(this).attr("href"),  	    {},  	    function(data) { -	      $("#gCommentDetail").append(data); +	      $("#g-comment-detail").append(data);  	      ajaxify_comment_form();  	    });      }    }); -  $("#gNoComments").click(function(event) { +  $("#g-no-comments").click(function(event) {      event.preventDefault(); -    if (!$("#gAddCommentForm").length) { +    if (!$("#g-comment-form").length) {        $.get($(this).attr("href"),  	    {},  	    function(data) { -	      $("#gCommentDetail").append(data); +	      $("#g-comment-detail").append(data);  	      ajaxify_comment_form();  	    }); -      $("#gNoCommentsYet").remove(); +      $("#g-no-comments-yet").remove();      }    });  });  function ajaxify_comment_form() { -  $("#gComments form").ajaxForm({ +  $("#g-comments form").ajaxForm({      dataType: "json",      success: function(data) {        if (data.form) { -        $("#gComments form").replaceWith(data.form); +        $("#g-comments form").replaceWith(data.form);          ajaxify_comment_form();        }        if (data.result == "success") {          $.get(data.resource, function(data, textStatus) { -          $("#gComments .gBlockContent ul:first").append("<li>"+data+"</li>"); -          $("#gComments .gBlockContent ul:first li:last").effect("highlight", {color: "#cfc"}, 8000); -          $("#gAddCommentForm").hide(2000).remove(); -	  $("#gNoCommentsYet").hide(2000); +          $("#g-comments .g-block-content ul:first").append("<li>"+data+"</li>"); +          $("#g-comments .g-block-content ul:first li:last").effect("highlight", {color: "#cfc"}, 8000); +          $("#g-comment-form").hide(2000).remove(); +	  $("#g-no-comments-yet").hide(2000);          });        }      } diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php index ca0d1c0b..7941e02d 100644 --- a/modules/comment/views/admin_block_recent_comments.html.php +++ b/modules/comment/views/admin_block_recent_comments.html.php @@ -1,9 +1,9 @@  <?php defined("SYSPATH") or die("No direct script access.") ?>  <ul>    <? foreach ($comments as $i => $comment): ?> -  <li class="<?= ($i % 2 == 0) ? "g-even-row" : "g-odd-row" ?>"> +  <li class="<?= ($i % 2 == 0) ? "g-even" : "g-odd" ?>">      <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>" -         class="gAvatar" +         class="g-avatar"           alt="<?= html::clean_attribute($comment->author_name()) ?>"           width="32"           height="32" /> diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 82de378c..0e8dd525 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -6,7 +6,7 @@      $.get(set_state_url.replace("__STATE__", state).replace("__ID__", id),            {},            function() { -            $("#gComment-" + id).slideUp(); +            $("#g-comment-" + id).slideUp();              update_menu();            });    } @@ -18,7 +18,7 @@      $.get(delete_url.replace("__ID__", id),            {},            function() { -            $("#gComment-" + id).slideUp(); +            $("#g-comment-" + id).slideUp();              update_menu();            });    } @@ -27,18 +27,18 @@      $.get(<?= html::js_string(url::site("admin/comments/menu_labels")) ?>, {},            function(data) {              for (var i = 0; i < data.length; i++) { -              $("#gAdminCommentsMenu li:eq(" + i + ") a").html(data[i]); +              $("#g-admin-comments-menu li:eq(" + i + ") a").html(data[i]);              }            },            "json");    }  </script> -<div id="gAdminComments"> +<div id="g-admin-comments">    <h1> <?= t("Manage Comments") ?> </h1>    <!-- @todo: Highlight active menu option --> -  <div id="gAdminCommentsMenu"> +  <div id="g-admin-comments-menu">      <?= $menu ?>    </div> @@ -90,7 +90,7 @@    </div>    <? endif ?> -  <table id="gAdminCommentsList"> +  <table id="g-admin-commentsList">      <tr>        <th>          <?= t("Author") ?> @@ -103,11 +103,11 @@        </th>      </tr>      <? foreach ($comments as $i => $comment): ?> -    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?>"> +    <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="gAvatar" +               class="g-avatar"                 alt="<?= html::clean_attribute($comment->author_name()) ?>"                 width="40"                 height="40" /> @@ -118,7 +118,7 @@        <td>          <div class="g-right">            <? $item = $comment->item() ?> -          <div class="gItem gPhoto"> +          <div class="g-item g-photo">              <a href="<?= $item->url() ?>">                <? if ($item->has_thumb()): ?>                <img src="<?= $item->thumb_url() ?>" @@ -135,7 +135,7 @@             <?= nl2br(html::purify($comment->text)) ?>        </td>        <td> -        <ul class="gButtonSetVertical"> +        <ul class="g-buttonset-vertical">          <? if ($comment->state != "unpublished"): ?>            <li>              <a href="javascript:set_state('unpublished',<?=$comment->id?>)" diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php index ce4e197d..c7957c15 100644 --- a/modules/comment/views/comment.html.php +++ b/modules/comment/views/comment.html.php @@ -1,9 +1,9 @@  <?php defined("SYSPATH") or die("No direct script access.") ?> -<li id="gComment-<?= $comment->id; ?>"> -  <p class="gAuthor"> +<li id="g-comment-<?= $comment->id; ?>"> +  <p class="g-author">      <a href="#">        <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>" -           class="gAvatar" +           class="g-avatar"             alt="<?= html::clean_attribute($comment->author_name()) ?>"             width="40"             height="40" /> diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index ee4a8ad6..636f1522 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -1,23 +1,23 @@  <?php defined("SYSPATH") or die("No direct script access.") ?> -  <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="gAddCommentButton" +  <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="g-admin-comment-button"     class="g-button ui-corner-all ui-icon-left ui-state-default right">    <span class="ui-icon ui-icon-comment"></span>    <?= t("Add a comment") ?>  </a> -<div id="gCommentDetail"> +<div id="g-comment-detail">  <? if (!$comments->count()): ?> -<p id="gNoCommentsYet"> +<p id="g-no-comments-yet">    <?= t("No comments yet. Be the first to <a %attrs>comment</a>!", -        array("attrs" => html::mark_clean("id= \"gNoComments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?> +        array("attrs" => html::mark_clean("id= \"g-no-comments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>  </p>  <? endif ?>  <ul>    <? foreach ($comments as $comment): ?> -  <li id="gComment-<?= $comment->id ?>"> -    <p class="gAuthor"> +  <li id="g-comment-<?= $comment->id ?>"> +    <p class="g-author">        <a href="#">          <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>" -             class="gAvatar" +             class="g-avatar"               alt="<?= html::clean_attribute($comment->author_name()) ?>"               width="40"               height="40" /> | 
