1
0
Fork 0

Merge pull request #95 from fabrixxm/dispy

Dispy
This commit is contained in:
Friendika 2011-05-05 04:29:14 -07:00
commit b3fa03d3b4
7 changed files with 224 additions and 53 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

BIN
view/theme/dispy/next.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 891 B

View file

@ -0,0 +1,40 @@
<div id="live-display"></div>
<h3><a href="$album.0">$album.1</a></h3>
<div id="photo-edit-link-wrap">
{{ if $tools }}
<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-
<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
{{ endif }}
{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
</div>
<div id="photo-photo">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
</div>
<div id="photo-photo-end"></div>
<div id="photo-caption" >$desc</div>
{{ if $tags }}
<div id="in-this-photo-text">$tags.0</div>
<div id="in-this-photo">$tags.1</div>
{{ endif }}
{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
{{ if $edit }}$edit{{ endif }}
{{ if $likebuttons }}
<div id="photo-like-div">
$likebuttons
$like
$dislike
</div>
{{ endif }}
$comments
$paginate

BIN
view/theme/dispy/prev.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 853 B

View file

@ -39,6 +39,16 @@ input[type=submit] {
padding:1em;
}
.pager {
padding-top: 30px;
display:block;
clear: both;
text-align: center;
}
.pager span { padding: 4px; margin:4px; }
.pager_current { background-color: #729fcf; color: #ffffff; }
/**
* login
*/
@ -201,7 +211,7 @@ aside #viewcontacts { text-align: right;}
#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; }
#dfrn-request-link {
background: #3465A4 url('connect.png') no-repeat right center;
background: #3465A4 url('connect.png') no-repeat 95% center;
border-radius: 5px 5px 5px 5px;
color: #FFFFFF;
display: block;
@ -296,6 +306,8 @@ aside #viewcontacts { text-align: right;}
#acl-deny-group-label,
#acl-deny-contact-label { display: block }
#group_allow, #contact_allow,
#group_deny, #contact_deny,
#profile-jot-acl-wrapper select { width: 100%; }
#acl-wrapper-end,
@ -324,7 +336,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.wall-item-photo-menu { display: none;}
.wall-item-photo-menu-button {
display:none;
text-indent: -9999px;
text-indent: -99999px;
background: #555753 url("menu-user-pin.jpg") no-repeat 75px center;
position: absolute;
overflow: hidden;
@ -491,6 +503,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
/**
* photos
**/
#photo-top-links {
margin-bottom:30px;
}
.photo-album-image-wrapper,
.photo-top-image-wrapper {
float: left;
@ -499,12 +514,12 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
-webkit-box-shadow: 0px 0px 5px #888;
box-shadow: 0px 0px 5px #888;
background-color: #eeeeee;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
height: 265px;
position:relative;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
padding-bottom: 30px;
position:relative;
}
@ -524,6 +539,61 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.photo-top-album-name { position: absolute; bottom: 0px; padding: 0px 5px;}
.caption { position: absolute; bottom: 0px; margin: 0px 5px}
#photo-photo{
position: relative;
float:left;
}
#photo-photo-end { clear: both; }
#photo-prev-link,
#photo-next-link{
position: absolute;
width:30%;
height: 100%;
background-color: rgba(255,255,255,0.5);
opacity: 0;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
background-position: center center;
background-repeat: no-repeat;
}
#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); }
#photo-next-link { right:0px; top:0px; background-image: url('next.png');}
#photo-prev-link a,
#photo-next-link a{
display: block; width: 100%; height: 100%;
overflow: hidden;
text-indent: -900000px;
}
#photo-prev-link:hover,
#photo-next-link:hover{
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
#photos-upload-spacer,
#photos-upload-new-wrapper,
#photos-upload-exist-wrapper { margin-bottom: 1em; }
#photos-upload-existing-album-text,
#photos-upload-newalbum-div {
background-color: #555753;
color: #eeeeec;
padding: 1px;
}
#photos-upload-album-select,
#photos-upload-newalbum { width: 99% }
#photos-upload-perms-menu { text-align: right; }
/**
* message
*/
@ -551,6 +621,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
* contacts
*/
.view-contact-wrapper,
.contact-entry-wrapper { float: left; margin-right: 20px; margin-bottom: 20px; position: relative;}
.contact-entry-direction-wrapper {position: absolute; top: 20px;}
.contact-entry-edit-links { position: absolute; top: 60px; }
@ -652,6 +723,12 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
#prof-separator { display: none;}
/**
* profile
*/
#cropimage-wrapper { float:left; }
#crop-image-form { clear:both; }
/**
* directory
@ -706,5 +783,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
/**
* footer
*/ .cc-license { margin-top: 100px; font-size: 0.7em; }
footer { display: block; margin: 50px 20%; clear: both; }
*/
.cc-license { margin-top: 100px; font-size: 0.7em; }
footer { display: block; margin: 50px 20%; clear: both; }