keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10 from duthied/master

Browse source 
UI work on testbubble theme + core tpl files
This commit is contained in:
Friendika 2011-09-30 00:56:24 -07:00
commit 30b7c68929
9 changed files with 55 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
view/admin_aside.tpl
View file

@ -12,26 +12,26 @@
</script> </script>
<h4><a href="$admurl">Admin</a></h4> <h4><a href="$admurl">Admin</a></h4>
<ul class='admin linklist'> <ul class='admin linklist'>
<li class='admin link $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li> <li class='admin link button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
<li class='admin link $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li> <li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
<li class='admin link $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li> <li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
</ul> </ul>
<ul class='admin linklist'> <ul class='admin linklist'>
<li class='admin link $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li> <li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
</ul> </ul>
{{ if $admin.plugins_admin }}<h4>Plugins</h4>{{ endif }} {{ if $admin.plugins_admin }}<h4>Plugins</h4>{{ endif }}
<ul class='admin linklist'> <ul class='admin linklist'>
{{ for $admin.plugins_admin as $l }} {{ for $admin.plugins_admin as $l }}
<li class='admin link $l.2'><a href='$l.0'>$l.1</a></li> <li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li>
{{ endfor }} {{ endfor }}
</ul> </ul>
<h4>Logs</h4> <h4>Logs</h4>
<ul class='admin linklist'> <ul class='admin linklist'>
<li class='admin link $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li> <li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
</ul> </ul>

3
view/group_drop.tpl
View file

@ -1,7 +1,6 @@
<div class="group-delete-wrapper" id="group-delete-wrapper-$id" > <div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
<a href="group/drop/$id" <a href="group/drop/$id"
onclick="return confirmDelete();" onclick="return confirmDelete();"
title="$delete"
id="group-delete-icon-$id" id="group-delete-icon-$id"
class="icon drophide group-delete-icon" class="icon drophide group-delete-icon"
onmouseover="imgbright(this);" onmouseover="imgbright(this);"

7
view/mail_conv.tpl
View file

@ -7,9 +7,8 @@
<div class="mail-conv-date">$date</div> <div class="mail-conv-date">$date</div>
<div class="mail-conv-subject">$subject</div> <div class="mail-conv-subject">$subject</div>
<div class="mail-conv-body">$body</div> <div class="mail-conv-body">$body</div>
</div> <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
<div class="mail-conv-outside-wrapper-end"></div>
</div>
</div> </div>
<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
<div class="mail-conv-outside-wrapper-end"></div>
<hr class="mail-conv-break" /> <hr class="mail-conv-break" />

4
view/mail_list.tpl
View file

@ -6,10 +6,10 @@
<div class="mail-list-sender-name" >$from_name</div> <div class="mail-list-sender-name" >$from_name</div>
<div class="mail-list-date">$date</div> <div class="mail-list-date">$date</div>
<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div> <div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
<a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list- delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div> </div>
</div> </div>
<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
<a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div> </div>
<div class="mail-list-delete-end"></div> <div class="mail-list-delete-end"></div>

2
view/photo_album.tpl
View file

@ -1,6 +1,6 @@
<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id"> <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle"> <a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo" id="photo-album-photo-$id" /> <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize" id="photo-album-photo-$id" />
<p class='caption'>$desc</p> <p class='caption'>$desc</p>
</a> </a>

3
view/prv_message.tpl
View file

@ -15,7 +15,7 @@ $select
<div id="prvmail-message-label">$yourmessage</div> <div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea>
</div>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="Submit" /> <input type="submit" id="prvmail-submit" name="submit" value="Submit" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
@ -29,5 +29,6 @@ $select
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>
</div>
</form> </form>
</div> </div>

4
view/settings_tabs.tpl
View file

