summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/admin_wind/css/screen.css114
-rw-r--r--themes/admin_wind/js/ui.init.js16
-rw-r--r--themes/night_wind/js/ui.init.js14
-rw-r--r--themes/night_wind/views/page.html.php1
-rw-r--r--themes/wind/css/screen.css25
-rw-r--r--themes/wind/js/ui.init.js5
-rw-r--r--themes/wind/views/dynamic.html.php2
-rw-r--r--themes/wind/views/page.html.php1
8 files changed, 32 insertions, 146 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 3d620f1c..e0e5b10d 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -107,11 +107,11 @@ td {
border: none;
border-bottom: 1px solid #ccc;
padding: .5em;
- vertical-align: top;
+ vertical-align: middle;
}
-#g-admin-maintenance td {
- vertical-align: middle;
+th {
+ white-space: nowrap;
}
/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -122,8 +122,7 @@ fieldset {
}
#g-header fieldset,
-#g-sidebar fieldset,
-.g-short-form fieldset {
+#g-sidebar fieldset {
border: none;
}
@@ -135,8 +134,7 @@ legend {
#g-header legend,
#g-sidebar legend,
#g-content #g-search-form legend,
-input[type="hidden"],
-.g-short-form label {
+input[type="hidden"] {
display: none;
}
@@ -298,19 +296,6 @@ tr.g-warning {
background-color: #fff;
}
-/* Inline layout (forms, lists) ~~~~~~~~~~ */
-
-.g-short-form li {
- float: left;
- padding: .4em 0;
-}
-
-.g-short-form input[type="text"] {
- color: #666;
- padding: .3em .6em;
- width: 11em;
-}
-
/*** ******************************************************************
* 3) Page layout containers
*********************************************************************/
@@ -489,14 +474,6 @@ tr.g-warning {
margin-right: 1em;
}
-#g-user-admin-list {
- margin-bottom: 1em;
-}
-
-#g-user-admin-list td {
- vertical-align: bottom;
-}
-
#g-user-admin-list .admin {
color: #55f;
font-weight: bold;
@@ -547,36 +524,18 @@ li.g-group-disable h4, li.g-group-disable .g-user {
color: gray;
}
-#g-admin-advanced-settings tr.setting:hover {
- background: #ffc;
-}
+/* Block admin ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-/* admin/sidebar ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-.g-admin-blocks-list {
- float: left;
- height: 300px;
- margin-left: 20px;
+#g-admin-blocks .g-block {
+ clear: none;
width: 30%;
}
-.g-admin-blocks-list div:last-child {
- border: .1em solid;
- height: 100%;
- overflow-y: auto;
-}
-
-.g-admin-blocks-list ul {
- height: 98%;
- margin: .1em .1em;
- padding: .1em;
-}
-
-.g-admin-blocks-list ul li {
- background-color: #e8e8e8;
- font-size: 1em;
- font-weight: bold;
- margin: .5em;
- padding: .3em .8em;
+#g-admin-blocks .g-block .g-draggable {
+ background: #e7e7e7;
+ /*border: 1px solid #fff;*/
+ margin-bottom: 1em;
+ padding: .4em .8em;
}
/** *******************************************************************
@@ -812,51 +771,11 @@ li.g-group-disable h4, li.g-group-disable .g-user {
padding: .5em
}
-#g-server-add-admin {
- margin:auto;
- text-align: left;
-}
-
-#g-server-add-admin form fieldset {
- border: medium none;
-}
-
-#g-server-add-admin legend {
- display: none;
-}
-
-#g-server-add-admin .g-warning {
- background-color: #FFFF99;
-}
-
-#g-authorized-path {
- margin: 0 !important;
- padding: 0.3em 1.5em 0.3em 1em;
-}
-
-#g-server-add-admin #path {
- width: 80%;
-}
-
-.g-remove-dir:hover {
- cursor: pointer;
-}
-
#g-languages-form table {
- width: 400px;
- float: left;
+ width: 40%;
margin: 0 3em 1em 0;
}
-#g-languages-form .installed {
- background-color: #EEEEEE;
-}
-
-#g-languages-form .default {
- background-color: #C5DBEC;
- font-weight: bold;
-}
-
#g-languages-form input {
clear: both;
}
@@ -870,10 +789,6 @@ li.g-group-disable h4, li.g-group-disable .g-user {
padding: .5em;
}
-.g-doc-link {
- float: right;
-}
-
/** *******************************************************************
* 7) Right to left styles
*********************************************************************/
@@ -905,7 +820,6 @@ li.g-group-disable h4, li.g-group-disable .g-user {
.rtl form ul ul li,
.rtl input[type="submit"],
.rtl input[type="reset"],
-.rtl .g-short-form li,
.rtl #g-content #g-album-grid .g-item,
.rtl #g-site-admin-menu,
.rtl .g-pager li,
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index 0954b63c..e0210ce5 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -1,5 +1,6 @@
/**
* Initialize jQuery UI and Gallery Plugins
+ * @todo Move ui-corner-all assignments to theme admin views
*/
$(document).ready(function(){
@@ -22,6 +23,9 @@ $(document).ready(function(){
// Initialize modal dialogs
$(".g-dialog-link").gallery_dialog();
+ // Initialize short forms
+ $(".g-short-form").gallery_short_form();
+
// Initialize ajax links
$(".g-ajax-link").gallery_ajax();
@@ -50,13 +54,7 @@ $(document).ready(function(){
$(".g-available .g-block").addClass("ui-corner-all");
$(".g-unavailable").addClass("ui-corner-all");
- // Add hover state for buttons
- $(".ui-state-default").hover(
- function() {
- $(this).addClass("ui-state-hover");
- },
- function() {
- $(this).removeClass("ui-state-hover");
- }
- );
+ // Initialize button hover effect
+ $.fn.gallery_hover_init();
+
});
diff --git a/themes/night_wind/js/ui.init.js b/themes/night_wind/js/ui.init.js
index 27fb9664..bddf50c3 100644
--- a/themes/night_wind/js/ui.init.js
+++ b/themes/night_wind/js/ui.init.js
@@ -29,20 +29,6 @@ $(document).ready(function() {
$("#g-view-menu a").addClass("ui-icon");
}
- // Initialize short forms
- var short_forms = new Array(
- "#g-quick-search-form",
- "#g-add-tag-form",
- "#g-search-form"
- );
-
- for (var i in short_forms) {
- short_form_init(short_forms[i]);
- $(short_forms[i]).addClass("g-short-form");
- }
- $(".g-short-form input[type=text]").addClass("ui-corner-left");
- $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
-
// Apply jQuery UI button css to submit inputs
$("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index c8b08129..f5c6b0df 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -56,7 +56,6 @@
</script>
<?= $theme->script("gallery.ajax.js") ?>
<?= $theme->script("gallery.dialog.js") ?>
- <?= $theme->script("gallery.form.js") ?>
<?= $theme->script("superfish/js/superfish.js") ?>
<?= $theme->script("jquery.localscroll.js") ?>
<?= $theme->script("ui.init.js") ?>
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 36231b0d..d7eb19e6 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -120,14 +120,18 @@ td {
/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-sidebar form {
+ padding-left: 0;
+ padding-right: 0;
+}
+
fieldset {
border: 1px solid #ccc;
padding: .8em 1em !important;
}
#g-banner fieldset,
-#g-sidebar fieldset,
-.g-short-form fieldset {
+#g-sidebar fieldset {
border: none;
}
@@ -139,8 +143,7 @@ legend {
#g-banner legend,
#g-sidebar legend,
#g-content #g-search-form legend,
-input[type="hidden"],
-.g-short-form label {
+input[type="hidden"] {
display: none;
}
@@ -234,19 +237,6 @@ li.g-error select {
margin-top: 1em;
}
-/* Inline layout (forms, lists) ~~~~~~~~~~ */
-
-.g-short-form li {
- float: left;
- padding: .4em 0;
-}
-
-.g-short-form input[type="text"] {
- color: #666;
- padding: .3em .6em;
- width: 11em;
-}
-
/*** ******************************************************************
* 3) Page layout containers
*********************************************************************/
@@ -821,7 +811,6 @@ li.g-error select {
.rtl form ul ul li,
.rtl input[type="submit"],
.rtl input[type="reset"],
-.rtl .g-short-form li,
.rtl #g-header #g-logo img,
.rtl #g-content #g-album-grid .g-item,
.rtl #g-site-menu,
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index e9dd1dd9..0126c36b 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -22,9 +22,10 @@ $(document).ready(function() {
// Initialize dialogs
$(".g-dialog-link").gallery_dialog();
+ // Initialize short forms
+ $(".g-short-form").gallery_short_form();
+
// Apply jQuery UI icon, hover, and rounded corner styles
- $(".g-short-form input[type=text]").addClass("ui-corner-left");
- $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
$("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
if ($("#g-view-menu").length) {
$("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu");
diff --git a/themes/wind/views/dynamic.html.php b/themes/wind/views/dynamic.html.php
index aa347402..51e48dc0 100644
--- a/themes/wind/views/dynamic.html.php
+++ b/themes/wind/views/dynamic.html.php
@@ -6,7 +6,7 @@
<h1><?= html::clean($title) ?></h1>
</div>
-<ul id="g-album-grid">
+<ul id="g-album-grid" class="ui-helper-clearfix">
<? foreach ($children as $i => $child): ?>
<li class="g-item <?= $child->is_album() ? "g-album" : "" ?>">
<?= $theme->thumb_top($child) ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index c8b08129..f5c6b0df 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -56,7 +56,6 @@
</script>
<?= $theme->script("gallery.ajax.js") ?>
<?= $theme->script("gallery.dialog.js") ?>
- <?= $theme->script("gallery.form.js") ?>
<?= $theme->script("superfish/js/superfish.js") ?>
<?= $theme->script("jquery.localscroll.js") ?>
<?= $theme->script("ui.init.js") ?>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 05:24:48 +0000