stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-25 06:59:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed more CSS selectors from gName to g-name.

Browse Source
This commit is contained in:
Chad Kieffer
2009-10-04 15:53:00 -06:00
parent 048e540a98
commit d581bbbd1e
18 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gallery.common.js
View File

@@ -89,7 +89,7 @@
*/
$.fn.gallery_get_photo = function() {
var photo = $(this).find("img").filter(function() {
return this.id.match(/g-photoId-\d+/);
return this.id.match(/g-photo-id-\d+/);
});
return photo;
};

4
modules/comment/views/admin_comments.html.php
View File

@@ -90,7 +90,7 @@
</div>
<? endif ?>
<table id="g-admin-commentsList">
<table id="g-admin-comments-list">
<tr>
<th>
<?= t("Author") ?>
@@ -192,7 +192,7 @@
<? endforeach ?>
</table>
<div class="pager">
<div class="g-pager">
<?= $pager ?>
</div>
</div>

2
modules/gallery/tests/selenium/Add_Comment.html
View File

@@ -18,7 +18,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>g-photoId-2</td>
<td>g-photo-id-2</td>
<td></td>
</tr>
<tr>

2
modules/gallery/tests/xss_data.txt
View File

@@ -344,4 +344,4 @@ themes/wind/views/photo.html.php 8 DIRTY_JS $theme
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-photoId-{$item->id}","class"=>"g-resize"))
themes/wind/views/photo.html.php 45 DIRTY $item->resize_img(array("id"=>"g-photo-id-{$item->id}","class"=>"g-resize"))

2
modules/gallery/views/admin_theme_options.html.php
View File

@@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="g-admin-themeOptions">
<div id="g-admin-theme-options">
<h1> <?= t("Theme Options") ?> </h1>
<?= $form ?>

4
modules/gallery/views/welcome_message_loader.html.php
View File

@@ -1,7 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<span id="g-welcome-messageLink"
<span id="g-welcome-message-link"
title="<?= t("Welcome to Gallery 3")->for_html_attr() ?>"
href="<?= url::site("welcome_message") ?>"/>
<script type="text/javascript">
$(document).ready(function(){$("#g-welcome-messageLink").gallery_dialog({immediate: true});});
$(document).ready(function(){$("#g-welcome-message-link").gallery_dialog({immediate: true});});
</script>

14
modules/organize/css/organize.css
View File

@@ -24,7 +24,7 @@
white-space: nowrap;
}
#g-organizeDetail {
#g-organize-detail {
height: 100%;
}
@@ -36,20 +36,20 @@
/*******************************************************************
* Album Tree styles
*/
#g-organizeTreeContainer {
#g-organize-tree-container {
height: 100%;
overflow: auto;
margin: 0 !important;
padding: 0 !important;
}
#g-organize-albumTree .selected {
#g-organize-album-tree .selected {
background-color: #cfdeff;
border-bottom: 1px solid #999;
margin-right: 0px;
}
#g-organize-albumTree ul li {
#g-organize-album-tree ul li {
padding-left: 1.2em;
}
@@ -131,18 +131,18 @@
/****************************************************************
* Controls styles
*/
#g-organizeControls {
#g-organize-controls {
padding-left: 8px;
background-color: #13A;
color: #ccc;
width: 100% !important;
}
#g-organizeControls select {
#g-organize-controls select {
display: inline;
}
#g-organizeClose {
#g-organize-close {
float: right;
margin-right: 12px;
}

14
modules/organize/js/organize.js
View File