@ -1,6 +1,6 @@
<div id="profile-tabs-wrapper" > <div id="profile-tabs-wrapper" >
<a href="$account.1" id="profile-tab-status-link" class="profile-tabs" >$account.0</a> <a href="$account.1" id="profile-tab-status-link" class="profile-tabs button" >$account.0</a>
<a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs" >$plugins.0</a> <a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs button" >$plugins.0</a>
<div id="profile-tabs-end"></div> <div id="profile-tabs-end"></div>
</div> </div>

6
view/theme/testbubble/mail_head.tpl
View file

@ -1,7 +1,7 @@
<h3>$messages</h3> <h3>$messages</h3>
<ul class="tabs-wrapper"> <ul class="tabs-wrapper">
<li><a href="message" class="tabs">$inbox</a></li> <li><a href="message" class="tabs button">$inbox</a></li>
<li><a href="message/sent" class="tabs">$outbox</a></li> <li><a href="message/sent" class="tabs button">$outbox</a></li>
<li><a href="message/new" class="tabs">$new</a></li> <li><a href="message/new" class="tabs button">$new</a></li>
</ul> </ul>

98
view/theme/testbubble/style.css
View file

@ -7,14 +7,11 @@
*/ */
/* ========== */ /* ========== */
/* = Colors /* = Colors
Red links - #b20202 Red links - #b20202
Red link hover - #db0503 Red link hover - #db0503
Red Gradients (buttons and other gradients) - #b20202 and #d60808 Red Gradients (buttons and other gradients) - #b20202 and #d60808
Grey/body text - #626262 Grey/body text - #626262
Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2 Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2
Dark Grey Gradients - #7c7d7b and #555753 Dark Grey Gradients - #7c7d7b and #555753
You can switch out the colors of the header, buttons and links by using a find and replace in your text editor. You can switch out the colors of the header, buttons and links by using a find and replace in your text editor.
@ -134,7 +131,7 @@ section {
.mframe { .mframe {
padding: 5px; padding: 5px;
background-color: #efefef; background-color: #efefef;
border: 2px dotted #eeeeee; border: 2px solid #dddddd;
-moz-box-shadow: 3px 3px 4px #959494; -moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494;
box-shadow: 3px 3px 4px #959494; box-shadow: 3px 3px 4px #959494;
@ -452,14 +449,10 @@ aside a{
font-variant:small-caps; font-variant:small-caps;
} }
.marital { .vcard dd {
font-size: 1em; font-size: 12px;
font-variant:small-caps; font-variant: normal;
} -webkit-margin-start: 10px;
.homepage-label {
font-size: 1em;
font-variant:small-caps;
} }
.vcard .fn { .vcard .fn {
@ -1304,7 +1297,11 @@ div[id$="wrapper"] br { clear: left; }
} }
.photo-top-photo, .photo-top-photo,
.photo-album-photo {} .photo-album-photo {
width: 180px;
height: 180px;
overflow: hidden;
}
.photo-top-album-name { .photo-top-album-name {
position: absolute; position: absolute;
@ -1587,16 +1584,15 @@ input#photo_edit_form {
font-size: 1em; font-size: 1em;
} }
#prvmail-submit-wrapper { margin-top: 10px; } #prvmail-submit-wrapper { margin-top: 10px; }
#prvmail-submit { #prvmail-submit {
float: right; float: right;
margin-top: 0px; margin-top: 0px;
margin-right: 90px; margin-right: 0px;
} }
#prvmail-upload { #prvmail-upload {
margin-left: 90px; margin-left: 0px;
} }
#prvmail-submit-wrapper > div { #prvmail-submit-wrapper > div {
@ -1637,7 +1633,7 @@ margin-left: 90px;
float: right; float: right;
clear: block; clear: block;
display: inline; display: inline;
font-size: 0.8em; font-size: 0.9em;
padding-left: 10px; padding-left: 10px;
font-stretch:ultra-condensed; font-stretch:ultra-condensed;
font-variant:small-caps; font-variant:small-caps;
@ -1654,11 +1650,15 @@ margin-left: 90px;
color: #626262; color: #626262;
} }
.mail-list-delete-wrapper { float: left; margin-right:550px; } .mail-list-delete-wrapper { float: right;}
.mail-list-outside-wrapper-end { .mail-list-outside-wrapper-end {
clear: both; clear: both;
} }
.mail-conv-outside-wrapper {
margin-bottom: 10px;
}
.mail-conv-sender {float: left; margin: 0px 5px 5px 0px; } .mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
.mail-conv-sender-photo { .mail-conv-sender-photo {
width: 64px; width: 64px;
@ -1675,13 +1675,20 @@ margin-left: 90px;
.mail-conv-detail { .mail-conv-detail {
width: 500px; width: 500px;
padding: 30px; padding: 30px;
padding-bottom: 10px;
margin-left: 20px; margin-left: 20px;
margin-bottom: 0px;
vertical-align: middle; vertical-align: middle;
margin: auto; margin: auto;
border: 1px solid #dddddd; border: 1px solid #dddddd;
} }
.mail-conv-break { display: none; border: none;} .mail-conv-break { display: none; border: none;}
.mail-conv-delete-wrapper { margin-top: 5px; width: 650px; text-align: right; } .mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; }
#prvmail-subject {
font-weight: bold;
border: none;
}
/* ================= */ /* ================= */
/* = Notifications = */ /* = Notifications = */
@ -2061,56 +2068,19 @@ margin-left: 90px;
padding-top: 10px; padding-top: 10px;
} }
#profile-tab-status-link:hover { #profile-tab-status-link {
border: 0px; border: 0px;
padding: 5px 10px 5px 10px; padding: 5px 10px 5px 10px;
font-style: bold; font-style: bold;
color: #efefef;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
}
#profile-tab-status-link:active {
border: 0px;
padding: 5px 10px 5px 10px;
font-style: bold;
background-color: #b20202;
position:relative;
top:1px;
}
#profile-tab-status-link a {
color: #efefef;
} }
#uexport-link a { #uexport-link a {
color: #efefef; color: #efefef;
} }
#profile-tab-profile-link:hover { #profile-tab-profile-link {
border: 0px; border: 0px;
padding: 5px 10px 5px 10px; padding: 5px 10px 5px 10px;
font-style: bold;
color: #efefef;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
}
#profile-tab-profile-link:active {
border: 0px;
padding: 5px 10px 5px 10px;
font-style: bold;
background-color: #b20202;
position:relative;
top:1px;
}
#profile-tab-profile-link a {
color: #efefef;
} }
#uexport-link { #uexport-link {
@ -2246,7 +2216,7 @@ margin-left: 90px;
display: inline; display: inline;
padding: 5px; padding: 5px;
margin-bottom: 10px; margin-bottom: 10px;
-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; /* -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
box-shadow:inset 0px 1px 0px 0px #cfcfcf; box-shadow:inset 0px 1px 0px 0px #cfcfcf;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
@ -2255,10 +2225,10 @@ margin-left: 90px;
background-color:#bdbdbd; background-color:#bdbdbd;
-moz-border-radius:5px; -moz-border-radius:5px;
-webkit-border-radius:5px; -webkit-border-radius:5px;
border-radius:5px; border-radius:5px;*/
} }
.group-delete-wrapper:hover { /*.group-delete-wrapper:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
@ -2275,7 +2245,7 @@ margin-left: 90px;
.group-delete-wrapper a { .group-delete-wrapper a {
color: #efefef; color: #efefef;
font-size: 0.9em; font-size: 0.9em;
} }*/
#group-edit-desc { margin: 10px 0xp; } #group-edit-desc { margin: 10px 0xp; }
#group-new-text {font-size: 1.1em;} #group-new-text {font-size: 1.1em;}
@ -2602,7 +2572,9 @@ tr {
.admin.link { .admin.link {
list-style-position: inside; list-style-position: inside;
font-size: 1em; font-size: 1em;
padding: 3px; padding: 5px;
width: 100px;
margin: 5px;
} }
#adminpage dl { #adminpage dl {