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

Merge remote branch 'gallery3-contrib/master'

Browse Source
This commit is contained in:
rWatcher 2010-10-06 00:53:57 -04:00
commit e8defef5d0
8 changed files with 144 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/photoannotation/helpers/photoannotation_event.php
View File

@ -150,15 +150,17 @@ class photoannotation_event_Core {
$view = new Theme_View("dynamic.html", "collection", "userprofiles");
//load thumbs
$item_users = ORM::factory("items_user")->where("user_id", "=", $data->user->id)->find_all();
$children_count = count($item_users);
foreach ($item_users as $item_user) {
$item_thumb = ORM::factory("item")
->viewable()
->where("type", "!=", "album")
->where("id", "=", $item_user->item_id)
->find();
$item_thumbs[] = $item_thumb;
if ($item_thumb->loaded()) {
$item_thumbs[] = $item_thumb;
}
}
$children_count = count($item_thumbs);
$page_size = module::get_var("gallery", "page_size", 9);
$page = (int) Input::instance()->get("page", "1");
$offset = ($page-1) * $page_size;

30
modules/photoannotation/views/photoannotation_highlight_block.html.php
View File

@ -58,11 +58,6 @@
$jscode .= "\"url\": \"". user_profile::url($oneUser->user_id) ."\" },\n";
}
}
$display = "none";
if ($legend_users != "") {
$display = "block";
}
$legend_users = t("<span id=\"photoannotation-legend-user\" style=\"display: ". $display ."\">People on this photo: ") . $legend_users ."</span>";
foreach ($existingFaces as $oneFace) {
$oneTag = ORM::factory("tag", $oneFace->tag_id);
if ($oneTag->loaded()) {
@ -81,11 +76,6 @@
$jscode .= "\"url\": \"". $oneTag->url() ."\" },\n";
}
}
$display = "none";
if ($legend_faces != "") {
$display = "block";
}
$legend_faces = t("<span id=\"photoannotation-legend-face\" style=\"display: ". $display ."\">Faces on this photo: ") . $legend_faces ."</span>";
foreach ($existingNotes as $oneNote) {
if ($shownotes) {
$legend_notes .= "<span id=\"photoannotation-legend-note-". $oneNote->id . "\">". html::clean($oneNote->title) ."</span> ";
@ -103,12 +93,22 @@
}
$jscode = trim($jscode, ",\n");
$jscode .= " ],";
$display = "none";
if ($legend_notes != "") {
$display = "block";
}
$legend_notes = t("<span id=\"photoannotation-legend-note\" style=\"display: ". $display ."\">Notes on this photo: ") . $legend_notes ."</span>";
}
$display = "none";
if ($legend_users != "") {
$display = "block";
}
$legend_users = t("<span id=\"photoannotation-legend-user\" style=\"display: ". $display ."\">People on this photo: ") . $legend_users ."</span>";
$display = "none";
if ($legend_faces != "") {
$display = "block";
}
$legend_faces = t("<span id=\"photoannotation-legend-face\" style=\"display: ". $display ."\">Faces on this photo: ") . $legend_faces ."</span>";
$display = "none";
if ($legend_notes != "") {
$display = "block";
}
$legend_notes = t("<span id=\"photoannotation-legend-note\" style=\"display: ". $display ."\">Notes on this photo: ") . $legend_notes ."</span>";
$legend_display = $legend_users . $legend_faces . $legend_notes;
$labels_arraystring = "labels: [ '". t("Tag:") ."','". t("Note Title:") ."','". t("Description (optional)") ."','". t("Are you sure you want to delete this annotation?") ."','". t("or") ."','". t("Yes") ."','". t("No") ."','". t("Confirm deletion") ."','". t("Save") ."','". t("Cancel") ."','". t("Person:") ."','". t("No user selected") ."','". t("Select one of the following") ."','". t("An error ocurred while saving annotation") ."','". t("OK") ."','". t("An error ocurred while deleting annotation") ."','". t("View fullsize") ."' ],";
?>

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

