summaryrefslogtreecommitdiff
path: root/themes/admin_default
diff options
context:
space:
mode:
Diffstat (limited to 'themes/admin_default')
-rw-r--r--themes/admin_default/css/screen.css32
-rw-r--r--themes/admin_default/theme.info6
-rw-r--r--themes/admin_default/views/admin.html.php58
-rw-r--r--themes/admin_default/views/pager.html.php12
4 files changed, 67 insertions, 41 deletions
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 862f1fc1..d408acf0 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -9,6 +9,8 @@
* 4) Content blocks in specific layout containers
* 5) Browser hacks
* 6) jQuery and jQuery UI
+ * 7) Server Add
+ * 8) Digibug Print Administration
*/
/** *******************************************************************
@@ -99,19 +101,22 @@
#gHeader #gLogo {
float: left;
margin: -22px 10px 0 0;
+ display: block;
+ padding-left: 2px;
+ width: 105px; /* 107px - padding-left */
+ height: 48px;
+ background-image: url('../../default/images/logo.png');
+ color: #A5A5A5 ! important;
}
-
-.rtl #gHeader #gLogo {
- float: left;
+#gHeader #gLogo:hover {
+ color: #FF6600 ! important;
+ text-decoration: none;
}
#gHeader #gLoginMenu {
float: none;
margin: 0;
padding: 5px 0 10px 0;
-}
-
-#gHeader #gLoginMenu {
text-align: right;
}
@@ -395,6 +400,20 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
float: left;
}
+#gTaskLogDialog h1 {
+ font-size: 1.1em;
+}
+
+.gTaskLog {
+ border: 1pt solid;
+ font-size: .9em;
+ height: 400px;
+ margin: .5em 0;
+ overflow: auto;
+ padding: .5em
+}
+
+
/** *******************************************************************
* 7) Server Add
*********************************************************************/
@@ -436,3 +455,4 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
width: 150px;
overflow: hidden;
}
+
diff --git a/themes/admin_default/theme.info b/themes/admin_default/theme.info
index d21b0ff5..b3d9741d 100644
--- a/themes/admin_default/theme.info
+++ b/themes/admin_default/theme.info
@@ -1,6 +1,6 @@
-name = Gallery Default
-description = A crisp Site Administration theme with soft colors and drop down menus.
+name = "Gallery Default"
+description = "A crisp Site Administration theme with soft colors and drop down menus."
version = 1
-author = Gallery Team
+author = "Gallery Team"
admin = 1
site = 0
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index b7cfaa40..575f8a96 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -1,34 +1,36 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<title><?= t("Admin Dashboard") ?></title>
<link rel="shortcut icon" href="<?= url::file("themes/default/images/favicon.ico") ?>" type="image/x-icon" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
- media="screen,projection" />
- <link rel="stylesheet" type="text/css" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
- media="screen,projection" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
- media="screen,projection" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("themes/default/css/screen.css") ?>"
- media="screen,projection" />
- <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
- media="screen,projection" />
- <!--[if IE]>
- <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
- media="screen,print,projection" />
- <![endif]-->
- <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
- <script src="<?= $theme->url("js/jquery.dropshadow.js") ?>" type="text/javascript"></script>
- <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
- <?= $theme->admin_head() ?>
+
+ <?= $theme->css("lib/yui/reset-fonts-grids.css") ?>
+ <?= $theme->css("lib/themeroller/ui.base.css") ?>
+ <?= $theme->css("lib/superfish/css/superfish.css") ?>
+ <?= $theme->css("themes/default/css/screen.css") ?>
+ <?= $theme->theme_css("css/screen.css") ?>
+ <!--[if lt IE 8]>
+ <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
+ media="screen,print,projection" />
+ <![endif]-->
+
+ <?= $theme->script("lib/jquery.js") ?>
+ <?= $theme->script("lib/jquery.form.js") ?>
+ <?= $theme->script("lib/jquery-ui.js") ?>
+ <?= $theme->script("lib/gallery.common.js") ?>
+ <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
+ <script type="text/javascript">
+ var MSG_CANCEL = "<?= t('Cancel') ?>";
+ </script>
+ <?= $theme->script("lib/gallery.dialog.js") ?>
+ <?= $theme->script("lib/superfish/js/superfish.js") ?>
+ <?= $theme->theme_script("js/jquery.dropshadow.js") ?>
+ <?= $theme->theme_script("js/ui.init.js") ?>
+
+ <?= $theme->admin_head() ?>
</head>
<body <?= $theme->body_attributes() ?>>
@@ -42,11 +44,13 @@
<div id="gHeader">
<?= $theme->admin_header_top() ?>
<ul id="gLoginMenu">
- <li class="first"><?= html::anchor("albums/1", t("Browse the Gallery")) ?></li>
+ <li class="first"><?= html::anchor("albums/1", "&larr; ".t("Back to the Gallery")) ?></li>
<li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
</ul>
- <a href="<?= url::site("albums/1") ?>"><img src="<?= url::file("themes/default/images/logo.png") ?>" id="gLogo" alt="<?= t("Gallery 3: Your Photos on Your Web Site") ?>" /></a>
- <div id="gSiteAdminMenu" style="display: none">
+ <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>">
+ &larr; <?= t("back to the ...") ?>
+ </a>
+ <div id="gSiteAdminMenu" style="display: none;">
<?= $theme->admin_menu() ?>
</div>
<?= $theme->admin_header_bottom() ?>
diff --git a/themes/admin_default/views/pager.html.php b/themes/admin_default/views/pager.html.php
index 8df1b030..5034ec19 100644
--- a/themes/admin_default/views/pager.html.php
+++ b/themes/admin_default/views/pager.html.php
@@ -1,11 +1,13 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<? // See http://docs.kohanaphp.com/libraries/pagination ?>
<ul class="gPager">
- <? /* XXX: This message isn't easily localizable */
- $from_to_msg = t("Items %from_number - %to_number of %total",
- array("from_number" => $current_first_item,
- "to_number" => $current_last_item,
- "total" => $total_items)) ?>
+ <? /* @todo This message isn't easily localizable */
+ $from_to_msg = t2("Item %from_number of %count",
+ "Items %from_number - %to_number of %count",
+ $total_items,
+ array("from_number" => $current_first_item,
+ "to_number" => $current_last_item,
+ "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">