public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:gallery/gallery3-contrib

Browse Source
This commit is contained in:
Bharat Mediratta 2010-10-03 22:00:57 -07:00
commit 3534788d0d
24 changed files with 142 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
themes/browny_admin_wind/css/screen.css
View File

@ -702,18 +702,18 @@ li.g-error select {
.g-denied,
tr.g-error td.g-error,
#g-add-photos-status .g-error {
background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%;
background: #f6cbca url('../images/ico-error.png') no-repeat .4em 50%;
color: #f00;
}
.g-info {
background: #e8e8e8 url('images/ico-info.png') no-repeat .4em 50%;
background: #e8e8e8 url('../images/ico-info.png') no-repeat .4em 50%;
}
.g-success,
.g-allowed,
#g-add-photos-status .g-success {
background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%;
background: #d9efc2 url('../images/ico-success.png') no-repeat .4em 50%;
}
tr.g-success {
@ -721,12 +721,12 @@ tr.g-success {
}
tr.g-success td.g-success {
background-image: url('images/ico-success.png');
background-image: url('../images/ico-success.png');
}
.g-warning,
tr.g-warning td.g-warning {
background: #fcf9ce url('images/ico-warning.png') no-repeat .4em 50%;
background: #fcf9ce url('../images/ico-warning.png') no-repeat .4em 50%;
}
form .g-error {
@ -769,11 +769,11 @@ form .g-error {
.g-loading-large,
.g-dialog-loading-large {
background: #e8e8e8 url('images/loading-large.gif') no-repeat center center !important;
background: #e8e8e8 url('../images/loading-large.gif') no-repeat center center !important;
}
.g-loading-small {
background: #e8e8e8 url('images/loading-small.gif') no-repeat center center !important;
background: #e8e8e8 url('../images/loading-small.gif') no-repeat center center !important;
}
/** *******************************************************************
@ -944,7 +944,7 @@ div#g-action-status {
}
.g-breadcrumbs li {
background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
background: transparent url('../images/ico-separator.gif') no-repeat scroll left center;
float: left;
padding: 1em 8px 1em 18px;
}
@ -1151,7 +1151,7 @@ ul.sf-menu li li li.sfHover ul {
}
.rtl .g-breadcrumbs li {
background: transparent url('images/ico-separator-rtl.gif') no-repeat scroll right center;
background: transparent url('../images/ico-separator-rtl.gif') no-repeat scroll right center;
padding: 1em 18px 1em 8px;
}
@ -1261,7 +1261,7 @@ ul.sf-menu li li li.sfHover ul {
.rtl .sf-sub-indicator {
left: .75em !important;
right: auto;
background: url('superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
background: url('../../../lib/superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
}
.rtl a > .sf-sub-indicator { /* give all except IE6 the correct values */
top: .8em;
@ -1307,7 +1307,7 @@ ul.sf-menu li li li.sfHover ul {
/*** shadows for all but IE6 ***/
.rtl .sf-shadow ul {
background: url('superfish/images/shadow.png') no-repeat bottom left;
background: url('../../../lib/superfish/images/shadow.png') no-repeat bottom left;
padding: 0 0 9px 8px;
border-top-right-radius: 0;
border-bottom-left-radius: 0;

18
themes/browny_admin_wind/css/themeroller/ui.theme.css
View File

@ -232,15 +232,15 @@
----------------------------------*/
/* Corner radius */
.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; }
.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
.ui-corner-right { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; }
.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; }
.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
.ui-corner-right { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }
/* Overlays */
.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }

BIN
themes/browny_admin_wind/images/ico-error.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 701 B

BIN
themes/browny_admin_wind/images/ico-info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 804 B

BIN
themes/browny_admin_wind/images/ico-separator-rtl.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 B

BIN
themes/browny_admin_wind/images/ico-separator.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 B

BIN
themes/browny_admin_wind/images/ico-warning.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 666 B

BIN
themes/browny_admin_wind/images/loading-large.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
themes/browny_admin_wind/images/loading-small.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 673 B

53
themes/browny_wind/css/screen.css
View File

@ -854,6 +854,7 @@ form .g-error {
.g-block {
clear: both;
margin-bottom: 2.5em;
overflow: hidden;
}
.g-block-content {
@ -1416,11 +1417,6 @@ div#g-action-status {
background-color: #fcf9ce !important;
}
#g-user-profile th,
#g-user-profile td {
border: 1px dotted #ccc !important;
}
/* /modules/gallery/css/l10n_client.css ~~ */
#l10n-client .labels {
@ -1444,11 +1440,52 @@ div#g-action-status {
/* User Profile ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
.g-avatar g-left {
width: 80px !important;
height: 80px !important;
#g-user-profile h1 {
color: #5A3007;
margin: 1.25em 0em 2em 4.4em;
}
#g-user-profile .g-avatar {
float: left;
position: absolute;
left: 0em;
top: 1.3em;
width: 90px !important;
height: 90px !important;
}
#g-user-profile .g-block h2 {
background-color: #F5EFE6;
margin-bottom: .5em;
}
#g-user-profile .g-block-content h2 {
background-color: transparent;
margin-bottom: inherit;
}
#g-user-profile #g-comment-detail .g-author img {
padding: .4em;
vertical-align: middle;
}
#g-user-profile #g-comment-detail ul li {
border: .1em dotted #D4BE9B;
padding: .8em .5em;
margin-bottom: .5em;
}
.rtl #g-user-profile .g-avatar {
float: right;
right: 0em;
left: auto;
}
.rtl #g-user-profile h1 {
margin: 1.25em 4.4em 2em 0em;
}
/* Organize ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#g-organize {

18
themes/browny_wind/css/themeroller/ui.theme.css
View File

@ -232,15 +232,15 @@
----------------------------------*/
/* Corner radius */
.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; }
.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
.ui-corner-right { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; }
.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; }
.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
.ui-corner-right { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }
/* Overlays */
.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }

