Permalink
Browse files

Merge branch 'master' of git@github.com:gallery/gallery3

  • Loading branch information...
talmdal committed Oct 28, 2009
2 parents 2a21f3b + fbc5517 commit 8ef78de3f72f695225ac87223d0815235a630417
View
@@ -347,13 +347,11 @@ form .g-error {
.g-left {
clear: none;
float: left;
- margin: 1em 1em 1em 0;
}
.g-right {
clear: none;
float: right;
- margin: 1em 0 1em 1em;
}
.g-first {
@@ -467,10 +465,6 @@ ul.sf-menu li li li.sfHover ul {
/* Status and validation messages ~~~~ */
-.g-message {
- font-size: .8em;
-}
-
.g-message-block {
border: 1px solid #ccc;
width: 100%;
@@ -500,39 +494,31 @@ div#g-action-status {
/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
.g-breadcrumbs {
+ clear: both;
padding: 0 20px;
}
.g-breadcrumbs li {
background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
float: left;
- padding: 10px 6px 10px 16px !important;
+ padding: 1em .6em 1em 1.4em;
}
-.g-breadcrumbs li.root {
- background: transparent;
+.g-breadcrumbs .g-first {
+ background: none;
+ padding-left: 0;
}
.g-breadcrumbs li a,
.g-breadcrumbs li span {
display: block;
}
-.g-breadcrumbs li.active,
-.g-breadcrumbs li.active span {
- font-weight: bold;
-}
-
#g-dialog ul.g-breadcrumbs {
- clear: both;
margin-left: 0;
padding-left: 0;
}
-#g-dialog .g-breadcrumbs li {
- font-size: .9em;
-}
-
/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
.g-pager {
@@ -570,21 +556,53 @@ div#g-action-status {
.g-inline li {
float: left;
- margin-left: 1em;
+ margin-left: 1.8em;
+ padding-left: 0 !important;
}
.g-inline li.g-first {
margin-left: 0;
}
-/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+/** *******************************************************************
+ * 7) Right to left styles
+ **********************************************************************/
+
+.rtl {
+ direction: rtl;
+}
+
+.rtl caption,
+.rtl th,
+.rtl #g-dialog,
+.g-message {
+ text-align: right;
+}
+
+.rtl .g-txt-right {
+ text-align: left;
+}
-.rtl .g-short-form li {
+.rtl .g-left,
+.rtl .g-inline li,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl #g-content #g-album-grid .g-item,
+.rtl .sf-menu li,
+.rtl .g-breadcrumbs li,
+.rtl .g-pager li,
+.rtl .g-buttonset li,
+.rtl .ui-icon-left .ui-icon {
float: right;
}
+.rtl .g-right,
+.rtl .ui-icon-right .ui-icon {
+ float: left;
+}
+
.rtl .g-inline li {
- float: right;
margin-right: 1em;
}
@@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="g-login-menu" class="g-inline">
+<ul id="g-login-menu" class="g-inline g-right">
<? if ($user->guest): ?>
<li class="g-first">
<a href="<?= url::site("login/ajax") ?>"
@@ -6,8 +6,8 @@
url: form_url.replace("__ITEM__", id),
success: function(data) {
$("#g-edit-permissions-form").html(data);
- $(".active").removeClass("active");
- $("#item-" + id).addClass("active");
+ $(".g-active").removeClass("g-active");
+ $("#item-" + id).addClass("g-active");
}
});
}
@@ -38,18 +38,18 @@
<p><?= t("Edit permissions for album:") ?></p>
<ul class="g-breadcrumbs">
+ <? $i = 0 ?>
<? foreach ($parents as $parent): ?>
- <li id="item-<?= $parent->id ?>">
+ <li id="item-<?= $parent->id ?>"<? if ($i == 0) print " class=\"g-first\"" ?>>
<? if (access::can("edit", $parent)): ?>
- <a href="javascript:show(<?= $parent->id ?>)">
- <?= html::purify($parent->title) ?>
- </a>
+ <a href="javascript:show(<?= $parent->id ?>)"> <?= html::purify($parent->title) ?> </a>
<? else: ?>
<?= html::purify($parent->title) ?>
<? endif ?>
</li>
+ <? $i++ ?>
<? endforeach ?>
- <li class="active" id="item-<?= $item->id ?>">
+ <li class="g-active" id="item-<?= $item->id ?>">
<a href="javascript:show(<?= $item->id ?>)">
<?= html::purify($item->title) ?>
</a>
@@ -25,10 +25,12 @@
<?= t("Photos will be uploaded to album: ") ?>
</p>
<ul class="g-breadcrumbs">
+ <? $i = 0 ?>
<? foreach ($item->parents() as $parent): ?>
- <li> <?= html::clean($parent->title) ?> </li>
+ <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
+ <? $i++ ?>
<? endforeach ?>
- <li class="active"> <?= html::purify($item->title) ?> </li>
+ <li class="g-active"> <?= html::purify($item->title) ?> </li>
</ul>
<div id="g-uploadqueue-infobar">
@@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<form action="<?= url::site("search") ?>" id="g-quick-search-form" class="g-short-form">
+<form action="<?= url::site("search") ?>" id="g-quick-search-form" class="g-short-form g-right">
<ul>
<li>
<label for="g-search"><?= t("Search the gallery") ?></label>
@@ -9,14 +9,12 @@
<p id="g-description"><?= t("Photos will be added to album:") ?></p>
<ul class="g-breadcrumbs">
+ <? $i = 0 ?>
<? foreach ($item->parents() as $parent): ?>
- <li>
- <?= html::purify($parent->title) ?>
- </li>
+ <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::purify($parent->title) ?> </li>
+ <? $i++ ?>
<? endforeach ?>
- <li class="active">
- <?= html::purify($item->title) ?>
- </li>
+ <li class="g-active"> <?= html::purify($item->title) ?> </li>
</ul>
<ul id="g-server-add-tree" class="g-checkbox-tree">
@@ -246,7 +246,7 @@ th {
background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em;
color: #A5A5A5 !important;
display: block;
- height: 55px;
+ height: 65px;
padding-top: 5px;
width: 105px;
}
@@ -457,46 +457,19 @@ th {
* 7) Right to left styles
*********************************************************************/
-.rtl {
- direction: rtl;
+.rtl #g-admin-menu {
+ left: auto;
+ right: 150px;
}
-.rtl caption,
-.rtl th,
-.rtl #g-dialog {
- text-align: right;
-}
-
-.rtl #g-header #g-login-menu,
-.rtl .g-txt-right {
- text-align: left;
-}
-
-.rtl .g-right,
-.rtl #g-header #g-quick-search-form,
-.rtl #g-header #g-login-menu,
-.rtl .ui-icon-right .ui-icon {
- clear: left;
- float: left;
-}
-
-.rtl .g-left,
-.rtl form ul ul li,
-.rtl input[type="submit"],
-.rtl input[type="reset"],
.rtl #g-content #g-album-grid .g-item,
-.rtl #g-site-admin-menu,
-.rtl .g-pager li,
-.rtl .g-buttonset li,
-.rtl .ui-icon-left .ui-icon,
.rtl #g-site-theme,
.rtl #g-admin-theme,
.rtl .g-selected img,
.rtl .g-available .g-block img,
.rtl #g-content #g-photo-stream .g-item,
.rtl li.g-group,
-.rtl #g-server-add-admin,
-.rtl .ui-icon-left .ui-icon {
+.rtl #g-server-add-admin {
float: right;
}
@@ -44,7 +44,17 @@
<div id="g-header">
<?= $theme->admin_header_top() ?>
<ul id="g-login-menu" class="g-inline g-right">
- <li class="g-first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
+ <li class="g-first">
+ <? if (identity::is_writable()): ?>
+ <?= t('Logged in as %name', array('name' => html::mark_clean(
+ '<a href="' . url::site("form/edit/users/{$user->id}") .
+ '" title="' . t("Edit Your Profile")->for_html_attr() .
+ '" id="g-user-profile-link" class="g-dialog-link">' .
+ html::clean($user->display_name()) . '</a>'))) ?>
+ <? else: ?>
+ <?= t('Logged in as %name', array('name' => html::clean($user->display_name()))) ?>
+ <? endif ?>
+ </li>
<li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
</ul>
<a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
Oops, something went wrong.

0 comments on commit 8ef78de

Please sign in to comment.