@@ -110,7 +110,7 @@
_refresh: function(data) {
if (data.tree) {
$("#g-organize-albumTree").html(data.tree);
$("#g-organize-album-tree").html(data.tree);
}
if (data.grid) {
$("#g-organize-microthumb-grid").html(data.grid);
@@ -142,14 +142,14 @@
$("#g-dialog").bind("dialogopen", function(event, ui) {
$("#g-organize").height($("#g-dialog").innerHeight() - 20);
$("#g-organize-microthumb-panel").height($("#g-dialog").innerHeight() - 90);
$("#g-organizeTreeContainer").height($("#g-dialog").innerHeight() - 59);
$("#g-organize-tree-container").height($("#g-dialog").innerHeight() - 59);
});
$("#g-dialog").bind("dialogclose", function(event, ui) {
window.location.reload();
});
$("#g-dialog #g-organizeClose").click(function(event) {
$("#g-dialog #g-organize-close").click(function(event) {
$("#g-dialog").dialog("close");
});
@@ -170,7 +170,7 @@
.mousemove($.organize.mouse_move_handler);
$(".g-organize-album").droppable($.organize.branch_droppable);
$(".g-organize-album-text").click($.organize.show_album);
$("#g-organize-albumTree .ui-icon-plus,#g-organize-albumTree .ui-icon-minus").click($.organize.toggle_branch);
$("#g-organize-album-tree .ui-icon-plus,#g-organize-album-tree .ui-icon-minus").click($.organize.toggle_branch);
},
toggle_branch: function(event) {
@@ -207,13 +207,13 @@
if ($(event.currentTarget).hasClass("selected")) {
return;
}
var parent = $(event.currentTarget).parents(".g-organizeBranch");
var parent = $(event.currentTarget).parents(".g-organize-branch");
if ($(parent).hasClass("g-view-only")) {
return;
}
$("#g-organize-microthumb-panel").selectable("destroy");
var id = $(event.currentTarget).attr("ref");
$("#g-organize-albumTree .selected").removeClass("selected");
$("#g-organize-album-tree .selected").removeClass("selected");
$(".g-organize-album-text[ref=" + id + "]").addClass("selected");
var url = $("#g-organize-microthumb-panel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
$.get(url, {},
@@ -231,7 +231,7 @@
*/
resort: function(column, dir) {
var url = sort_order_url
.replace("__ALBUM_ID__", $("#g-organize-albumTree .selected").attr("ref"))
.replace("__ALBUM_ID__", $("#g-organize-album-tree .selected").attr("ref"))
.replace("__COL__", column)
.replace("__DIR__", dir);
$.get(url, {},

12
modules/organize/views/organize_dialog.html.php
View File

@@ -16,21 +16,21 @@
<div class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
</div>
</div>
<div id="g-organizeContentPane" class="yui-gf">
<div id="g-organizeTreeContainer" class="yui-u first">
<ul id="g-organize-albumTree">
<div id="g-organize-content-pane" class="yui-gf">
<div id="g-organize-tree-container" class="yui-u first">
<ul id="g-organize-album-tree">
<?= $album_tree ?>
</ul>
</div>
<div id="g-organizeDetail" class="yui-u">
<div id="g-organize-detail" class="yui-u">
<div id="g-organize-microthumb-panel"
ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
<ul id="g-organize-microthumb-grid">
<?= $micro_thumb_grid ?>
</ul>
</div>
<div id="g-organizeControls">
<a id="g-organizeClose" href="#" ref="done"
<div id="g-organize-controls">
<a id="g-organize-close" href="#" ref="done"
class="g-button ui-corner-all ui-state-default"><?= t("Close") ?></a>
<form>
<?= t("Sort order") ?>

2
modules/server_add/controllers/admin_server_add.php
View File

@@ -83,7 +83,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
private function _get_admin_form() {
$form = new Forge("admin/server_add/add_path", "", "post",
array("id" => "g-server-add-adminForm"));
array("id" => "g-server-add-admin-form"));
$add_path = $form->group("add_path");
$add_path->input("path")->label(t("Path"))->rules("required")
->error_messages("not_readable", t("This directory is not readable by the webserver"))

2
modules/server_add/js/server_add.js
View File

@@ -20,7 +20,7 @@
$("#g-server-add-continue-button", this.element).hide();
self.run_add();
});
$("#g-server-addCloseButton", this.element).click(function(event) {
$("#g-server-add-close-button", this.element).click(function(event) {
$("#g-dialog").dialog("close");
window.location.reload();
});

2
modules/server_add/views/server_add_tree_dialog.html.php
View File

@@ -40,7 +40,7 @@
<?= t("Continue") ?>
</button>
<button id="g-server-addCloseButton" class="ui-state-default ui-corner-all">
<button id="g-server-add-close-button" class="ui-state-default ui-corner-all">
<?= t("Close") ?>
</button>
</span>

2
modules/user/helpers/user_block.php
View File

@@ -32,7 +32,7 @@ class user_block_Core {
}
if (count($locales) > 1) {
$block = new Block();
$block->css_id = "g-userLanguageBlock";
$block->css_id = "g-user-language-block";
$block->title = t("Language Preference");
$block->content = new View("user_languages_block.html");
$block->content->installed_locales =

2
modules/user/views/login.html.php
View File

@@ -16,7 +16,7 @@
</li>
<li>
<a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
id="g-logoutLink"><?= t("Logout") ?></a>
id="g-logout-link"><?= t("Logout") ?></a>
</li>
<? endif ?>
</ul>

2
themes/admin_wind/views/admin.html.php
View File

@@ -45,7 +45,7 @@
<?= $theme->admin_header_top() ?>
<ul id="g-login-menu">
<li class="first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
<li id="g-logoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
<li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
</ul>
<a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
&larr; <?= t("back to the ...") ?>

4
themes/wind/views/album.html.php
View File

@@ -13,13 +13,13 @@
<? if ($child->is_album()): ?>
<? $item_class = "g-album"; ?>
<? endif ?>
<li id="g-itemId-<?= $child->id ?>" class="g-item <?= $item_class ?>">
<li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
<?= $theme->thumb_top($child) ?>
<a href="<?= $child->url() ?>">
<?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
</a>
<?= $theme->thumb_bottom($child) ?>
<?= $theme->context_menu($child, "#g-itemId-{$child->id} .g-thumbnail") ?>
<?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
<h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
<ul class="g-metadata">
<?= $theme->thumb_info($child) ?>

6
themes/wind/views/dynamic.html.php
View File

@@ -1,6 +1,6 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="g-albumHeader">
<div id="g-albumHeaderButtons">
<div id="g-album-header">
<div id="g-album-header-buttons">
<?= $theme->dynamic_top() ?>
</div>
<h1><?= html::clean($title) ?></h1>
@@ -11,7 +11,7 @@
<li class="g-item <?= $child->is_album() ? "g-album" : "" ?>">
<?= $theme->thumb_top($child) ?>
<a href="<?= $child->url() ?>">
<img id="g-photoId-<?= $child->id ?>" class="g-thumbnail"
<img id="g-photo-id-<?= $child->id ?>" class="g-thumbnail"
alt="photo" src="<?= $child->thumb_url() ?>"
width="<?= $child->thumb_width ?>"
height="<?= $child->thumb_height ?>" />

4
themes/wind/views/photo.html.php
View File

@@ -42,12 +42,12 @@
<? if (access::can("view_full", $item)): ?>
<a href="<?= $item->file_url() ?>" class="g-fullsize-link" title="<?= t("View full size")->for_html_attr() ?>">
<? endif ?>
<?= $item->resize_img(array("id" => "g-photoId-{$item->id}", "class" => "g-resize")) ?>
<?= $item->resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?>
<? if (access::can("view_full", $item)): ?>
</a>
<? endif ?>
<?= $theme->resize_bottom($item) ?>
<?= $theme->context_menu($item, "#g-photoId-{$item->id}") ?>
<?= $theme->context_menu($item, "#g-photo-id-{$item->id}") ?>
</div>
<div id="g-info">