@ -26,11 +26,12 @@
/* ~browny~ */
body, html {
background-color: #5a3007;
font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
p {
margin-bottom: 1em;
text-shadow: 0px 1px 1px #F7F5F0;
}
em {
@ -39,6 +40,7 @@ em {
h1, h2, h3, h4, h5, strong, th {
font-weight: bold;
text-shadow: 1px 1px 0px #fff;
}
h1 {
@ -65,6 +67,17 @@ h3 {
font-size: 1.2em;
}
select,
input,
button,
textarea {
font: 99% 'Century gothic', Verdana, Arial, Helvetica, Clean, sans-serif;
}
#l10n-client h2 {
text-shadow: none;
}
/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* ~browny~ */
@ -334,6 +347,7 @@ th {
.g-block-content {
margin-top: 1em;
text-shadow: 0px 1px 0px #fff;
}
#g-content .g-block {
@ -387,6 +401,10 @@ th {
background-image: none;
}
#g-maintenance-mode ul.g-message-block {
margin-top: .5em;
}
.g-success td {
background-color: transparent;
background-image: none;
@ -848,6 +866,7 @@ form .g-error {
display: inline-block;
margin: 0 4px 0 0;
padding: .2em .4em;
text-shadow: 0px 1px 1px #fff;
}
.g-button,
@ -1048,6 +1067,7 @@ ul.sf-menu li li li.sfHover ul {
/* ~browny~ */
.sf-menu li {
background: #d3b07e url('../images/ui-bg_highlight-soft_45_d3b07e_1x100.png') 50% 50% repeat-x;
text-shadow: 0px 1px 1px #fff;
}
/* ~browny~ */
@ -1076,6 +1096,18 @@ ul.sf-menu li li li.sfHover ul {
padding: .2em .4em;
}
.ui-dialog-content {
text-shadow: 0px 1px 1px #fff;
}
.ui-widget {
font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
/** *******************************************************************
* 10) Right to left styles
*********************************************************************/

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

@ -12,8 +12,8 @@
/* Component containers
----------------------------------*/
.ui-widget { font-family: Geeza Pro, Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Geeza Pro, Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #9e7247; background: #f6f3ef url(images/ui-bg_inset-hard_100_f6f3ef_1x100.png) 50% bottom repeat-x; color: #222222; }
.ui-widget-content a { color: #222222; }
.ui-widget-header { border: 1px solid #4e2e0e; background: #714213 url(images/ui-bg_gloss-wave_55_714213_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }

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

@ -24,11 +24,12 @@
/* ~browny~ */
body, html {
background-color: #5a3007;
font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
p {
margin-bottom: 1em;
text-shadow: 0px 1px 1px #F7F5F0;
}
em {
@ -37,6 +38,7 @@ em {
h1, h2, h3, h4, h5, strong, th {
font-weight: bold;
text-shadow: 1px 1px 0px #fff;
}
h1 {
@ -76,12 +78,27 @@ h3 {
font-size: .8em;
}
#g-footer h3 {
text-shadow: 1px 1px 1px #F7F5F0;
}
#g-album-grid .g-item,
#g-item #g-photo,
#g-item #g-movie {
font-size: .7em;
}
select,
input,
button,
textarea {
font: 99% 'Century gothic', Verdana, Arial, Helvetica, Clean, sans-serif;
}
#l10n-client h2 {
text-shadow: none;
}
/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* ~browny~ */
@ -884,6 +901,7 @@ ul.sf-menu li li li.sfHover ul {
/* ~browny~ */
.sf-menu li {
background: #d3b07e url('../images/ui-bg_highlight-soft_45_d3b07e_1x100.png') 50% 50% repeat-x;
text-shadow: 0px 1px 1px #fff;
}
/* ~browny~ */
@ -904,17 +922,30 @@ ul.sf-menu li li li.sfHover ul {
/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
.ui-widget {
font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
.ui-widget-overlay {
background: #000;
opacity: .7;
}
.ui-dialog-content {
text-shadow: 0px 1px 1px #fff;
}
/* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
.g-button {
display: inline-block;
margin: 0 4px 0 0;
padding: .2em .4em;
text-shadow: 0px 1px 1px #fff;
}
.g-button,
@ -1083,7 +1114,7 @@ div#g-action-status {
}
/** *******************************************************************
* 8) Right to left language styles
* 10) Right to left language styles
*********************************************************************/
.rtl {
direction: rtl;
@ -1403,7 +1434,7 @@ div#g-action-status {
}
/** *******************************************************************
* 9) More Browny (Extra overrides for better Browny look)
* 11) More Browny (Extra overrides for better Browny look)
*********************************************************************/
/* ~browny~ */
@ -1452,11 +1483,13 @@ div#g-action-status {
top: 1.3em;
width: 90px !important;
height: 90px !important;
margin: 0em 0em 0em .6em;
}
#g-user-profile .g-block h2 {
background-color: #F5EFE6;
margin-bottom: .5em;
padding-left: .8em;
}
#g-user-profile .g-block-content h2 {
@ -1464,9 +1497,21 @@ div#g-action-status {
margin-bottom: inherit;
}
#g-user-profile #g-comment-detail .g-author img {
padding: .4em;
vertical-align: middle;
#g-user-profile #g-comment-detail .g-author {
font-family: Cursive, Serif;
}
#g-user-profile #g-comment-detail .g-author a {
float: left;
position: relative;
top: -0.3em;
left: 0em;
margin-right: .6em;
}
#g-user-profile #g-comment-detail div {
margin-left: 5em;
line-height: 150%;
}
#g-user-profile #g-comment-detail ul li {
@ -1475,16 +1520,48 @@ div#g-action-status {
margin-bottom: .5em;
}
.rtl #g-user-profile .g-block h2 {
padding-right: .8em;
padding-left: auto;
}
.rtl #g-user-profile .g-avatar {
float: right;
right: 0em;
left: auto;
margin: 0em .6em 0em 0em;
}
.rtl #g-user-profile #g-comment-detail .g-author a {
float: right;
right: 0em;
left: auto;
margin-left: .6em;
margin-right: 0em;
}
.rtl #g-user-profile #g-comment-detail div {
margin-right: 5em;
margin-left: 0em;
}
.rtl #g-user-profile h1 {
margin: 1.25em 4.4em 2em 0em;
}
/* Comments ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#g-content #g-comments .g-avatar {
float: left;
margin-right: .4em;
margin-left: 0;
}
.rtl #g-content #g-comments .g-avatar {
float: right;
margin-left: .4em;
margin-right: 0;
}
/* Organize ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */

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

@ -12,8 +12,8 @@
/* Component containers
----------------------------------*/
.ui-widget { font-family: Geeza Pro, Tahoma, Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Geeza Pro, Tahoma, Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #9e7247; background: #f6f3ef url(images/ui-bg_inset-hard_100_f6f3ef_1x100.png) 50% bottom repeat-x; color: #222222; }
.ui-widget-content a { color: #222222; }
.ui-widget-header { border: 1px solid #4e2e0e; background: #714213 url(images/ui-bg_gloss-wave_55_714213_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }

2
themes/browny_wind/views/page.html.php
View File

@ -80,7 +80,7 @@
<?= $header_text ?>
<? else: ?>
<a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
<img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("themes/browny_wind/images/logo.png") ?>" />
<img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $theme->url("images/logo.png") ?>" />
</a>
<? endif ?>
<?= $theme->user_menu() ?>

8
themes/browny_wind/views/user_profile_comments.html.php
View File

@ -4,12 +4,12 @@
<? 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 ",
<a href="<?= $comment->item()->url() ?>">
<?= $comment->item()->thumb_img(array(), 70) ?>
</a>
<?= t("<i><strong>on</strong> %date <strong>for</strong> %title</i> ",
array("date" => gallery::date_time($comment->created),
"title" => $comment->item()->title)); ?>
<a href="<?= $comment->item()->url() ?>">
</a>
</p>
<hr />
<div>