summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/gallery.common.css3
-rw-r--r--modules/comment/tests/Comment_Helper_Test.php2
-rw-r--r--modules/comment/views/admin_block_recent_comments.html.php4
-rw-r--r--modules/comment/views/admin_comments.html.php4
-rw-r--r--modules/gallery/controllers/upgrader.php2
-rw-r--r--modules/gallery/css/upgrader.css18
-rw-r--r--modules/gallery/libraries/Theme_View.php12
-rw-r--r--modules/gallery/tests/Albums_Controller_Test.php10
-rw-r--r--modules/gallery/tests/Controller_Auth_Test.php13
-rw-r--r--modules/gallery/tests/Photos_Controller_Test.php8
-rw-r--r--modules/gallery/tests/xss_data.txt291
-rw-r--r--modules/gallery/views/admin_advanced_settings.html.php4
-rw-r--r--modules/gallery/views/admin_identity.html.php4
-rw-r--r--modules/gallery/views/admin_maintenance.html.php12
-rw-r--r--modules/gallery/views/admin_modules.html.php4
-rw-r--r--modules/gallery/views/upgrader.html.php59
-rw-r--r--modules/rss/views/feed.mrss.php4
17 files changed, 261 insertions, 193 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 99197b49..1ebeadbe 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -333,8 +333,7 @@ form .g-error {
font-weight: bold;
}
-.g-draggable,
-.ui-draggable {
+.g-draggable {
cursor: move;
}
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index 9a8c83f1..82b7ebd2 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -24,6 +24,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
public function setup() {
$this->_ip_address = Input::instance()->ip_address;
$this->_user_agent = Kohana::$user_agent;
+ $this->_save = $_SERVER;
$_SERVER["HTTP_ACCEPT"] = "HTTP_ACCEPT";
$_SERVER["HTTP_ACCEPT_CHARSET"] = "HTTP_ACCEPT_CHARSET";
@@ -42,6 +43,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
public function teardown() {
Input::instance()->ip_address = $this->_ip_address;
Kohana::$user_agent = $this->_user_agent;
+ $_SERVER = $this->_save;
}
public function create_comment_for_guest_test() {
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index 7941e02d..d9776def 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -1,7 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<ul>
- <? foreach ($comments as $i => $comment): ?>
- <li class="<?= ($i % 2 == 0) ? "g-even" : "g-odd" ?>">
+ <? foreach ($comments as $comment): ?>
+ <li class="<?= text::alternate("g-even", "g-odd") ?>">
<img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
class="g-avatar"
alt="<?= html::clean_attribute($comment->author_name()) ?>"
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index b138702c..20236a7a 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -103,8 +103,8 @@
<?= t("Actions") ?>
</th>
</tr>
- <? foreach ($comments as $i => $comment): ?>
- <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+ <? foreach ($comments as $comment): ?>
+ <tr id="g-comment-<?= $comment->id ?>" class="<?= text::alternate("g-odd", "g-even") ?>">
<td>
<a href="#">
<img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index a86e8af9..48769bce 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -43,7 +43,7 @@ class Upgrader_Controller extends Controller {
$view->can_upgrade = identity::active_user()->admin || $session->get("can_upgrade");
$view->upgrade_token = $upgrade_token;
$view->available = module::available();
- $view->done = ($available_upgrades == 0);
+ $view->done = $available_upgrades == 0;
print $view;
}
diff --git a/modules/gallery/css/upgrader.css b/modules/gallery/css/upgrader.css
index 64e4ca07..73da0ff4 100644
--- a/modules/gallery/css/upgrader.css
+++ b/modules/gallery/css/upgrader.css
@@ -37,7 +37,7 @@ td {
}
tr.current td {
- color: #999;
+ opacity: 0.5;
font-style: italic;
}
@@ -87,11 +87,13 @@ div.button a {
text-decoration: none;
}
-div.button:hover {
+div.button-active:hover {
background: #ccc;
}
-div#confirmation {
+div#dialog {
+ width: 340px;
+ height: 200px;
position: absolute;
background: blue;
z-index: 1000;
@@ -99,21 +101,23 @@ div#confirmation {
text-align: center;
}
-div#confirmation a.close {
+div#dialog a.close {
float: right;
padding: 10px;
text-decoration: none;
}
-div#confirmation div {
+div#dialog div {
+ width: 292px;
+ height: 152px;
margin: 2px;
padding: 20px;
border: 2px solid #999;
background: #eee;
}
-.gray_on_done {
- opacity: <?= $done ? "0.5" : "1" ?>;
+.muted {
+ opacity: 0.5;
}
pre {
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index b5546a43..e98914c4 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -154,13 +154,13 @@ class Theme_View_Core extends Gallery_View {
$v->total = $this->children_count;
if ($this->page != 1) {
- $v->first_page_url = url::merge(array("page" => 1));
- $v->first_page_url = url::merge(array("page" => $this->page - 1));
+ $v->first_page_url = url::site(url::merge(array("page" => 1)));
+ $v->previous_page_url = url::site(url::merge(array("page" => $this->page - 1)));
}
if ($this->page != $this->max_pages) {
- $v->next_page_url = url::merge(array("page" => $this->page + 1));
- $v->last_page_url = url::merge(array("page" => $this->max_pages));
+ $v->next_page_url = url::site(url::merge(array("page" => $this->page + 1)));
+ $v->last_page_url = url::site(url::merge(array("page" => $this->max_pages)));
}
$v->first_visible_position = ($this->page - 1) * $this->page_size + 1;
@@ -168,11 +168,11 @@ class Theme_View_Core extends Gallery_View {
} else {
$v->position = $this->position;
$v->total = $this->sibling_count;
- if ($v->previous_page = $this->previous_item) {
+ if ($this->previous_item) {
$v->previous_page_url = $this->previous_item->url();
}
- if ($v->next_page = $this->next_item) {
+ if ($this->next_item) {
$v->next_page_url = $this->next_item->url();
}
}
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index 5974c6f9..8562355c 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -19,13 +19,13 @@
*/
class Albums_Controller_Test extends Unit_Test_Case {
public function setup() {
- $this->_post = $_POST;
- $this->_album = null;
+ $this->_save = array($_POST, $_SERVER);
+ $_SERVER["HTTP_REFERER"] = "HTTP_REFERER";
}
public function teardown() {
- $_POST = $this->_post;
- if ($this->_album) {
+ list($_POST, $_SERVER) = $this->_save;
+ if (isset($this->_album)) {
$this->_album->delete();
}
}
@@ -53,7 +53,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
ob_end_clean();
$this->assert_equal(
- json_encode(array("result" => "success", "location" => "")),
+ json_encode(array("result" => "success", "location" => "HTTP_REFERER")),
$results);
$this->assert_equal("new title", $this->_album->title);
$this->assert_equal("new description", $this->_album->description);
diff --git a/modules/gallery/tests/Controller_Auth_Test.php b/modules/gallery/tests/Controller_Auth_Test.php
index caf6d8f2..0a7076c6 100644
--- a/modules/gallery/tests/Controller_Auth_Test.php
+++ b/modules/gallery/tests/Controller_Auth_Test.php
@@ -25,13 +25,18 @@ class Controller_Auth_Test extends Unit_Test_Case {
public function find_missing_auth_test() {
$found = array();
- $controllers = glob("*/*/controllers/*.php");
- $feeds = glob("*/*/helpers/*_rss.php");
+ $controllers = explode("\n", `git ls-files '*/*/controllers/*.php'`);
+ $feeds = explode("\n", `git ls-files '*/*/helpers/*_rss.php'`);
foreach (array_merge($controllers, $feeds) as $controller) {
if (preg_match("{modules/(gallery_)?unit_test/}", $controller)) {
continue;
}
+ if (!$controller) {
+ // The last entry in each list from git ls-files appears to be an empty line
+ continue;
+ }
+
// List of all tokens without whitespace, simplifying parsing.
$tokens = array();
foreach (token_get_all(file_get_contents($controller)) as $token) {
@@ -118,7 +123,7 @@ class Controller_Auth_Test extends Unit_Test_Case {
if ($token[1] == "access" &&
self::_token_matches(array(T_DOUBLE_COLON, "::"), $tokens, $token_number + 1) &&
self::_token_matches(array(T_STRING), $tokens, $token_number + 2) &&
- in_array($tokens[$token_number + 2][1], array("forbidden", "required")) &&
+ in_array($tokens[$token_number + 2][1], array("forbidden", "required")) &&
self::_token_matches("(", $tokens, $token_number + 3)) {
$token_number += 3;
$function->checks_authorization(true);
@@ -149,7 +154,7 @@ class Controller_Auth_Test extends Unit_Test_Case {
}
}
}
- }
+ }
}
// Generate the report
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index d2404192..624e6878 100644
--- a/modules/gallery/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
@@ -19,11 +19,12 @@
*/
class Photos_Controller_Test extends Unit_Test_Case {
public function setup() {
- $this->_post = $_POST;
+ $this->_save = array($_POST, $_SERVER);
+ $_SERVER["HTTP_REFERER"] = "HTTP_REFERER";
}
public function teardown() {
- $_POST = $this->_post;
+ list($_POST, $_SERVER) = $this->_save;
}
public function change_photo_test() {
@@ -47,7 +48,8 @@ class Photos_Controller_Test extends Unit_Test_Case {
$results = ob_get_contents();
ob_end_clean();
- $this->assert_equal(json_encode(array("result" => "success", "location" => "")), $results);
+ $this->assert_equal(
+ json_encode(array("result" => "success", "location" => "HTTP_REFERER")), $results);
$this->assert_equal("new-slug", $photo->slug);
$this->assert_equal("new title", $photo->title);
$this->assert_equal("new description", $photo->description);
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index eaa8c99c..9146ddb2 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -1,24 +1,24 @@
modules/akismet/views/admin_akismet.html.php 16 DIRTY $form
modules/akismet/views/admin_akismet_stats.html.php 9 DIRTY_ATTR $api_key
modules/akismet/views/admin_akismet_stats.html.php 9 DIRTY_ATTR urlencode($blog_url)
-modules/comment/views/admin_block_recent_comments.html.php 4 DIRTY_ATTR ($i%2==0)?"g-even":"g-odd"
+modules/comment/views/admin_block_recent_comments.html.php 4 DIRTY_ATTR text::alternate("g-even","g-odd")
modules/comment/views/admin_block_recent_comments.html.php 5 DIRTY_ATTR $comment->author()->avatar_url(32,$theme->url(,true))
modules/comment/views/admin_block_recent_comments.html.php 10 DIRTY gallery::date_time($comment->created)
-modules/comment/views/admin_comments.html.php 42 DIRTY $menu
-modules/comment/views/admin_comments.html.php 106 DIRTY_ATTR $comment->id
-modules/comment/views/admin_comments.html.php 106 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
-modules/comment/views/admin_comments.html.php 109 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
-modules/comment/views/admin_comments.html.php 122 DIRTY_JS $item->url()
-modules/comment/views/admin_comments.html.php 124 DIRTY_ATTR $item->thumb_url()
-modules/comment/views/admin_comments.html.php 126 DIRTY photo::img_dimensions($item->thumb_width,$item->thumb_height,75)
-modules/comment/views/admin_comments.html.php 134 DIRTY gallery::date($comment->created)
-modules/comment/views/admin_comments.html.php 141 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php 150 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php 159 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php 168 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php 175 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php 183 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php 196 DIRTY $pager
+modules/comment/views/admin_comments.html.php 43 DIRTY $menu->render()
+modules/comment/views/admin_comments.html.php 107 DIRTY_ATTR $comment->id
+modules/comment/views/admin_comments.html.php 107 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/comment/views/admin_comments.html.php 110 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
+modules/comment/views/admin_comments.html.php 123 DIRTY_JS $item->url()
+modules/comment/views/admin_comments.html.php 125 DIRTY_ATTR $item->thumb_url()
+modules/comment/views/admin_comments.html.php 127 DIRTY photo::img_dimensions($item->thumb_width,$item->thumb_height,75)
+modules/comment/views/admin_comments.html.php 135 DIRTY gallery::date($comment->created)
+modules/comment/views/admin_comments.html.php 142 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php 151 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php 160 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php 169 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php 176 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php 184 DIRTY_JS $comment->id
+modules/comment/views/admin_comments.html.php 197 DIRTY $pager
modules/comment/views/comment.html.php 2 DIRTY_ATTR $comment->id;
modules/comment/views/comment.html.php 5 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
modules/comment/views/comment.mrss.php 10 DIRTY $feed->uri
@@ -39,7 +39,8 @@ modules/digibug/views/digibug_form.html.php 5 DIRTY form::
modules/digibug/views/digibug_form.html.php 6 DIRTY form::close()
modules/exif/views/exif_dialog.html.php 14 DIRTY $details[$i]["caption"]
modules/exif/views/exif_dialog.html.php 21 DIRTY $details[$i]["caption"]
-modules/g2_import/views/admin_g2_import.html.php 28 DIRTY $form
+modules/g2_import/views/admin_g2_import.html.php 29 DIRTY $form
+modules/gallery/views/admin_advanced_settings.html.php 21 DIRTY_ATTR text::alternate("g-odd","g-even")
modules/gallery/views/admin_advanced_settings.html.php 22 DIRTY $var->module_name
modules/gallery/views/admin_block_log_entries.html.php 4 DIRTY_ATTR log::severity_class($entry->severity)
modules/gallery/views/admin_block_log_entries.html.php 6 DIRTY gallery::date_time($entry->timestamp)
@@ -53,9 +54,9 @@ modules/gallery/views/admin_block_photo_stream.html.php 6 DIRTY photo:
modules/gallery/views/admin_block_photo_stream.html.php 7 DIRTY_ATTR $photo->thumb_url()
modules/gallery/views/admin_dashboard.html.php 5 DIRTY_JS $csrf
modules/gallery/views/admin_dashboard.html.php 35 DIRTY $blocks
-modules/gallery/views/admin_graphics.html.php 22 DIRTY newView("admin_graphics_none.html")
-modules/gallery/views/admin_graphics.html.php 24 DIRTY newView("admin_graphics_$active.html",array("tk"=>$tk->$active,"is_active"=>true))
-modules/gallery/views/admin_graphics.html.php 31 DIRTY newView("admin_graphics_$id.html",array("tk"=>$tk->$id,"is_active"=>false))
+modules/gallery/views/admin_graphics.html.php 24 DIRTY newView("admin_graphics_none.html")
+modules/gallery/views/admin_graphics.html.php 26 DIRTY newView("admin_graphics_$active.html",array("tk"=>$tk->$active,"is_active"=>true))
+modules/gallery/views/admin_graphics.html.php 33 DIRTY newView("admin_graphics_$id.html",array("tk"=>$tk->$id,"is_active"=>false))
modules/gallery/views/admin_graphics_gd.html.php 2 DIRTY_ATTR $is_active?" g-selected":""
modules/gallery/views/admin_graphics_gd.html.php 2 DIRTY_ATTR $tk->installed?" g-installed-toolkit":" g-unavailable"
modules/gallery/views/admin_graphics_gd.html.php 19 DIRTY $tk->error
@@ -65,49 +66,62 @@ modules/gallery/views/admin_graphics_graphicsmagick.html.php 18 DIRTY $tk->e
modules/gallery/views/admin_graphics_imagemagick.html.php 2 DIRTY_ATTR $is_active?" g-selected":""
modules/gallery/views/admin_graphics_imagemagick.html.php 2 DIRTY_ATTR $tk->installed?" g-installed-toolkit":" g-unavailable"
modules/gallery/views/admin_graphics_imagemagick.html.php 18 DIRTY $tk->error
-modules/gallery/views/admin_languages.html.php 9 DIRTY access::csrf_form_field()
-modules/gallery/views/admin_languages.html.php 27 DIRTY_ATTR (isset($installed_locales[$code]))?"installed":""
-modules/gallery/views/admin_languages.html.php 27 DIRTY_ATTR ($default_locale==$code)?" default":""
-modules/gallery/views/admin_languages.html.php 28 DIRTY form::checkbox("installed_locales[]",$code,isset($installed_locales[$code]))
-modules/gallery/views/admin_languages.html.php 29 DIRTY $display_name
-modules/gallery/views/admin_languages.html.php 31 DIRTY form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
-modules/gallery/views/admin_languages.html.php 102 DIRTY $share_translations_form
-modules/gallery/views/admin_maintenance.html.php 24 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
+modules/gallery/views/admin_identity.html.php 43 DIRTY access::csrf_form_field()
+modules/gallery/views/admin_identity.html.php 50 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_identity.html.php 52 DIRTY form::radio($data,$module_name,$module_name==$active)
+modules/gallery/views/admin_identity_confirm.html.php 3 DIRTY access::csrf_form_field()
+modules/gallery/views/admin_identity_confirm.html.php 4 DIRTY form::hidden("provider",$new_provider)
+modules/gallery/views/admin_languages.html.php 43 DIRTY access::csrf_form_field()
+modules/gallery/views/admin_languages.html.php 60 DIRTY_ATTR (isset($installed_locales[$code]))?"g-available":""
+modules/gallery/views/admin_languages.html.php 60 DIRTY_ATTR ($default_locale==$code)?" g-selected":""
+modules/gallery/views/admin_languages.html.php 61 DIRTY form::checkbox("installed_locales[]",$code,isset($installed_locales[$code]))
+modules/gallery/views/admin_languages.html.php 62 DIRTY $display_name
+modules/gallery/views/admin_languages.html.php 64 DIRTY form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
+modules/gallery/views/admin_languages.html.php 109 DIRTY $share_translations_form
+modules/gallery/views/admin_maintenance.html.php 24 DIRTY_ATTR text::alternate("g-odd","g-even")
modules/gallery/views/admin_maintenance.html.php 24 DIRTY_ATTR log::severity_class($task->severity)
modules/gallery/views/admin_maintenance.html.php 25 DIRTY_ATTR log::severity_class($task->severity)
modules/gallery/views/admin_maintenance.html.php 26 DIRTY $task->name
modules/gallery/views/admin_maintenance.html.php 29 DIRTY $task->description
-modules/gallery/views/admin_maintenance.html.php 72 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
-modules/gallery/views/admin_maintenance.html.php 72 DIRTY_ATTR $task->state=="stalled"?"g-warning":""
-modules/gallery/views/admin_maintenance.html.php 73 DIRTY_ATTR $task->state=="stalled"?"g-warning":""
-modules/gallery/views/admin_maintenance.html.php 74 DIRTY gallery::date_time($task->updated)
-modules/gallery/views/admin_maintenance.html.php 77 DIRTY $task->name
-modules/gallery/views/admin_maintenance.html.php 92 DIRTY $task->status
-modules/gallery/views/admin_maintenance.html.php 145 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
-modules/gallery/views/admin_maintenance.html.php 145 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-modules/gallery/views/admin_maintenance.html.php 146 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-modules/gallery/views/admin_maintenance.html.php 147 DIRTY gallery::date_time($task->updated)
-modules/gallery/views/admin_maintenance.html.php 150 DIRTY $task->name
-modules/gallery/views/admin_maintenance.html.php 162 DIRTY $task->status
+modules/gallery/views/admin_maintenance.html.php 70 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php 70 DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php 71 DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php 72 DIRTY gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php 75 DIRTY $task->name
+modules/gallery/views/admin_maintenance.html.php 90 DIRTY $task->status
+modules/gallery/views/admin_maintenance.html.php 141 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php 141 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php 142 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php 143 DIRTY gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php 146 DIRTY $task->name
+modules/gallery/views/admin_maintenance.html.php 158 DIRTY $task->status
modules/gallery/views/admin_maintenance_show_log.html.php 8 DIRTY_JS url::site("admin/maintenance/save_log/$task->id?csrf=$csrf")
modules/gallery/views/admin_maintenance_show_log.html.php 13 DIRTY $task->name
modules/gallery/views/admin_maintenance_task.html.php 55 DIRTY $task->name
-modules/gallery/views/admin_modules.html.php 9 DIRTY access::csrf_form_field()
-modules/gallery/views/admin_modules.html.php 19 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
+modules/gallery/views/admin_modules.html.php 10 DIRTY access::csrf_form_field()
+modules/gallery/views/admin_modules.html.php 19 DIRTY_ATTR text::alternate("g-odd","g-even")
modules/gallery/views/admin_modules.html.php 22 DIRTY form::checkbox($data,'1',module::is_active($module_name))
modules/gallery/views/admin_modules.html.php 24 DIRTY $module_info->version
-modules/gallery/views/admin_theme_options.html.php 5 DIRTY $form
+modules/gallery/views/admin_sidebar.html.php 50 DIRTY $available
+modules/gallery/views/admin_sidebar.html.php 58 DIRTY $active
+modules/gallery/views/admin_sidebar_blocks.html.php 4 DIRTY_ATTR $ref
+modules/gallery/views/admin_sidebar_blocks.html.php 4 DIRTY $text
+modules/gallery/views/admin_theme_options.html.php 6 DIRTY $form
modules/gallery/views/admin_themes.html.php 3 DIRTY_JS url::site("admin/themes/choose")
modules/gallery/views/admin_themes.html.php 5 DIRTY_JS $csrf
-modules/gallery/views/admin_themes.html.php 20 DIRTY $themes[$site]->name
-modules/gallery/views/admin_themes.html.php 22 DIRTY $themes[$site]->description
-modules/gallery/views/admin_themes.html.php 36 DIRTY $info->name
-modules/gallery/views/admin_themes.html.php 38 DIRTY $info->description
-modules/gallery/views/admin_themes.html.php 58 DIRTY $themes[$admin]->name
-modules/gallery/views/admin_themes.html.php 60 DIRTY $themes[$admin]->description
-modules/gallery/views/admin_themes.html.php 74 DIRTY $info->name
-modules/gallery/views/admin_themes.html.php 76 DIRTY $info->description
+modules/gallery/views/admin_themes.html.php 22 DIRTY $themes[$site]->name
+modules/gallery/views/admin_themes.html.php 24 DIRTY $themes[$site]->description
+modules/gallery/views/admin_themes.html.php 38 DIRTY $info->name
+modules/gallery/views/admin_themes.html.php 40 DIRTY $info->description
+modules/gallery/views/admin_themes.html.php 60 DIRTY $themes[$admin]->name
+modules/gallery/views/admin_themes.html.php 62 DIRTY $themes[$admin]->description
+modules/gallery/views/admin_themes.html.php 76 DIRTY $info->name
+modules/gallery/views/admin_themes.html.php 78 DIRTY $info->description
modules/gallery/views/admin_themes_preview.html.php 7 DIRTY_ATTR $url
+modules/gallery/views/in_place_edit.html.php 2 DIRTY form::open($action,array("method"=>"post","id"=>"g-in-place-edit-form","class"=>"g-short-form"),$hidden)
+modules/gallery/views/in_place_edit.html.php 5 DIRTY form::input("input",$form["input"]," class='textbox'")
+modules/gallery/views/in_place_edit.html.php 12 DIRTY form::close()
+modules/gallery/views/in_place_edit.html.php 14 DIRTY $errors["input"]
modules/gallery/views/kohana_error_page.php 102 DIRTY $message
modules/gallery/views/kohana_error_page.php 116 DIRTY $trace
modules/gallery/views/kohana_profiler.php 32 DIRTY $profile->render();
@@ -125,7 +139,23 @@ modules/gallery/views/l10n_client.html.php 54 DIRTY form::
modules/gallery/views/l10n_client.html.php 58 DIRTY form::textarea("l10n-edit-plural-translation-few","",' rows="2"')
modules/gallery/views/l10n_client.html.php 62 DIRTY form::textarea("l10n-edit-plural-translation-many","",' rows="2"')
modules/gallery/views/l10n_client.html.php 67 DIRTY form::textarea("l10n-edit-plural-translation-other","",' rows="2"')
-modules/gallery/views/maintenance.html.php 46 DIRTY user::get_login_form("login/auth_html")
+modules/gallery/views/login_ajax.html.php 6 DIRTY_JS url::site("password/reset")
+modules/gallery/views/login_ajax.html.php 37 DIRTY $form
+modules/gallery/views/maintenance.html.php 46 DIRTY auth::get_login_form("login/auth_html")
+modules/gallery/views/menu.html.php 4 DIRTY isset($menu->css_id)?"id='$menu->css_id'":""
+modules/gallery/views/menu.html.php 4 DIRTY_ATTR $menu->css_class
+modules/gallery/views/menu.html.php 6 DIRTY $element->render()
+modules/gallery/views/menu.html.php 18 DIRTY $element->render()
+modules/gallery/views/menu_ajax_link.html.php 3 DIRTY_ATTR $menu->css_id
+modules/gallery/views/menu_ajax_link.html.php 4 DIRTY_ATTR $menu->css_class
+modules/gallery/views/menu_ajax_link.html.php 5 DIRTY_JS $menu->url
+modules/gallery/views/menu_ajax_link.html.php 7 DIRTY $menu->ajax_handler
+modules/gallery/views/menu_dialog.html.php 3 DIRTY_ATTR $menu->css_id
+modules/gallery/views/menu_dialog.html.php 4 DIRTY_ATTR $menu->css_class
+modules/gallery/views/menu_dialog.html.php 5 DIRTY_JS $menu->url
+modules/gallery/views/menu_link.html.php 3 DIRTY_ATTR $menu->css_id
+modules/gallery/views/menu_link.html.php 4 DIRTY_ATTR $menu->css_class
+modules/gallery/views/menu_link.html.php 5 DIRTY_JS $menu->url
modules/gallery/views/move_browse.html.php 4 DIRTY_JS url::site("move/show_sub_tree/{$source->id}/__TARGETID__")
modules/gallery/views/move_browse.html.php 39 DIRTY $tree
modules/gallery/views/move_browse.html.php 43 DIRTY access::csrf_form_field()
@@ -143,8 +173,8 @@ modules/gallery/views/movieplayer.html.php 7 DIRTY_JS url::a
modules/gallery/views/movieplayer.html.php 13 DIRTY_JS url::abs_file("lib/flowplayer.h264streaming.swf")
modules/gallery/views/permissions_browse.html.php 3 DIRTY_JS url::site("permissions/form/__ITEM__")
modules/gallery/views/permissions_browse.html.php 16 DIRTY_JS url::site("permissions/change/__CMD__/__GROUP__/__PERM__/__ITEM__?csrf=$csrf")
-modules/gallery/views/permissions_browse.html.php 42 DIRTY_ATTR $parent->id
-modules/gallery/views/permissions_browse.html.php 44 DIRTY_JS $parent->id
+modules/gallery/views/permissions_browse.html.php 43 DIRTY_ATTR $parent->id
+modules/gallery/views/permissions_browse.html.php 45 DIRTY_JS $parent->id
modules/gallery/views/permissions_browse.html.php 52 DIRTY_ATTR $item->id
modules/gallery/views/permissions_browse.html.php 53 DIRTY_JS $item->id
modules/gallery/views/permissions_browse.html.php 60 DIRTY $form
@@ -173,10 +203,19 @@ modules/gallery/views/permissions_form.html.php 75 DIRTY_JS $item-
modules/gallery/views/permissions_form.html.php 80 DIRTY_JS $group->id
modules/gallery/views/permissions_form.html.php 80 DIRTY_JS $permission->id
modules/gallery/views/permissions_form.html.php 80 DIRTY_JS $item->id
-modules/gallery/views/upgrader.html.php 44 DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
-modules/gallery/views/upgrader.html.php 45 DIRTY_ATTR $id
-modules/gallery/views/upgrader.html.php 49 DIRTY $module->version
-modules/gallery/views/upgrader.html.php 52 DIRTY $module->code_version
+modules/gallery/views/simple_uploader.html.php 7 DIRTY_JS url::file("lib/uploadify/uploadify.swf")
+modules/gallery/views/simple_uploader.html.php 8 DIRTY_JS url::site("simple_uploader/add_photo/{$item->id}")
+modules/gallery/views/simple_uploader.html.php 15 DIRTY_JS url::file("lib/uploadify/cancel.png")
+modules/gallery/views/simple_uploader.html.php 43 DIRTY_JS t("Completed")
+modules/gallery/views/upgrader.html.php 57 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php 61 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php 69 DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
+modules/gallery/views/upgrader.html.php 70 DIRTY_ATTR $id
+modules/gallery/views/upgrader.html.php 74 DIRTY $module->version
+modules/gallery/views/upgrader.html.php 77 DIRTY $module->code_version
+modules/gallery/views/upgrader.html.php 99 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php 102 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/user_languages_block.html.php 2 DIRTY form::dropdown("g-select-session-locale",$installed_locales,$selected)
modules/image_block/views/image_block_block.html.php 3 DIRTY_JS $item->url()
modules/image_block/views/image_block_block.html.php 4 DIRTY $item->thumb_img(array("class"=>"g-thumbnail"))
modules/info/views/info_block.html.php 22 DIRTY date("M j, Y H:i:s",$item->captured)
@@ -193,10 +232,10 @@ modules/organize/views/organize_dialog.html.php 3 DIRTY_JS url::s
modules/organize/views/organize_dialog.html.php 4 DIRTY_JS url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf")
modules/organize/views/organize_dialog.html.php 5 DIRTY_JS url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf")
modules/organize/views/organize_dialog.html.php 6 DIRTY_JS url::site("organize/tree/__ALBUM_ID__")
-modules/organize/views/organize_dialog.html.php 22 DIRTY $album_tree
-modules/organize/views/organize_dialog.html.php 29 DIRTY $micro_thumb_grid
-modules/organize/views/organize_dialog.html.php 37 DIRTY form::dropdown(array("id"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column)
-modules/organize/views/organize_dialog.html.php 38 DIRTY form::dropdown(array("id"=>"g-organize-sort-order"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order)
+modules/organize/views/organize_dialog.html.php 20 DIRTY $album_tree
+modules/organize/views/organize_dialog.html.php 27 DIRTY $micro_thumb_grid
+modules/organize/views/organize_dialog.html.php 35 DIRTY form::dropdown(array("id"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column)
+modules/organize/views/organize_dialog.html.php 36 DIRTY form::dropdown(array("id"=>"g-organize-sort-order"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order)
modules/organize/views/organize_thumb_grid.html.php 3 DIRTY_ATTR $child->id
modules/organize/views/organize_thumb_grid.html.php 4 DIRTY_ATTR $child->id
modules/organize/views/organize_thumb_grid.html.php 5 DIRTY_ATTR $child->is_album()?"g-album":"g-photo"
@@ -210,7 +249,7 @@ modules/organize/views/organize_tree.html.php 13 DIRTY View::
modules/organize/views/organize_tree.html.php 15 DIRTY_ATTR access::can("edit",$child)?"":"g-view-only"
modules/organize/views/organize_tree.html.php 16 DIRTY_ATTR $child->id
modules/organize/views/organize_tree.html.php 19 DIRTY_ATTR $child->id
-modules/recaptcha/views/admin_recaptcha.html.php 10 DIRTY $form
+modules/recaptcha/views/admin_recaptcha.html.php 11 DIRTY $form
modules/recaptcha/views/admin_recaptcha.html.php 23 DIRTY_JS $public_key
modules/recaptcha/views/form_recaptcha.html.php 7 DIRTY_JS $public_key
modules/rss/views/feed.mrss.php 10 DIRTY $feed->uri
@@ -220,14 +259,13 @@ modules/rss/views/feed.mrss.php 19 DIRTY_JS $feed-
modules/rss/views/feed.mrss.php 21 DIRTY $pub_date
modules/rss/views/feed.mrss.php 22 DIRTY $pub_date
modules/rss/views/feed.mrss.php 28 DIRTY date("D, d M Y H:i:s T",$child->created);
-modules/rss/views/feed.mrss.php 34 DIRTY_ATTR $child->resize_url(true)
-modules/rss/views/feed.mrss.php 36 DIRTY_ATTR $child->resize_height
-modules/rss/views/feed.mrss.php 36 DIRTY_ATTR $child->resize_width
-modules/rss/views/feed.mrss.php 39 DIRTY_ATTR $child->thumb_url(true)
-modules/rss/views/feed.mrss.php 41 DIRTY_ATTR $child->thumb_height
-modules/rss/views/feed.mrss.php 41 DIRTY_ATTR $child->thumb_width
-modules/rss/views/feed.mrss.php 47 DIRTY_ATTR $child->thumb_url(true)
-modules/rss/views/feed.mrss.php 48 DIRTY_ATTR @filesize($child->thumb_path())
+modules/rss/views/feed.mrss.php 35 DIRTY_ATTR $child->resize_url(true)
+modules/rss/views/feed.mrss.php 37 DIRTY_ATTR $child->resize_height
+modules/rss/views/feed.mrss.php 37 DIRTY_ATTR $child->resize_width
+modules/rss/views/feed.mrss.php 40 DIRTY_ATTR $child->thumb_url(true)
+modules/rss/views/feed.mrss.php 42 DIRTY_ATTR $child->thumb_height
+modules/rss/views/feed.mrss.php 42 DIRTY_ATTR $child->thumb_width
+modules/rss/views/feed.mrss.php 48 DIRTY_ATTR $child->thumb_url(true)
modules/rss/views/feed.mrss.php 49 DIRTY_ATTR $child->thumb_height
modules/rss/views/feed.mrss.php 50 DIRTY_ATTR $child->thumb_width
modules/rss/views/feed.mrss.php 54 DIRTY_ATTR $child->resize_url(true)
@@ -249,52 +287,51 @@ modules/rss/views/rss_block.html.php 6 DIRTY_JS rss::u
modules/search/views/search.html.php 30 DIRTY_ATTR $item_class
modules/search/views/search.html.php 31 DIRTY_JS $item->url()
modules/search/views/search.html.php 32 DIRTY $item->thumb_img()
+modules/search/views/search.html.php 43 DIRTY $theme->paginator()
+modules/server_add/views/admin_server_add.html.php 5 DIRTY $form
modules/server_add/views/admin_server_add.html.php 15 DIRTY_ATTR $id
-modules/server_add/views/admin_server_add.html.php 24 DIRTY $form
modules/server_add/views/server_add_tree.html.php 20 DIRTY_ATTR is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document"
modules/server_add/views/server_add_tree.html.php 21 DIRTY_ATTR is_dir($file)?"g-directory":"g-file"
modules/server_add/views/server_add_tree_dialog.html.php 3 DIRTY_JS url::site("server_add/children?path=__PATH__")
modules/server_add/views/server_add_tree_dialog.html.php 4 DIRTY_JS url::site("server_add/start?item_id={$item->id}&csrf=$csrf")
-modules/server_add/views/server_add_tree_dialog.html.php 23 DIRTY $tree
-modules/tag/views/admin_tags.html.php 13 DIRTY_JS $csrf
-modules/tag/views/admin_tags.html.php 50 DIRTY_ATTR $tag->id
-modules/tag/views/admin_tags.html.php 51 DIRTY $tag->count
-modules/tag/views/tag_block.html.php 15 DIRTY $cloud
-modules/tag/views/tag_block.html.php 17 DIRTY $form
+modules/server_add/views/server_add_tree_dialog.html.php 21 DIRTY $tree
+modules/tag/views/admin_tags.html.php 45 DIRTY_ATTR $tag->id
+modules/tag/views/admin_tags.html.php 46 DIRTY $tag->count
+modules/tag/views/tag_block.html.php 27 DIRTY $cloud
+modules/tag/views/tag_block.html.php 29 DIRTY $form
modules/tag/views/tag_cloud.html.php 4 DIRTY_ATTR (int)(($tag->count/$max_count)*7)
modules/tag/views/tag_cloud.html.php 5 DIRTY $tag->count
+modules/tag/views/tag_cloud.html.php 6 DIRTY_JS $tag->url()
modules/user/views/admin_users.html.php 3 DIRTY_JS url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf")
modules/user/views/admin_users.html.php 26 DIRTY_JS url::site("admin/users/group/__GROUPID__")
modules/user/views/admin_users.html.php 36 DIRTY_JS url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf")
-modules/user/views/admin_users.html.php 67 DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php 67 DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/user/views/admin_users.html.php 67 DIRTY_ATTR $user->admin?"admin":""
-modules/user/views/admin_users.html.php 68 DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php 69 DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
-modules/user/views/admin_users.html.php 83 DIRTY ($user->last_login==0)?"":gallery::date($user->last_login)
-modules/user/views/admin_users.html.php 121 DIRTY_ATTR $group->id
-modules/user/views/admin_users.html.php 121 DIRTY_ATTR ($group->special?"g-default-group":"")
-modules/user/views/admin_users.html.php 123 DIRTY $v
+modules/user/views/admin_users.html.php 71 DIRTY_ATTR $user->id
+modules/user/views/admin_users.html.php 71 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/user/views/admin_users.html.php 71 DIRTY_ATTR $user->admin?"g-admin":""
+modules/user/views/admin_users.html.php 72 DIRTY_ATTR $user->id
+modules/user/views/admin_users.html.php 73 DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
+modules/user/views/admin_users.html.php 87 DIRTY ($user->last_login==0)?"":gallery::date($user->last_login)
+modules/user/views/admin_users.html.php 123 DIRTY_ATTR $group->id
+modules/user/views/admin_users.html.php 123 DIRTY_ATTR ($group->special?"g-default-group":"")
+modules/user/views/admin_users.html.php 125 DIRTY $v
modules/user/views/admin_users_group.html.php 22 DIRTY_JS $user->id
modules/user/views/admin_users_group.html.php 22 DIRTY_JS $group->id
-modules/user/views/login_ajax.html.php 6 DIRTY_JS url::site("password/reset")
-modules/user/views/login_ajax.html.php 37 DIRTY $form
-modules/user/views/user_languages_block.html.php 2 DIRTY form::dropdown("g-select-session-locale",$installed_locales,$selected)
-modules/watermark/views/admin_watermarks.html.php 19 DIRTY_ATTR $width
-modules/watermark/views/admin_watermarks.html.php 19 DIRTY_ATTR $height
-modules/watermark/views/admin_watermarks.html.php 19 DIRTY_ATTR $url
-themes/admin_wind/views/admin.html.php 15 DIRTY_JS $theme->url()
-themes/admin_wind/views/admin.html.php 32 DIRTY $theme->admin_head()
-themes/admin_wind/views/admin.html.php 36 DIRTY $theme->admin_page_top()
-themes/admin_wind/views/admin.html.php 44 DIRTY $theme->admin_header_top()
-themes/admin_wind/views/admin.html.php 49 DIRTY_JS item::root()->url()
-themes/admin_wind/views/admin.html.php 53 DIRTY $theme->admin_menu()
-themes/admin_wind/views/admin.html.php 55 DIRTY $theme->admin_header_bottom()
-themes/admin_wind/views/admin.html.php 62 DIRTY $content
-themes/admin_wind/views/admin.html.php 68 DIRTY $sidebar
-themes/admin_wind/views/admin.html.php 73 DIRTY $theme->admin_footer()
-themes/admin_wind/views/admin.html.php 75 DIRTY $theme->admin_credits()
-themes/admin_wind/views/admin.html.php 79 DIRTY $theme->admin_page_bottom()
+modules/user/views/user_form.html.php 7 DIRTY $form
+modules/watermark/views/admin_watermarks.html.php 20 DIRTY_ATTR $width
+modules/watermark/views/admin_watermarks.html.php 20 DIRTY_ATTR $height
+modules/watermark/views/admin_watermarks.html.php 20 DIRTY_ATTR $url
+themes/admin_wind/views/admin.html.php 16 DIRTY_JS $theme->url()
+themes/admin_wind/views/admin.html.php 33 DIRTY $theme->admin_head()
+themes/admin_wind/views/admin.html.php 37 DIRTY $theme->admin_page_top()
+themes/admin_wind/views/admin.html.php 45 DIRTY $theme->admin_header_top()
+themes/admin_wind/views/admin.html.php 60 DIRTY_JS item::root()->url()
+themes/admin_wind/views/admin.html.php 64 DIRTY $theme->admin_menu()
+themes/admin_wind/views/admin.html.php 66 DIRTY $theme->admin_header_bottom()
+themes/admin_wind/views/admin.html.php 73 DIRTY $content
+themes/admin_wind/views/admin.html.php 79 DIRTY $sidebar
+themes/admin_wind/views/admin.html.php 84 DIRTY $theme->admin_footer()
+themes/admin_wind/views/admin.html.php 86 DIRTY $theme->admin_credits()
+themes/admin_wind/views/admin.html.php 90 DIRTY $theme->admin_page_bottom()
themes/admin_wind/views/block.html.php 3 DIRTY_ATTR $anchor
themes/admin_wind/views/block.html.php 5 DIRTY $id
themes/admin_wind/views/block.html.php 5 DIRTY_ATTR $css_id
@@ -310,6 +347,7 @@ themes/wind/views/album.html.php 16 DIRTY_ATTR $ite
themes/wind/views/album.html.php 18 DIRTY_JS $child->url()
themes/wind/views/album.html.php 19 DIRTY $child->thumb_img(array("class"=>"g-thumbnail"))
themes/wind/views/album.html.php 23 DIRTY_JS $child->url()
+themes/wind/views/album.html.php 41 DIRTY $theme->paginator()
themes/wind/views/block.html.php 3 DIRTY_ATTR $anchor
themes/wind/views/block.html.php 5 DIRTY_ATTR $css_id
themes/wind/views/block.html.php 6 DIRTY $title
@@ -320,28 +358,27 @@ themes/wind/views/dynamic.html.php 14 DIRTY_ATTR $chi
themes/wind/views/dynamic.html.php 15 DIRTY_ATTR $child->thumb_url()
themes/wind/views/dynamic.html.php 16 DIRTY_ATTR $child->thumb_width
themes/wind/views/dynamic.html.php 17 DIRTY_ATTR $child->thumb_height
-themes/wind/views/movie.html.php 8 DIRTY_JS $previous_item->url()
-themes/wind/views/movie.html.php 18 DIRTY_JS $next_item->url()
-themes/wind/views/movie.html.php 28 DIRTY $item->movie_img(array("class"=>"g-movie","id"=>"g-movie-id-{$item->id}"))
+themes/wind/views/dynamic.html.php 29 DIRTY $theme->paginator()
+themes/wind/views/movie.html.php 5 DIRTY $theme->paginator()
+themes/wind/views/movie.html.php 8 DIRTY $item->movie_img(array("class"=>"g-movie","id"=>"g-movie-id-{$item->id}"))
themes/wind/views/page.html.php 9 DIRTY $page_title
-themes/wind/views/page.html.php 32 DIRTY_JS $theme->url()
-themes/wind/views/page.html.php 41 DIRTY $new_width
-themes/wind/views/page.html.php 42 DIRTY $new_height
-themes/wind/views/page.html.php 43 DIRTY $thumb_proportion
-themes/wind/views/page.html.php 82 DIRTY $header_text
-themes/wind/views/page.html.php 84 DIRTY_JS item::root()->url()
-themes/wind/views/page.html.php 102 DIRTY_JS $parent->url($parent==$theme->item()->parent()?"show={$theme->item()->id}":null)
-themes/wind/views/page.html.php 117 DIRTY $content
-themes/wind/views/page.html.php 123 DIRTY newView("sidebar.html")
-themes/wind/views/page.html.php 130 DIRTY $footer_text
-themes/wind/views/pager.html.php 13 DIRTY_JS str_replace('{page}',1,$url)
-themes/wind/views/pager.html.php 20 DIRTY_JS str_replace('{page}',$previous_page,$url)
-themes/wind/views/pager.html.php 27 DIRTY $from_to_msg
-themes/wind/views/pager.html.php 30 DIRTY_JS str_replace('{page}',$next_page,$url)
-themes/wind/views/pager.html.php 37 DIRTY_JS str_replace('{page}',$last_page,$url)
+themes/wind/views/page.html.php 33 DIRTY_JS $theme->url()
+themes/wind/views/page.html.php 42 DIRTY $new_width
+themes/wind/views/page.html.php 43 DIRTY $new_height
+themes/wind/views/page.html.php 44 DIRTY $thumb_proportion
+themes/wind/views/page.html.php 81 DIRTY $header_text
+themes/wind/views/page.html.php 83 DIRTY_JS item::root()->url()
+themes/wind/views/page.html.php 87 DIRTY $theme->user_menu()
+themes/wind/views/page.html.php 104 DIRTY_JS $parent->url($parent==$theme->item()->parent()?"show={$theme->item()->id}":null)
+themes/wind/views/page.html.php 120 DIRTY $content
+themes/wind/views/page.html.php 126 DIRTY newView("sidebar.html")
+themes/wind/views/page.html.php 133 DIRTY $footer_text
+themes/wind/views/paginator.html.php 32 DIRTY_JS $first_page_url
+themes/wind/views/paginator.html.php 41 DIRTY_JS $previous_page_url
+themes/wind/views/paginator.html.php 69 DIRTY_JS $next_page_url
+themes/wind/views/paginator.html.php 78 DIRTY_JS $last_page_url
themes/wind/views/photo.html.php 8 DIRTY_JS $theme->item()->width
themes/wind/views/photo.html.php 8 DIRTY_JS $theme->item()->height
-themes/wind/views/photo.html.php 21 DIRTY_JS $previous_item->url()
-themes/wind/views/photo.html.php 31 DIRTY_JS $next_item->url()
-themes/wind/views/photo.html.php 43 DIRTY_JS $item->file_url()
-themes/wind/views/photo.html.php 45 DIRTY $item->resize_img(array("id"=>"g-photo-id-{$item->id}","class"=>"g-resize"))
+themes/wind/views/photo.html.php 18 DIRTY $theme->paginator()
+themes/wind/views/photo.html.php 23 DIRTY_JS $item->file_url()
+themes/wind/views/photo.html.php 25 DIRTY $item->resize_img(array("id"=>"g-photo-id-{$item->id}","class"=>"g-resize"))
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 32fbc2c3..ff4843ab 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -16,10 +16,9 @@
<th> <?= t("Name") ?> </th>
<th> <?= t("Value") ?></th>
</tr>
- <? $i = 0; ?>
<? foreach ($vars as $var): ?>
<? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
- <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+ <tr class="<?= text::alternate("g-odd", "g-even") ?>">
<td> <?= $var->module_name ?> </td>
<td> <?= html::clean($var->name) ?> </td>
<td>
@@ -34,7 +33,6 @@
</a>
</td>
</tr>
- <? $i++ ?>
<? endforeach ?>
</table>
</div>
diff --git a/modules/gallery/views/admin_identity.html.php b/modules/gallery/views/admin_identity.html.php
index 70fe401f..51eaa58a 100644
--- a/modules/gallery/views/admin_identity.html.php
+++ b/modules/gallery/views/admin_identity.html.php
@@ -46,14 +46,12 @@
<th> <?= t("Active") ?> </th>
<th> <?= t("Description") ?> </th>
</tr>
- <? $i = 0 ?>
<? foreach ($available as $module_name => $description): ?>
- <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+ <tr class="<?= text::alternate("g-odd", "g-even") ?>">
<? $data = array("name" => "provider"); ?>
<td> <?= form::radio($data, $module_name, $module_name == $active) ?> </td>
<td> <?= t($description) ?> </td>
</tr>
- <? $i++ ?>
<? endforeach ?>
</table>
<input type="submit" value="<?= t("Change")->for_html_attr() ?>" />
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 7ad75f85..ac597715 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -20,9 +20,8 @@
<?= t("Action") ?>
</th>
</tr>
- <? $i = 0; ?>
<? foreach ($task_definitions as $task): ?>
- <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>">
+ <tr class="<?= text::alternate("g-odd", "g-even") ?> <?= log::severity_class($task->severity) ?>">
<td class="<?= log::severity_class($task->severity) ?>">
<?= $task->name ?>
</td>
@@ -36,7 +35,6 @@
</a>
</td>
</tr>
- <? $i++ ?>
<? endforeach ?>
</table>
</div>
@@ -68,9 +66,8 @@
<?= t("Action") ?>
</th>
</tr>
- <? $i = 0; ?>
<? foreach ($running_tasks as $task): ?>
- <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
+ <tr class="<?= text::alternate("g-odd", "g-even") ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
<td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>">
<?= gallery::date_time($task->updated) ?>
</td>
@@ -108,7 +105,6 @@
<? endif ?>
</td>
</tr>
- <? $i++ ?>
<? endforeach ?>
</table>
</div>
@@ -141,9 +137,8 @@
<?= t("Action") ?>
</th>
</tr>
- <? $i = 0; ?>
<? foreach ($finished_tasks as $task): ?>
- <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>">
+ <tr class="<?= text::alternate("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>
@@ -187,7 +182,6 @@
</td>
</tr>
<? endforeach ?>
- <? $i++ ?>
</table>
</div>
<? endif ?>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 4c4976f8..aebedf09 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -15,9 +15,8 @@
<th> <?= t("Version") ?> </th>
<th> <?= t("Description") ?> </th>
</tr>
- <? $i = 0 ?>
<? foreach ($available as $module_name => $module_info): ?>
- <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+ <tr class="<?= text::alternate("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>
@@ -25,7 +24,6 @@
<td> <?= $module_info->version ?> </td>
<td> <?= t($module_info->description) ?> </td>
</tr>
- <? $i++ ?>
<? endforeach ?>
</table>
<input type="submit" value="<?= t("Update")->for_html_attr() ?>" />
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index fb55c4b2..5cd1cd77 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -11,29 +11,54 @@
<img src="<?= url::file("modules/gallery/images/gallery.png") ?>" />
<div id="inner">
<? if ($can_upgrade): ?>
- <? if ($done): ?>
- <div id="confirmation">
- <a onclick="$('#confirmation').slideUp(); return false;" href="#" class="close">[x]</a>
- <div>
+ <div id="dialog" style="visibility: hidden">
+ <a id="dialog_close_link" style="display: none" onclick="$('#dialog').fadeOut(); return false;" href="#" class="close">[x]</a>
+ <div id="busy" style="display: none">
+ <h1>
+ <img width="16" height="16" src="<?= url::file("lib/images/loading-small.gif") ?>"/>
+ <?= t("Upgrade in progress!") ?>
+ </h1>
+ <p>
+ <?= t("Please don't refresh or leave the page.") ?>
+ </p>
+ </div>
+ <div id="done" style="display: none">
<h1> <?= t("That's it!") ?> </h1>
<p>
<?= t("Your <a href=\"%url\">Gallery</a> is up to date.",
- array("url" => html::mark_clean(item::root()->url()))) ?>
+ array("url" => html::mark_clean(item::root()->url()))) ?>
</p>
</div>
</div>
<script type="text/javascript">
$(document).ready(function() {
- $("#confirmation").css("left", Math.round(($(window).width() - $("#confirmation").width()) / 2));
- $("#confirmation").css("top", Math.round(($(window).height() - $("#confirmation").height()) / 2));
+ $("#dialog").css("left", Math.round(($(window).width() - $("#dialog").width()) / 2));
+ $("#dialog").css("top", Math.round(($(window).height() - $("#dialog").height()) / 2));
+ $("#upgrade_link").click(function(event) { show_busy() });
+
+ <? if ($done): ?>
+ show_done();
+ <? endif ?>
});
+
+ var show_busy = function() {
+ $("#dialog").css("visibility", "visible");
+ $("#busy").show();
+ $("#upgrade_link").parent().removeClass("button-active");
+ $("#upgrade_link").replaceWith($("#upgrade_link").html())
+ }
+
+ var show_done = function() {
+ $("#dialog").css("visibility", "visible");
+ $("#done").show();
+ $("#dialog_close_link").show();
+ }
</script>
- <? endif ?>
- <p class="gray_on_done">
+ <p class="<?= $done ? "muted" : "" ?>">
<?= t("Welcome to the Gallery upgrader. One click and you're done!") ?>
</p>
<table>
- <tr class="gray_on_done">
+ <tr class="<?= $done ? "muted" : "" ?>">
<th> <?= t("Module name") ?> </th>
<th> <?= t("Installed version") ?> </th>
<th> <?= t("Available version") ?> </th>
@@ -58,17 +83,23 @@
<? endforeach ?>
</table>
- <div class="button gray_on_done">
- <a href="<?= url::site("upgrader/upgrade") ?>">
+ <? if ($done): ?>
+ <div class="button muted">
+ <?= t("Upgrade all") ?>
+ </div>
+ <? else: ?>
+ <div class="button button-active">
+ <a id="upgrade_link" href="<?= url::site("upgrader/upgrade") ?>">
<?= t("Upgrade all") ?>
</a>
</div>
+ <? endif ?>
<? if (@$inactive): ?>
- <p class="gray_on_done">
+ <p class="<?= $done ? "muted" : "" ?>">
<?= t("The following modules are inactive and don't require an upgrade.") ?>
</p>
- <ul class="gray_on_done">
+ <ul class="<?= $done ? "muted" : "" ?>">
<? foreach ($available as $module): ?>
<? if (!$module->active): ?>
<li>
diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index 89ba9f14..5fce8699 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -31,7 +31,7 @@
<![CDATA[
<span><?= html::purify($child->description) ?></span>
<p>
- <? if ($child->type == "photo" || $child->type == "album"): ?>
+ <? if ($child->type == "photo"): ?>
<img alt="" src="<?= $child->resize_url(true) ?>"
title="<?= html::purify($child->title)->for_html_attr() ?>"
height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" /><br />
@@ -50,7 +50,7 @@
width="<?= $child->thumb_width ?>"
/>
<media:group>
- <? if ($child->type == "photo" || $child->type == "album"): ?>
+ <? if ($child->type == "photo"): ?>
<media:content url="<?= $child->resize_url(true) ?>"
fileSize="<?= @filesize($child->resize_path()) ?>"
type="<?= $child->mime_type ?>"
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 19:31:48 +0000