From d7e6c71ede78bd0d38f14578f44a24fc00d56845 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Thu, 18 Jun 2009 01:47:29 -0700
Subject: Fix l10n messages (malformed html)

---
 modules/comment/views/comments.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/comment/views')

diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 95f07baf..854f9554 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -16,7 +16,7 @@
              width="40"
              height="40" />
       </a>
-      <?= t("on %date <a href=#>%name</a> said",
+      <?= t('on %date <a href="#">%name</a> said',
             array("date" => date("Y-M-d H:i:s", $comment->created),
                   "name" => p::clean($comment->author_name()))); ?>
     </p>
-- 
cgit v1.2.3


From 4384b67be1aedfbc71e3cb7e399df88fcb87ff9c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 24 Jun 2009 21:30:48 -0700
Subject: Comment out [reply] and [edit] links because they're not implemented
 yet.  This closes ticket #416, and I'll open a new ticket to implement these
 functions.

---
 modules/comment/views/admin_comments.html.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/comment/views')

diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index e749fde0..86585c65 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -163,6 +163,7 @@
             </a>
           </li>
         <? endif ?>
+          <!--
           <li>
             <a href="javascript:reply(<?=$comment->id?>)"
                 class="gButtonLink ui-state-default ui-icon-left">
@@ -177,6 +178,7 @@
               <?= t("Edit") ?>
             </a>
           </li>
+          -->
           <li>
             <a href="javascript:set_state('deleted',<?=$comment->id?>)"
                 class="gButtonLink ui-state-default ui-icon-left">
-- 
cgit v1.2.3


From 6e8a8c53e685a6c3f35f1426ab4dd6dcc18578e0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 19:49:48 -0700
Subject: Rename $theme->url() to $theme->theme_url() for consistency wiht
 $theme->theme_script().

---
 modules/comment/views/admin_block_recent_comments.html.php | 2 +-
 modules/comment/views/admin_comments.html.php              | 2 +-
 modules/comment/views/comment.html.php                     | 2 +-
 modules/comment/views/comments.html.php                    | 2 +-
 modules/gallery/libraries/Gallery_View.php                 | 2 +-
 modules/user/views/admin_users.html.php                    | 2 +-
 themes/admin_default/views/admin.html.php                  | 4 ++--
 themes/default/views/header.html.php                       | 2 +-
 themes/default/views/page.html.php                         | 6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'modules/comment/views')

diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index edaa19ae..af4d946e 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -2,7 +2,7 @@
 <ul>
   <? foreach ($comments as $i => $comment): ?>
   <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
-    <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
+    <img src="<?= $comment->author()->avatar_url(32, $theme->theme_url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
          alt="<?= p::clean($comment->author_name()) ?>"
          width="32"
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 86585c65..453cf849 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -106,7 +106,7 @@
     <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
       <td>
         <a href="#">
-          <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+          <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
                class="gAvatar"
                alt="<?= p::clean($comment->author_name()) ?>"
                width="40"
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index ce52951b..6d2cc592 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -2,7 +2,7 @@
 <li id="gComment-<?= $comment->id; ?>">
   <p class="gAuthor">
     <a href="#">
-      <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+      <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
            class="gAvatar"
            alt="<?= p::clean($comment->author_name()) ?>"
            width="40"
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 854f9554..d9405e5f 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -10,7 +10,7 @@
   <li id="gComment-<?= $comment->id ?>">
     <p class="gAuthor">
       <a href="#">
-        <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+        <img src="<?= $comment->author()->avatar_url(40, $theme->theme_url("images/avatar.jpg", true)) ?>"
              class="gAvatar"
              alt="<?= p::clean($comment->author_name()) ?>"
              width="40"
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index f2298b7d..e21e83d8 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -43,7 +43,7 @@ class Gallery_View_Core extends View {
    * Provide a url to a resource within the current theme.  This allows us to refer to theme
    * resources without naming the theme itself which makes themes easier to copy.
    */
-  public function url($path, $absolute_url=false) {
+  public function theme_url($path, $absolute_url=false) {
     $arg = "themes/{$this->theme_name}/$path";
     return $absolute_url ? url::abs_file($arg) : url::file($arg);
   }
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 542b8b8b..b469f82d 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -66,7 +66,7 @@
       <? foreach ($users as $i => $user): ?>
       <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user <?= $user->admin ? "admin" : "" ?>">
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
-          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
+          <img src="<?= $user->avatar_url(20, $theme->theme_url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member") ?>"
                alt="<?= p::clean($user->name) ?>"
                width="20"
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 2a91a76c..62f9761f 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -14,10 +14,10 @@
         media="screen,projection" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("themes/default/css/screen.css") ?>"
         media="screen,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
         media="screen,projection" />
    <!--[if IE]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
         media="screen,print,projection" />
    <![endif]-->
 
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index e1e52bda..b38cffed 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,7 +4,7 @@
 <?= $header_text ?>
 <? else: ?>
 <a href="<?= url::site("albums/1") ?>">
-  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+  <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
 </a>
 <? endif ?>
 
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 8b9466ac..3ae3e155 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -23,17 +23,17 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= $theme->theme_url("images/favicon.ico") ?>" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
           media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
           media="screen" />
     <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
           media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>"
           media="screen,print,projection" />
     <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
           media="screen,print,projection" />
     <![endif]-->
     <? if ($theme->page_type == 'album'): ?>
-- 
cgit v1.2.3