stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-23 07:15:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into talmdal_dev

Browse Source
This commit is contained in:
Tim Almdal
2009-11-09 06:50:19 -08:00
parent 6d57d4308b 6ddbef3dcd
commit 0dbf0d5173
20 changed files with 83 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gallery.common.css
+30 -12
View File
@@ -12,22 +12,21 @@
* 7) Right to left language styles
*
* @todo Update .g-message-block, don't force it to 100%, bad things happen is themes when you do.
* @todo Remove extra white space at the top of the add comment form, above the first field
*/
/** *******************************************************************
* 1) Text
**********************************************************************/
.g-txt-small {
.g-text-small {
font-size: .8em;
}
.g-txt-big {
.g-text-big {
font-size: 1.2em;
}
.g-txt-right {
.g-text-right {
text-align: right;
}
@@ -41,7 +40,7 @@ form {
fieldset {
border: 1px solid #ccc;
padding: .4em 1em .8em 1em;
padding: 0 1em .8em 1em;
}
#g-banner fieldset,
@@ -52,7 +51,8 @@ fieldset {
legend {
font-weight: bold;
margin: 0 0 .4em .8em;
margin: 0;
padding: 0 .2em;
}
#g-banner legend,
@@ -99,7 +99,11 @@ input[type=radio] {
form li {
margin: 0;
padding: .3em 0;
padding: 0 0 .2em 0;
}
form ul {
margin-top: 0;
}
form ul ul {
@@ -125,13 +129,22 @@ input[type="reset"] {
float: left;
}
/* Forms in dialogs ~~~~~~~~~~~~~~~~~~ */
/* Forms in dialogs and panels ~~~~~~~~~ */
#g-dialog form fieldset {
#g-dialog ul li {
padding-bottom: .8em;
}
#g-dialog fieldset,
#g-panel fieldset {
border: none;
padding: 0;
}
#g-panel legend {
display: none;
}
#g-dialog input.textbox,
#g-dialog input[type=text],
#g-dialog input[type=password],
@@ -549,7 +562,7 @@ div#g-action-status {
width: 40%;
}
/* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */
#g-dialog {
text-align: left;
@@ -563,6 +576,11 @@ div#g-action-status {
margin: .4em 1em;
}
#g-panel {
display: none;
padding: 1em;
}
/* Inline layout ~~~~~~~~~~ */
.g-inline li {
@@ -596,7 +614,7 @@ div#g-action-status {
text-align: right;
}
.rtl .g-txt-right {
.rtl .g-text-right {
text-align: left;
}
@@ -649,7 +667,7 @@ div#g-action-status {
width: 35%;
}
.rtl .g-pager .g-txt-right {
.rtl .g-pager .g-text-right {
margin-left: 0;
}
lib/gallery.common.js
+1 -1
View File
@@ -125,7 +125,7 @@
// Initialize context menus
$.fn.gallery_context_menu = function() {
if ($(".g-context-menu li").length) {
if ($(".g-context-menu li").length) {
var hover_target = ".g-context-menu";
var in_progress = 0;
$(hover_target + " *").removeAttr('title');
modules/gallery/controllers/movies.php
+1 -1
View File
@@ -66,7 +66,7 @@ class Movies_Controller extends Items_Controller {
if ($valid) {
$new_ext = pathinfo($form->edit_item->filename->value, PATHINFO_EXTENSION);
$old_ext = pathinfo($photo->name, PATHINFO_EXTENSION);
$old_ext = pathinfo($movie->name, PATHINFO_EXTENSION);
if (strcasecmp($new_ext, $old_ext)) {
$form->edit_item->filename->add_error("illegal_extension", 1);
$valid = false;
modules/gallery/views/admin_maintenance.html.php
+3 -3
View File
@@ -116,6 +116,9 @@
<? if ($finished_tasks->count()): ?>
<div id="g-finished-tasks">
<a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
<h2> <?= t("Finished tasks") ?> </h2>
<table>
<tr>
@@ -135,9 +138,6 @@
<?= t("Owner") ?>
</th>
<th>
<a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
<?= t("Action") ?>
</th>
</tr>
modules/gallery/views/admin_maintenance_show_log.html.php
+1 -1
View File
@@ -11,7 +11,7 @@ appendTo('body').submit().remove();
</script>
<div id="g-task-log-dialog">
<h1> <?= $task->name ?> </h1>
<div class="g-task-log g-txt-small">
<div class="g-task-log g-text-small">
<pre><?= html::purify($task->get_log()) ?></pre>
</div>
<button id="g-close" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
modules/gallery/views/admin_maintenance_task.html.php
+1 -1
View File
@@ -57,7 +57,7 @@
<div id="g-status">
<?= t("Starting up...") ?>
</div>
<div class="g-txt-right">
<div class="g-text-right">
<button id="g-pause-button" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
<button id="g-done-button" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
</div>
modules/gallery/views/login_ajax.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
</li>
<? if (identity::is_writable()): ?>
<li>
<a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot your password?") ?></a>
<a href="#" id="g-password-reset" class="g-right g-text-small"><?= t("Forgot your password?") ?></a>
</li>
<? endif ?>
</ul>
modules/user/views/admin_users.html.php
+1 -1
View File
@@ -85,7 +85,7 @@
<td>
<?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
</td>
<td class="g-actions">
<td>
<a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
open_text="<?= t("Close") ?>"
class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">
themes/admin_wind/css/screen.css
+12 -20
View File
@@ -12,8 +12,7 @@
* 6) jQuery and jQuery UI
* 7) Right-to-left language styles
*
* @todo Consider moving g-panel to gallery.common
* @todo Review g-actions along with g-buttonset-vertical
* @todo Review g-buttonset-vertical
*/
/** *******************************************************************
@@ -92,6 +91,10 @@ fieldset {
margin-bottom: 1em;
}
#g-content form ul li {
padding: .4em 0;
}
#g-dialog form {
width: 270px;
}
@@ -124,6 +127,7 @@ td {
}
th {
vertical-align: bottom;
white-space: nowrap;
}
@@ -156,6 +160,12 @@ th {
padding: 0;
}
#g-content .g-selected,
#g-content .g-available .g-block {
border: 1px solid #ccc;
padding: .8em;
}
.g-selected img,
.g-available .g-block img {
float: left;
@@ -358,11 +368,6 @@ th {
margin-right: 1em;
}
.g-actions a,
.g-actions span {
margin-right: 3em;
}
/* Block admin ~~~~~~~~~~~~~~~~~~~~~~~~~ */
.g-admin-blocks-list {
@@ -427,19 +432,6 @@ th {
/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
#g-panel {
display: none;
padding: 1em;
}
#g-panel legend {
display: none;
}
#g-panel fieldset {
border: none;
}
#g-admin-dashboard .ui-state-highlight,
#g-sidebar .ui-state-highlight {
height: 2em;
themes/admin_wind/views/pager.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<? endif ?>
</li>
<li class="g-info"><?= $from_to_msg ?></li>
<li class="g-txt-right">
<li class="g-text-right">
<? if ($next_page): ?>
<a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
themes/night_wind/css/fix-ie.css
+1 -1
View File
@@ -20,7 +20,7 @@ input.submit {
float: none !important;
}
.g-pager .g-txt-right {
.g-pager .g-text-right {
width: 29%;
}
themes/night_wind/views/movie.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<? endif; ?>
</li>
<li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="g-txt-right">
<li class="g-text-right">
<? if ($next_item): ?>
<a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
themes/night_wind/views/pager.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<? endif ?>
</li>
<li class="g-info"><?= $from_to_msg ?></li>
<li class="g-txt-right">
<li class="g-text-right">
<? if ($next_page): ?>
<a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
themes/night_wind/views/photo.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
<? endif; ?>
</li>
<li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="g-txt-right">
<li class="g-text-right">
<? if ($next_item): ?>
<a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
themes/wind/css/fix-ie.css
+1 -1
View File
@@ -20,7 +20,7 @@ input.submit {
float: none !important;
}
.g-pager .g-txt-right {
.g-pager .g-text-right {
width: 29%;
}
themes/wind/css/screen.css
+13 -7
View File
@@ -11,8 +11,6 @@
* 5) Navigation and menus
* 6) jQuery and jQuery UI
* 7) Right-to-left language styles
*
* @todo Review g-buttonset and it's usage here and admin_wind
*/
/** *******************************************************************
@@ -73,7 +71,9 @@ h3 {
font-size: .8em;
}
#g-content #g-album-grid .g-item {
#g-album-grid .g-item,
#g-item #g-photo,
#g-item #g-movie {
font-size: .7em;
}
@@ -129,6 +129,9 @@ td {
border: none;
border-bottom: 1px solid #ccc;
padding: .5em;
}
td {
vertical-align: top;
}
@@ -274,18 +277,21 @@ td {
/* Individual photo content ~~~~~~~~~~~~~~ */
#g-content #g-item {
#g-item {
position: relative;
width: 100%;
}
#g-content #g-photo {
#g-item #g-photo,
#g-item #g-movie {
padding: 2.2em 0;
position: relative;
}
#g-content #g-item .g-fullsize-link img {
#g-item img.g-resize,
#g-item a.g-movie object {
display: block;
margin: 1em auto;
margin: 0 auto;
}
/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
themes/wind/js/ui.init.js
+3 -3
View File
@@ -87,12 +87,12 @@ $(document).ready(function() {
}
// Photo/Item item view
if ($("#g-item").length) {
if ($("#g-photo").length) {
// Ensure the resized image fits within its container
$("#g-item").gallery_fit_photo();
$("#g-photo").gallery_fit_photo();
// Initialize context menus
var resize = $("#g-item").gallery_get_photo();
var resize = $("#g-photo").gallery_get_photo();
$(resize).hover(function(){
$(this).gallery_context_menu();
});
themes/wind/views/movie.html.php
+8 -7
View File
@@ -2,7 +2,7 @@
<div id="g-item">
<?= $theme->photo_top() ?>
<ul class="g-pager">
<ul class="g-pager ui-helper-clearfix">
<li>
<? if ($previous_item): ?>
<a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
@@ -13,7 +13,7 @@
<? endif; ?>
</li>
<li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="g-txt-right">
<li class="g-text-right">
<? if ($next_item): ?>
<a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
@@ -24,14 +24,15 @@
</li>
</ul>
<?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
<div id="g-movie" class="ui-helper-clearfix">
<?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
<?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
</div>
<div id="g-info">
<h1><?= html::purify($item->title) ?></h1>
<div><?= nl2br(html::purify($item->description)) ?></div>
<div><?= nl2br(html::purify($item->description)) ?></div>
</div>
<?= $theme->photo_bottom() ?>
<?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
</div>
themes/wind/views/pager.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<? endif ?>
</li>
<li class="g-info"><?= $from_to_msg ?></li>
<li class="g-txt-right">
<li class="g-text-right">
<? if ($next_page): ?>
<a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
themes/wind/views/photo.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
<? endif; ?>
</li>
<li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="g-txt-right">
<li class="g-text-right">
<? if ($next_item): ?>
<a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>