BIN
themes/browny_wind/images/ico-denied-inactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 604 B

BIN
themes/browny_wind/images/ico-denied-passive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 916 B

BIN
themes/browny_wind/images/ico-denied.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 715 B

BIN
themes/browny_wind/images/ico-error.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 701 B

BIN
themes/browny_wind/images/ico-lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 749 B

BIN
themes/browny_wind/images/ico-separator-rtl.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 B

BIN
themes/browny_wind/images/ico-separator.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 B

BIN
themes/browny_wind/images/ico-success-inactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 476 B

BIN
themes/browny_wind/images/ico-warning.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 666 B

BIN
themes/browny_wind/images/loading-large.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
themes/browny_wind/images/loading-small.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 673 B

47
themes/browny_wind/views/user_profile.html.php Normal file
View File

@ -0,0 +1,47 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<script type="text/javascript">
$(document).ready(function() {
$("#g-profile-return").click(function(event) {
history.go(-1);
return false;
})
});
</script>
<div id="g-user-profile">
<div class="ui-helper-clearfix">
<a id="g-profile-return" class="g-button g-right ui-state-default ui-corner-all" href="#">
<?= t("Return") ?>
</a>
<? if ($editable): ?>
<a class="g-button g-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("users/form_change_email/{$user->id}") ?>">
<?= t("Change email") ?>
</a>
<a class="g-button g-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("users/form_change_password/{$user->id}") ?>">
<?= t("Change password") ?>
</a>
<a class="g-button g-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("form/edit/users/{$user->id}") ?>">
<?= t("Edit") ?>
</a>
<? endif ?>
<? if ($contactable): ?>
<a class="g-button g-right ui-state-default ui-corner-all g-dialog-link"
href="<?= url::site("user_profile/contact/{$user->id}") ?>">
<?= t("Contact") ?>
</a>
<? endif ?>
</div>
<h1>
<img src="<?= $user->avatar_url(90, $theme->url("images/avatar.jpg", true)) ?>"
alt="<?= html::clean_attribute($user->display_name()) ?>"
class="g-avatar g-left" width="90" height="90" />
<?= t("User profile: %name", array("name" => $user->display_name())) ?>
</h1>
<? foreach ($info_parts as $info): ?>
<div class="g-block">
<h2><?= html::purify($info->title) ?></h2>
<div class="g-block-content">
<?= $info->view ?>
</div>
</div>
<? endforeach ?>
</div>

21
themes/browny_wind/views/user_profile_comments.html.php Normal file
View File

@ -0,0 +1,21 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="g-comment-detail">
<ul>
<? foreach ($comments as $comment): ?>
<li id="g-comment-<?= $comment->id ?>">
<p class="g-author">
<?= $comment->item()->thumb_img(array(), 65) ?>
<?= t("on %date for %title ",
array("date" => gallery::date_time($comment->created),
"title" => $comment->item()->title)); ?>
<a href="<?= $comment->item()->url() ?>">
</a>
</p>
<hr />
<div>
<?= nl2br(html::purify($comment->text)) ?>
</div>
</li>
<? endforeach ?>
</ul>
</div>