summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/admin_wind/css/screen.css52
-rw-r--r--themes/admin_wind/js/ui.init.js2
-rw-r--r--themes/admin_wind/views/admin.html.php1
-rw-r--r--themes/admin_wind/views/pager.html.php18
-rw-r--r--themes/wind/css/fix-ie.css2
-rw-r--r--themes/wind/css/screen.css39
-rw-r--r--themes/wind/js/ui.init.js2
-rw-r--r--themes/wind/views/movie.html.php10
-rw-r--r--themes/wind/views/no_sidebar.html.php5
-rw-r--r--themes/wind/views/page.html.php1
-rw-r--r--themes/wind/views/pager.html.php18
-rw-r--r--themes/wind/views/photo.html.php10
12 files changed, 53 insertions, 107 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index bd940cbc..737c5939 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -5,7 +5,6 @@
*
* Sheet organization:
* 1) Basic HTML elements
- * 2) Reusable classes
* 3) Reusable content blocks
* 4) Page layout containers
* 5) Content blocks in specific layout containers
@@ -69,9 +68,9 @@ h3 {
a,
.gMenu a,
#gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
+.g-button,
+.g-button:hover,
+.g-button:active,
a.ui-state-hover,
input.ui-state-hover,
button.ui-state-hover {
@@ -240,29 +239,6 @@ li.gError select {
}
/** *******************************************************************
- * 2) Reusable generic classes
- *********************************************************************/
-
-.inactive, .understate {
- color: #ccc;
- font-weight: normal;
-}
-
-.left {
- float: left;
- margin: 1em 1em 1em 0;
-}
-
-.right {
- float: right;
- margin: 1em 0 1em 1em;
-}
-
-.txtright {
- text-align: right;
-}
-
-/** *******************************************************************
* 3) Reusable content blocks
*********************************************************************/
@@ -307,11 +283,11 @@ li.gError select {
background: #eee;
}
-.gAvailable .gButtonLink {
+.gAvailable .g-button {
width: 96%;
}
-.gSelected .gButtonLink {
+.gSelected .g-button {
display: none;
}
@@ -399,7 +375,9 @@ tr.gWarning {
background-color: #fcf9ce;
}
+.gModuleStatus.gInfo,
#gLogEntries .gInfo,
+.gModuleStatus.gSuccess,
#gLogEntries .gSuccess {
background-color: #fff;
}
@@ -585,7 +563,6 @@ tr.gWarning {
#gAdminGraphics .gAvailable .gBlock {
clear: none;
float: left;
- height: 17em;
margin-right: 1em;
width: 30%;
}
@@ -650,7 +627,7 @@ li.gGroup h4 {
border-bottom: 1px dashed #ccc;
padding: .5em 0 .5em .5em;
}
-li.gGroup .gButtonLink {
+li.gGroup .g-button {
padding: 0;
}
li.gGroup ul, li.gGroup div {
@@ -667,7 +644,7 @@ li.gGroup div p {
li.gGroup .gUser {
padding: .2em 0 0 .5em;
}
-li.gGroup .gUser .gButtonLink {
+li.gGroup .gUser .g-button {
vertical-align: middle;
}
@@ -861,13 +838,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
/* jQuery UI ThemeRoller buttons */
-.gButtonLink {
- display: inline-block;
- margin: 0 4px 0 0;
- padding: .2em .4em;
- outline: 0;
-}
-
.gButtonSet {
padding-left: 1px;
}
@@ -876,7 +846,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
float: left;
}
-.gButtonSet .gButtonLink {
+.gButtonSet .g-button {
margin: 0;
}
@@ -1129,7 +1099,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
clear: both;
}
-#gTranslations .gButtonLink {
+#gTranslations .g-button {
padding: .5em;
}
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index c6379c09..d9b011bd 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -37,7 +37,7 @@ $(document).ready(function(){
if ($("#gAdminCommentsMenu").length) {
$("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu");
$("#gAdminCommentsMenu").addClass("gButtonSet");
- $("#gAdminCommentsMenu a").addClass("gButtonLink ui-state-default");
+ $("#gAdminCommentsMenu a").addClass("g-button ui-state-default");
$("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left");
$("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right");
}
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index ef15ed25..b18f010a 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -10,6 +10,7 @@
<?= $theme->css("yui/reset-fonts-grids.css") ?>
<?= $theme->css("themeroller/ui.base.css") ?>
<?= $theme->css("superfish/css/superfish.css") ?>
+ <?= $theme->css("gallery.common.css") ?>
<?= $theme->css("screen.css") ?>
<!--[if lt IE 8]>
<link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>"
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
index 5034ec19..29b9f9d0 100644
--- a/themes/admin_wind/views/pager.html.php
+++ b/themes/admin_wind/views/pager.html.php
@@ -10,34 +10,34 @@
"count" => $total_items)) ?>
<li>
<? if ($first_page): ?>
- <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? endif ?>
<? if ($previous_page): ?>
- <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? endif ?>
</li>
<li class="gInfo"><?= $from_to_msg ?></li>
- <li class="txtright">
+ <li class="g-txt-right">
<? if ($next_page): ?>
- <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <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>
<? else: ?>
- <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? endif ?>
<? if ($last_page): ?>
- <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? else: ?>
- <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? endif ?>
</li>
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index eee88c15..4c13764f 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -28,7 +28,7 @@ input.submit {
float: none !important;
}
-.gPager .txtright {
+.gPager .g-txt-right {
width: 29%;
}
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index df46b443..6d955481 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -5,7 +5,6 @@
*
* Sheet organization:
* 1) Basic HTML elements
- * 2) Reusable classes
* 3) Reusable content blocks
* 4) Page layout containers
* 5) Content blocks in specific layout containers
@@ -69,9 +68,9 @@ h3 {
a,
.gMenu a,
#gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
+.g-button,
+.g-button:hover,
+.g-button:active,
a.ui-state-hover,
input.ui-state-hover,
button.ui-state-hover {
@@ -243,29 +242,6 @@ li.gError select {
}
/** *******************************************************************
- * 2) Reusable generic classes
- *********************************************************************/
-
-.inactive, .understate {
- color: #ccc;
- font-weight: normal;
-}
-
-.left {
- float: left;
- margin: 1em 1em 1em 0;
-}
-
-.right {
- float: right;
- margin: 1em 0 1em 1em;
-}
-
-.txtright {
- text-align: right;
-}
-
-/** *******************************************************************
* 3) Reusable content blocks
*********************************************************************/
@@ -908,13 +884,6 @@ form .gError,
/* jQuery UI ThemeRoller buttons */
-.gButtonLink {
- display: inline-block;
- margin: 0 4px 0 0;
- padding: .2em .4em;
- outline: 0;
-}
-
.gButtonSet {
padding-left: 1px;
}
@@ -923,7 +892,7 @@ form .gError,
float: left;
}
-.gButtonSet .gButtonLink {
+.gButtonSet .g-button {
margin: 0;
}
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index c79e91bd..4a1962c0 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -49,7 +49,7 @@ $(document).ready(function() {
// Apply styles and icon classes to gContextMenu
if ($(".gContextMenu").length) {
$(".gContextMenu li").addClass("ui-state-default");
- $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
+ $(".gContextMenu a").addClass("g-button ui-icon-left");
$(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
$(".gContextMenu a span").each(function() {
var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 910814dd..cf7c9b7f 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -5,20 +5,20 @@
<ul class="gPager">
<li>
<? if ($previous_item): ?>
- <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? endif; ?>
</li>
<li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
- <li class="txtright">
+ <li class="g-txt-right">
<? if ($next_item): ?>
- <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <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>
<? else: ?>
- <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? endif ?>
</li>
diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php
new file mode 100644
index 00000000..7324cf9e
--- /dev/null
+++ b/themes/wind/views/no_sidebar.html.php
@@ -0,0 +1,5 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div class="gWarning">
+ <?= t("No active sidebar panels. <a href=\"%url\">Add panels</a>",
+ array("url" => html::mark_clean(url::site("admin/sidebar")))) ?>
+</div>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 19d8cc00..414174b6 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -27,6 +27,7 @@
<?= $theme->css("yui/reset-fonts-grids.css") ?>
<?= $theme->css("superfish/css/superfish.css") ?>
<?= $theme->css("themeroller/ui.base.css") ?>
+ <?= $theme->css("gallery.common.css") ?>
<?= $theme->css("screen.css") ?>
<!--[if lt IE 8]>
<link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 7cdc9bb0..155c8d16 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -10,34 +10,34 @@
"count" => $total_items)) ?>
<li>
<? if ($first_page): ?>
- <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? endif ?>
<? if ($previous_page): ?>
- <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? endif ?>
</li>
<li class="gInfo"><?= $from_to_msg ?></li>
- <li class="txtright">
+ <li class="g-txt-right">
<? if ($next_page): ?>
- <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <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>
<? else: ?>
- <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? endif ?>
<? if ($last_page): ?>
- <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? else: ?>
- <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? endif ?>
</li>
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index b0096043..def3d8b7 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -18,20 +18,20 @@
<ul class="gPager">
<li>
<? if ($previous_item): ?>
- <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? endif; ?>
</li>
<li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
- <li class="txtright">
+ <li class="g-txt-right">
<? if ($next_item): ?>
- <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <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>
<? else: ?>
- <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? endif ?>
</li>