MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2012-01-12 13:59:07 -08:00
parent 87c4d1c3cd 9b2669eb5d
commit bb888feaef
7 changed files with 212 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/comment_item.tpl
View file

@ -17,7 +17,7 @@
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
<div id="comment-edit-preview-$id" style="display:none;"></div> <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
</div> </div>
<div class="comment-edit-end"></div> <div class="comment-edit-end"></div>

6
view/jot.tpl
View file

@ -32,8 +32,6 @@
</ul> </ul>
</div> </div>
</form>
<div style="display: none;"> <div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl $acl
@ -45,5 +43,9 @@
</div> </div>
</form>

30
view/search_item.tpl
View file

@ -1,18 +1,20 @@
<div class="wall-item-decor"> <div class="wall-item-decor">
<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span> <span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }} {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
<div class="wall-item-container $indent"> <div class="wall-item-container $indent">
<div class="wall-item-item"> <div class="wall-item-item">
<div class="wall-item-info"> <div class="wall-item-info">
<div class="wall-item-photo-wrapper" <div class="contact-photo-wrapper"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)"> onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" alt="$name" /> <img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
</a> </a>
<a href="#" rel="#wall-item-photo-menu-$id" class="fakelink wall-item-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a> <a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id"> <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
$item_photo_menu $item_photo_menu
</ul> </ul>
@ -27,6 +29,15 @@
</div> </div>
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class="wall-item-links"> <div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom">
<div class="">
{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }} {{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
</div> </div>
<div class="wall-item-actions"> <div class="wall-item-actions">
@ -38,6 +49,7 @@
{{ if $star }} {{ if $star }}
<a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a> <a href="#" id="star-$id" onclick="dostar($id); return false;" class="$star.classdo" title="$star.do">$star.do</a>
<a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a> <a href="#" id="unstar-$id" onclick="dostar($id); return false;" class="$star.classundo" title="$star.undo">$star.undo</a>
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="$star.classtagger" title="$star.tagger">$star.tagger</a>
{{ endif }} {{ endif }}
{{ if $vote }} {{ if $vote }}
@ -48,16 +60,12 @@
{{ if $vote.share }} {{ if $vote.share }}
<a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a> <a href="#" id="share-$id" title="$vote.share.0" onclick="jotShare($id); return false">$vote.share.1</a>
{{ endif }} {{ endif }}
{{ if $conv }}
<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
{{ endif }}
</div> </div>
<div class="wall-item-actions-tools"> <div class="wall-item-actions-tools">
{{ if $drop.dropping }} {{ if $drop.dropping }}
<input type="checkbox" title="$drop.select" name="itemselected[]" value="$id" /> <input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
<a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a> <a href="item/drop/$id" onclick="return confirmDelete();" class="icon delete s16" title="$drop.delete">$drop.delete</a>
{{ endif }} {{ endif }}
{{ if $edpost }} {{ if $edpost }}
@ -67,5 +75,9 @@
</div> </div>
</div> </div>
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-like" id="wall-item-like-$id">$like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
</div>
</div> </div>

79
view/theme/quattro/quattro.less
View file

@ -3,7 +3,7 @@
/* global */ /* global */
body { body {
font-family: Liberation Sans,helvetica,arial,clean,sans-serif; font-family: Liberation Sans,helvetica,arial,clean,sans-serif;
font-size: 10px; font-size: 11px;
background-color: @BodyBackground; background-color: @BodyBackground;
color: @BodyColor; color: @BodyColor;
margin: 50px 0px 0px 0px; margin: 50px 0px 0px 0px;
@ -44,6 +44,9 @@ a:hover {color: @LinkHover; text-decoration: underline; }
.hidden { display: none; } .hidden { display: none; }
.clear { clear: both; } .clear { clear: both; }
.fakelink { color: @Link; text-decoration: none; cursor:pointer; }
.fakelink:hover { color: @LinkHover; text-decoration: underline; }
code { code {
font-family: Courier, monospace; font-family: Courier, monospace;
white-space: pre; white-space: pre;
@ -55,6 +58,23 @@ code {
padding: 10px; padding: 10px;
margin-top: 20px; margin-top: 20px;
} }
#panel {
position: absolute;
width: 10em;
background: @MenuBg;
color: @Menu;
margin: 0px;
padding: 1em;
list-style: none;
border: 3px solid @MenuBorder;
z-index: 100000;
.shadow();
}
/* tool */ /* tool */
.tool { .tool {
@ -234,7 +254,8 @@ ul.menu-popup {
#nav-notifications-menu { #nav-notifications-menu {
width: 400px; width: 400px; max-height: 550px;
overflow: auto;
img { float: left; margin-right: 5px; } img { float: left; margin-right: 5px; }
.contactname { font-weight: bold; } .contactname { font-weight: bold; }
.notif-when { font-size: 10px; color: @MenuItemDetail; display: block; } .notif-when { font-size: 10px; color: @MenuItemDetail; display: block; }
@ -431,6 +452,26 @@ section {
} }
} }
.comment-edit-preview {
width: 710px;
border: 1px solid @Grey5;
margin-top: 10px;
.contact-photo { width: 32px; height: 32px; margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
}
.contact-photo-menu-button {
top: 15px !important;
left: 15px !important;
}
.wall-item-links { padding-left: 12px; }
.wall-item-container { width: 700px; }
.tread-wrapper { width: 700px; padding: 0; margin: 10px 0;}
}
.wall-item-tags { padding-top: 5px; } .wall-item-tags { padding-top: 5px; }
@ -445,6 +486,23 @@ section {
} }
} }
.wwto {
position: absolute !important;
width: 25px; height: 25px;
background: #FFFFFF;
border: 2px solid @Metalic3;
height: 25px;
width: 25px;
overflow: hidden;
padding: 1px;
position: absolute !important;
top: 40px;
left: 30px;
.shadow(0px, 0px)
}
.wwto .contact-photo { width: 25px; height: 25px; }
/* contacts menu */ /* contacts menu */
.contact-photo-wrapper { position: relative; } .contact-photo-wrapper { position: relative; }
.contact-photo { .contact-photo {
@ -464,6 +522,7 @@ section {
float: left; float: left;
width: 90px; width: 90px;
height: 90px; height: 90px;
margin-bottom: 15px;
.contact-photo { .contact-photo {
width: 80px; height: 80px; width: 80px; height: 80px;
img { width: 80px; height: 80px; } img { width: 80px; height: 80px; }
@ -828,6 +887,22 @@ ul.tabs {
margin: 0px 10px 10px 0px; margin: 0px 10px 10px 0px;
} }
/* profile match wrapper */
.profile-match-wrapper {
float: left;
width: 90px;
height: 90px;
margin-bottom: 20px;
.contact-photo {
width: 80px; height: 80px;
img { width: 80px; height: 80px; }
}
.contact-photo-menu-button {
left: 0px;
top: 63px;
}
}
/* page footer */ /* page footer */
footer { height: 100px; display: table-row; } footer { height: 100px; display: table-row; }

95
view/theme/quattro/style.css
View file

@ -162,7 +162,7 @@
/* global */ /* global */
body { body {
font-family: Liberation Sans, helvetica, arial, clean, sans-serif; font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
font-size: 10px; font-size: 11px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
margin: 50px 0px 0px 0px; margin: 50px 0px 0px 0px;
@ -195,6 +195,15 @@ a:hover {
.clear { .clear {
clear: both; clear: both;
} }
.fakelink {
color: #005c94;
text-decoration: none;
cursor: pointer;
}
.fakelink:hover {
color: #005c94;
text-decoration: underline;
}
code { code {
font-family: Courier, monospace; font-family: Courier, monospace;
white-space: pre; white-space: pre;
@ -206,6 +215,20 @@ code {
padding: 10px; padding: 10px;
margin-top: 20px; margin-top: 20px;
} }
#panel {
position: absolute;
width: 10em;
background: #ffffff;
color: #2d2d2d;
margin: 0px;
padding: 1em;
list-style: none;
border: 3px solid #364e59;
z-index: 100000;
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
}
/* tool */ /* tool */
.tool { .tool {
height: auto; height: auto;
@ -442,6 +465,8 @@ ul.menu-popup .empty {
} }
#nav-notifications-menu { #nav-notifications-menu {
width: 400px; width: 400px;
max-height: 550px;
overflow: auto;
} }
#nav-notifications-menu img { #nav-notifications-menu img {
float: left; float: left;
@ -758,6 +783,33 @@ section {
color: #2d2d2d; color: #2d2d2d;
border: 1px solid #2d2d2d; border: 1px solid #2d2d2d;
} }
.comment-edit-preview {
width: 710px;
border: 1px solid #2d2d2d;
margin-top: 10px;
}
.comment-edit-preview .contact-photo {
width: 32px;
height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
}
.comment-edit-preview .contact-photo-menu-button {
top: 15px !important;
left: 15px !important;
}
.comment-edit-preview .wall-item-links {
padding-left: 12px;
}
.comment-edit-preview .wall-item-container {
width: 700px;
}
.comment-edit-preview .tread-wrapper {
width: 700px;
padding: 0;
margin: 10px 0;
}
.wall-item-tags { .wall-item-tags {
padding-top: 5px; padding-top: 5px;
} }
@ -771,6 +823,27 @@ section {
background: url("../../../images/tag.png") no-repeat center right; background: url("../../../images/tag.png") no-repeat center right;
color: #ffffff; color: #ffffff;
} }
.wwto {
position: absolute !important;
width: 25px;
height: 25px;
background: #FFFFFF;
border: 2px solid #364e59;
height: 25px;
width: 25px;
overflow: hidden;
padding: 1px;
position: absolute !important;
top: 40px;
left: 30px;
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
}
.wwto .contact-photo {
width: 25px;
height: 25px;
}
/* contacts menu */ /* contacts menu */
.contact-photo-wrapper { .contact-photo-wrapper {
position: relative; position: relative;
@ -795,6 +868,7 @@ section {
float: left; float: left;
width: 90px; width: 90px;
height: 90px; height: 90px;
margin-bottom: 15px;
} }
.contact-wrapper .contact-photo { .contact-wrapper .contact-photo {
width: 80px; width: 80px;
@ -1167,6 +1241,25 @@ ul.tabs li .active {
float: left; float: left;
margin: 0px 10px 10px 0px; margin: 0px 10px 10px 0px;
} }
/* profile match wrapper */
.profile-match-wrapper {
float: left;
width: 90px;
height: 90px;
margin-bottom: 20px;
}
.profile-match-wrapper .contact-photo {
width: 80px;
height: 80px;
}
.profile-match-wrapper .contact-photo img {
width: 80px;
height: 80px;
}
.profile-match-wrapper .contact-photo-menu-button {
left: 0px;
top: 63px;
}
/* page footer */ /* page footer */
footer { footer {
height: 100px; height: 100px;

4
view/wall_item.tpl
View file

@ -1,10 +1,10 @@
{{ if $indent }}{{ else }}
<div class="wall-item-decor"> <div class="wall-item-decor">
<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span> <span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }} {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
{{ endif }}
<div class="wall-item-container $indent"> <div class="wall-item-container $indent">
<div class="wall-item-item"> <div class="wall-item-item">
<div class="wall-item-info"> <div class="wall-item-info">

13
view/wallwall_item.tpl
View file

@ -1,18 +1,12 @@
{{ if $indent }}{{ else }}
<div class="wall-item-decor"> <div class="wall-item-decor">
<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span> <span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }} {{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
{{ endif }}
<div class="wall-item-container $indent"> <div class="wall-item-container $indent">
<div class="wall-item-item"> <div class="wall-item-item">
<div class="wall-item-info"> <div class="wall-item-info">
<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
<a href="$owner_url" target="redir" title="$olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$id">
<img src="$owner_photo" class="contact-photo $osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
</a>
</div>
<div class="contact-photo-wrapper mframe wwfrom" <div class="contact-photo-wrapper mframe wwfrom"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)"> onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
@ -25,6 +19,11 @@
</ul> </ul>
</div> </div>
<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
<a href="$owner_url" target="redir" title="$olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$id">
<img src="$owner_photo" class="contact-photo $osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
</a>
</div>
<div class="wall-item-location">$location</div> <div class="wall-item-location">$location</div>
</div> </div>
<div class="wall-item-content"> <div class="wall-item-content">