summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/gallery/js/fullsize.js6
-rw-r--r--modules/gallery/js/quick.js27
-rw-r--r--modules/gallery/tests/images/DSC_0003.jpgbin735609 -> 0 bytes
-rw-r--r--modules/gallery/tests/images/DSC_0005.jpgbin687555 -> 0 bytes
-rw-r--r--modules/gallery/tests/images/DSC_0017.jpgbin1246655 -> 0 bytes
-rw-r--r--modules/gallery/tests/images/DSC_0019.jpgbin649556 -> 0 bytes
-rw-r--r--modules/gallery/tests/images/DSC_0067.jpgbin1245526 -> 0 bytes
-rw-r--r--modules/gallery/tests/images/DSC_0072.jpgbin1014511 -> 0 bytes
-rw-r--r--modules/gallery/tests/images/P4050088.jpgbin1774906 -> 0 bytes
-rw-r--r--themes/admin_default/css/screen.css3
-rw-r--r--themes/default/css/fix-ie.css30
-rw-r--r--themes/default/css/screen.css41
-rw-r--r--themes/default/views/page.html.php2
-rw-r--r--themes/default/views/pager.html.php2
-rw-r--r--themes/default/views/photo.html.php2
15 files changed, 63 insertions, 50 deletions
diff --git a/modules/gallery/js/fullsize.js b/modules/gallery/js/fullsize.js
index 7428adb5..f95dc428 100644
--- a/modules/gallery/js/fullsize.js
+++ b/modules/gallery/js/fullsize.js
@@ -7,9 +7,9 @@ $(document).ready(function() {
var height = $(document).height();
$("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
- 'style="border: none; margin: 0; padding: 0; background: #000 ' +
- 'none repeat scroll 0% 0%; position: absolute; top: 0px; left: 0px; ' +
- 'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; ' +
+ 'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
+ 'position: absolute; top: 0px; left: 0px; ' +
+ 'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; filter: alpha(opacity=70);' +
'-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
'-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index e7f35cea..8a87ed07 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -67,22 +67,22 @@ var quick_do = function(cont, pane, img) {
url: pane.attr("href"),
dataType: "json",
success: function(data) {
- img.css("opacity", "1");
- cont.removeClass("gLoadingLarge");
- if (data.src) {
- img.attr("width", data.width);
- img.attr("height", data.height);
- img.attr("src", data.src);
- if (data.height > data.width) {
- img.css("margin-top", -32);
- } else {
- img.css("margin-top", 0);
- }
+ img.css("opacity", "1");
+ cont.removeClass("gLoadingLarge");
+ if (data.src) {
+ img.attr("width", data.width);
+ img.attr("height", data.height);
+ img.attr("src", data.src);
+ if (data.height > data.width) {
+ img.css("margin-top", -32);
+ } else {
+ img.css("margin-top", 0);
+ }
} else if (data.location) {
window.location = data.location;
- } else if (data.reload) {
+ } else if (data.reload) {
window.location.reload();
- }
+ }
}
});
}
@@ -92,4 +92,3 @@ var quick_do = function(cont, pane, img) {
var hide_quick = function() {
$("#gQuickPane").remove();
};
-
diff --git a/modules/gallery/tests/images/DSC_0003.jpg b/modules/gallery/tests/images/DSC_0003.jpg
deleted file mode 100644
index 5780d9d8..00000000
--- a/modules/gallery/tests/images/DSC_0003.jpg
+++ /dev/null
Binary files differ
diff --git a/modules/gallery/tests/images/DSC_0005.jpg b/modules/gallery/tests/images/DSC_0005.jpg
deleted file mode 100644
index 4d2b53a9..00000000
--- a/modules/gallery/tests/images/DSC_0005.jpg
+++ /dev/null
Binary files differ
diff --git a/modules/gallery/tests/images/DSC_0017.jpg b/modules/gallery/tests/images/DSC_0017.jpg
deleted file mode 100644
index b7f7bb90..00000000
--- a/modules/gallery/tests/images/DSC_0017.jpg
+++ /dev/null
Binary files differ
diff --git a/modules/gallery/tests/images/DSC_0019.jpg b/modules/gallery/tests/images/DSC_0019.jpg
deleted file mode 100644
index 0ce25aa4..00000000
--- a/modules/gallery/tests/images/DSC_0019.jpg
+++ /dev/null
Binary files differ
diff --git a/modules/gallery/tests/images/DSC_0067.jpg b/modules/gallery/tests/images/DSC_0067.jpg
deleted file mode 100644
index 84f134cb..00000000
--- a/modules/gallery/tests/images/DSC_0067.jpg
+++ /dev/null
Binary files differ
diff --git a/modules/gallery/tests/images/DSC_0072.jpg b/modules/gallery/tests/images/DSC_0072.jpg
deleted file mode 100644
index dfad82b0..00000000
--- a/modules/gallery/tests/images/DSC_0072.jpg
+++ /dev/null
Binary files differ
diff --git a/modules/gallery/tests/images/P4050088.jpg b/modules/gallery/tests/images/P4050088.jpg
deleted file mode 100644
index 62f4749d..00000000
--- a/modules/gallery/tests/images/P4050088.jpg
+++ /dev/null
Binary files differ
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 82cc90eb..2d5f086c 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -214,7 +214,8 @@ li.gGroup {
height: 200px;
border: 1px solid gray;
padding: .5em;
- margin-right: 1em;
+ margin-right: 0 1em 1em 0;
+ overflow: auto;
}
#gAdminAdvancedSettings tr.setting:hover {
diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
index adf8c6d8..0b37acd2 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/default/css/fix-ie.css
@@ -1,5 +1,5 @@
/**
- * Fix display in IE
+ * Fix display in IE 6, 7
*/
#gHeader,
#gSiteMenu,
@@ -23,16 +23,28 @@
margin-bottom: 0;
}
-#gViewMenu a {
- width: 52px !important;
+input.submit {
+ clear: none !important;
+ display: inline !important;
}
-#gPager li.gInfo {
- width: 39%;
+#gAddTagForm input.textbox {
+ width: 110px;
}
-#gPager .txtright a.gButtonLink {
- clear: none !important;
- float: right !important;
- width: 45% !important;
+#gDialog a.gCancel {
+ display: inline-block !important;
+ float: none !important;
+}
+
+.gPager .txtright {
+ width: 29%;
}
+
+.gPager .ui-icon-right {
+ width: 60px;
+}
+
+#gQuickPane {
+ height: 32px !important;
+} \ No newline at end of file
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 007f30ed..fd9f64df 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -64,21 +64,26 @@ h3 {
/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
a,
+.gMenu a,
#gDialog a,
.gButtonLink,
.gButtonLink:hover {
- color: #6b8cb7;
+ color: #5382BF !important;
text-decoration: none;
-moz-outline-style: none;
}
a:hover,
#gDialog a:hover {
- color: #f30;
text-decoration: underline;
}
+.gMenu a:hover {
+ text-decoration: none;
+}
+
#gDialog .gCancel {
+ clear: none;
float: left;
margin: .3em 1em;
}
@@ -198,7 +203,8 @@ textarea {
input[type="submit"],
input[type="reset"] {
- clear: none !important;
+ display: inline;
+ clear: none;
float: left;
}
@@ -340,7 +346,7 @@ form p.gError {
}
form .gError,
-#gPager .gInfo {
+.gPager .gInfo {
background-color: #fff;
}
@@ -543,15 +549,12 @@ form .gError,
display: inline;
}
-#gHeader #gLoginMenu li:before,
-#gFooter #gCredits li:before {
- padding: 0 .6em 0 .4em;
- content: "|";
+#gHeader #gLoginMenu li {
+ padding-left: 1.2em;
}
-#gHeader #gLoginMenu li.first:before,
-#gFooter #gCredits li.first:before {
- content: "";
+#gFooter #gCredits li {
+ padding-right: 1.2em;
}
#gContent #gSearchResults {
@@ -730,20 +733,20 @@ form .gError,
/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#gPager {
+.gPager {
clear: both;
margin: 0;
padding: 5px 0 !important;
width: 100%;
}
-#gPager li {
+.gPager li {
float: left;
margin: 0;
width: 30%;
}
-#gPager .gInfo {
+.gPager .gInfo {
text-align: center;
width: 40%;
}
@@ -756,7 +759,7 @@ form .gError,
#gHeader:after,
.gBreadcrumbs:after,
#gAlbumGrid:after,
-#gPager:after,
+.gPager:after,
#gViewMenu:after {
clear: both;
content: ".";
@@ -836,9 +839,7 @@ form .gError,
display: inline-block;
margin: 0 4px 0 0;
padding: .2em .4em;
- position: relative;
outline: 0;
- zoom: 1;
}
.gButtonSet {
@@ -904,7 +905,7 @@ form .gError,
}
#gServerAdd #gServerAddTree {
- border: 1px solid #CCCCCC;
+ border: 1px solid #ccc;
height: 25em;
overflow: auto;
margin-bottom: .5em;
@@ -999,8 +1000,8 @@ form .gError,
vertical-align: middle;
}
#gPermissions .gDenied {
- background-color: #FFCCCC;
+ background-color: #fcc;
}
#gPermissions .gAllowed {
- background-color: #CCFFCC;
+ background-color: #cfc;
}
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index b3ee88b0..5e7101e1 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -24,7 +24,7 @@
media="screen,print,projection" />
<link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
media="screen,print,projection" />
- <!--[if IE]>
+ <!--[if lt IE 8]>
<link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
media="screen,print,projection" />
<![endif]-->
diff --git a/themes/default/views/pager.html.php b/themes/default/views/pager.html.php
index de865090..f8517f78 100644
--- a/themes/default/views/pager.html.php
+++ b/themes/default/views/pager.html.php
@@ -1,6 +1,6 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul id="gPager">
+<ul class="gPager">
<? /* XXX: This message isn't easily localizable */
$from_to_msg = t("Photos %from_number - %to_number of %total",
array("from_number" => $current_first_item,
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index fab6f138..cc069158 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -2,7 +2,7 @@
<div id="gItem">
<?= $theme->photo_top() ?>
- <ul id="gPager">
+ <ul class="gPager">
<li>
<? if ($previous_item): ?>
<a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 19:48:26 +0000