not quite there yet but getting closer

This commit is contained in:
marijus 2014-10-20 22:46:14 +02:00
parent 11e8fe3085
commit c080c420ba
3 changed files with 90 additions and 109 deletions

View File

@ -3,6 +3,10 @@
margin-bottom: 25px;
}
.photo-item-tools {
padding: 7px 10px;
}
#photo-photo {
display: table;
margin: 0 auto;
@ -72,9 +76,6 @@
#photo-edit-link-wrap {
margin-bottom: 15px;
}
#photo-like-div {
margin-bottom: 25px;
}
#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
clear: both;
@ -84,18 +85,10 @@
margin-bottom: 15px;
}
#photo-edit-delete-button {
float: right;
}
#photo-edit-edit-wrapper {
margin-top: 10px;
margin-bottom: 30px;
}
#photo-photo-delete-button {
float: right;
margin-top: -64px;
#photo-edit-edit {
padding: 7px 10px;
margin-bottom: 3px;
}
#photo-edit-end {
@ -106,16 +99,6 @@
margin-bottom: 15px;
}
#in-this-photo-text {
margin-left: 30px;
}
#in-this-photo {
margin-left: 60px;
margin-top: 10px;
margin-bottom: 20px;
}
#photo-album-edit-submit, #photo-album-edit-drop {
margin-top: 15px;
margin-bottom: 15px;

View File

@ -648,7 +648,7 @@ footer {
list-style: none;
}
.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
.profile-match-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
border-radius: $radiuspx;
-moz-border-radius: $radiuspx;
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
@ -704,16 +704,11 @@ footer {
cursor: pointer;
}
#photo-caption {
font-size: 110%;
font-weight: bold;
#photo-view-wrapper,
#photo-edit-edit {
background-color: $item_colour;
}
#in-this-photo-text {
color: #0080FF;
}
#side-follow-wrapper {
margin-top: 20px;
}
@ -2327,8 +2322,9 @@ aside .nav-pills > li > a {
.section-title-wrapper {
padding: 7px 10px;
background-color: $item_colour;
border-radius: $radiuspx;
margin-bottom: 10px;
border-top-left-radius: $radiuspx;
border-top-right-radius: $radiuspx;
margin-bottom: 3px;
}
.section-title-wrapper h2 {

View File

@ -12,9 +12,14 @@
{{/if}}
</div>
<div class="btn-group btn-group-xs pull-right dropdown">
{{if $tools}}
<a class="btn btn-default" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
{{/if}}
{{if $edit}}
<i class="icon-pencil btn btn-default" title="{{$edit.edit}}" onclick="openClose('photo-edit-edit');"></i>
{{/if}}
{{if $lock}}
<i class="icon-lock btn btn-default dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
{{/if}}
@ -22,100 +27,97 @@
</div>
<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
<div class="clear"></div>
</div>
<div id="photo-edit-edit" style="display: none;">
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
<input type="hidden" name="item_id" value="{{$edit.item_id}}">
<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
<input id="photo-edit-albumname" type="text" name="albname" value="{{$edit.album}}" list="dl-albums">
{{if $edit.albums}}
<datalist id="dl-albums">
{{foreach $edit.albums as $al}}
{{if $al.text}}
<option value="{{$al.text}}">
{{/if}}
{{/foreach}}
</datalist>
{{/if}}
<div id="photo-edit-albumname-end"></div>
<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
<input id="photo-edit-caption" type="text" name="desc" value="{{$edit.caption}}">
<div id="photo-edit-caption-end"></div>
<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label>
<input name="newtag" id="photo-edit-newtag" title="{{$edit.help_tags}}" type="text">
<div id="photo-edit-tags-end"></div>
<div id="photo-edit-rotate-wrapper">
<div id="photo-edit-rotate-label">
{{$edit.rotatecw}}<br>
{{$edit.rotateccw}}
</div>
<input type="radio" name="rotate" value="1"><br>
<input type="radio" name="rotate" value="2">
</div>
<div id="photo-edit-rotate-end"></div>
<div id="settings-default-perms" class="settings-default-perms">
<span id="jot-perms-icon" class="{{$edit.lockstate}}"></span>
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button>
{{$edit.aclselect}}
<div id="settings-default-perms-menu-end"></div>
</div>
< <br/>
<div id="settings-default-perms-end"></div>
<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}">
<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
<div id="photo-edit-end"></div>
</form>
</div>
<div id="photo-edit-link-wrap">
<div class="clear"></div>
<div id="photo-view-wrapper">
<div id="photo-edit-edit" style="display: none;">
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
<input type="hidden" name="item_id" value="{{$edit.item_id}}">
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
<div id="photo-photo-end"></div>
<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" list="dl-albums">
{{if $edit.albums}}
<datalist id="dl-albums">
{{foreach $edit.albums as $al}}
{{if $al.text}}
<option value="{{$al.text}}">
{{/if}}
{{/foreach}}
</datalist>
{{/if}}
<div id="photo-edit-albumname-end"></div>
<div class="photo-item-tools">
<div class="photo-item-tools-left pull-left">
{{if $tags}}
<div id="in-this-photo">
<span id="in-this-photo-text">{{$tag_hdr}}</span>
{{foreach $tags as $t}}
{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
{{/foreach}}
</div>
{{/if}}
<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}">
</div>
<div id="photo-edit-caption-end"></div>
<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label>
<input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text">
<div id="photo-edit-tags-end"></div>
<div id="photo-edit-rotate-wrapper">
<div id="photo-edit-rotate-label">
{{$edit.rotatecw}}<br>
{{$edit.rotateccw}}
{{if $likebuttons}}
<div class="photo-item-tools-right btn-group pull-right">
<i class="icon-thumbs-up-alt item-tool btn btn-default btn-sm" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
<i class="icon-thumbs-down-alt item-tool btn btn-default btn-sm" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
{{$like}}
{{$dislike}}
</div>
<div id="like-rotator-{{$id}}" class="like-rotator pull-right"></div>
{{/if}}
<div class="clear"></div>
</div>
<input type="radio" name="rotate" value="1"><br>
<input type="radio" name="rotate" value="2">
</div>
<div id="photo-edit-rotate-end"></div>
<div id="settings-default-perms" class="settings-default-perms">
<span id="jot-perms-icon" class="{{$edit.lockstate}}"></span>
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button>
{{$edit.aclselect}}
<div id="settings-default-perms-menu-end"></div>
</div>
<br/>
<div id="settings-default-perms-end"></div>
<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}">
<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
<div id="photo-edit-end"></div>
</form>
</div>
{{if $tools}}
<div>
<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
</div>
{{/if}}
<div id="photo-view-wrapper">
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
<div id="photo-photo-end"></div>
{{if $tags}}
<div id="in-this-photo-text">{{$tag_hdr}}</div>
{{foreach $tags as $t}}
<div id="in-this-photo">{{$t.0}}</div>
{{if $edit}}<div id="tag-remove"><a href="{{$t.1}}">{{$t.2}}</a></div>{{/if}}
{{/foreach}}
{{/if}}
{{if $likebuttons}}
<div id="photo-like-div">
{{$likebuttons}}
{{$like}}
{{$dislike}}
</div>
{{/if}}
{{$comments}}
{{if $commentbox}}
<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
{{$commentbox}}
</div>
{{/if}}
</div>
<div class="clear"></div>