aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rwxr-xr-xview/admin_plugins_details.tpl9
-rwxr-xr-xview/admin_summary.tpl2
-rwxr-xr-xview/nets.tpl2
-rwxr-xr-xview/settings.tpl4
-rwxr-xr-xview/theme/darkzero/style.css3
-rwxr-xr-xview/theme/darkzero/theme.php2
-rw-r--r--view/theme/diabook/icons/community.pngbin0 -> 475 bytes
-rw-r--r--view/theme/diabook/icons/dislike.pngbin385 -> 386 bytes
-rw-r--r--view/theme/diabook/icons/ftdevs.gifbin0 -> 1188 bytes
-rw-r--r--[-rwxr-xr-x]view/theme/diabook/icons/globe.pngbin875 -> 1361 bytes
-rw-r--r--view/theme/diabook/icons/language.pngbin0 -> 849 bytes
-rw-r--r--view/theme/diabook/icons/like.pngbin393 -> 388 bytes
-rwxr-xr-xview/theme/diabook/icons/scroll_top.pngbin0 -> 296 bytes
-rw-r--r--view/theme/diabook/nav.tpl41
-rw-r--r--view/theme/diabook/style.css45
-rw-r--r--view/theme/dispy/style.css138
-rwxr-xr-xview/theme/duepuntozero/style.css2
-rw-r--r--view/theme/quattro/theme.php46
-rw-r--r--view/theme/quattro/theme_settings.tpl11
-rwxr-xr-xview/theme/testbubble/nav.tpl5
-rwxr-xr-xview/theme/testbubble/style.css61
21 files changed, 238 insertions, 133 deletions
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
index d7147b20b..ead356f5b 100755
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -4,13 +4,18 @@
<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t">$action</a></p>
<p>$info.description</p>
- <p class="author">
+ <p class="author">$str_author
{{ for $info.author as $a }}
{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
{{ endfor }}
</p>
-
+ <p class="maintainer">$str_maintainer
+ {{ for $info.maintainer as $a }}
+ {{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
+ {{ endfor }}
+ </p>
+
{{ if $admin_form }}
<h3>$settings</h3>
<form method="post" action="$baseurl/admin/$function/$plugin/">
diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl
index 59428986a..eed71fbe0 100755
--- a/view/admin_summary.tpl
+++ b/view/admin_summary.tpl
@@ -13,7 +13,7 @@
{{ for $accounts as $p }}
<dl>
<dt>$p.0</dt>
- <dd>$p.1</dd>
+ <dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd>
</dl>
{{ endfor }}
diff --git a/view/nets.tpl b/view/nets.tpl
index 0953e66a6..cbadf1361 100755
--- a/view/nets.tpl
+++ b/view/nets.tpl
@@ -5,7 +5,7 @@
<ul class="nets-ul">
<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
{{ for $nets as $net }}
- <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link">$net.name</a></li>
+ <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
{{ endfor }}
</ul>
diff --git a/view/settings.tpl b/view/settings.tpl
index 1172df8b9..b7f427b32 100755
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -60,9 +60,9 @@ $suggestme
{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
<div class="field input">
- <span class="field_help"><a href="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+ <span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
<div style="display: none;">
- <div id="advaced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+ <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
<h3>$expire.advanced</h3>
{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index fa0e254c7..3b395ff2a 100755
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -24,7 +24,8 @@ nav #banner #logo-text a { color: #ffffff; }
.wall-item-content-wrapper { border: 1px solid #444444; }
.wall-item-tools { background-color: #444444; background-image: none;}
-.comment-edit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-edit-preview{ color: #000000; }
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
.photo-top-album-name{ background-color: #333333; }
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 37632c4b5..839d862a1 100755
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -4,6 +4,8 @@
* Name: Darkzero
* Version: 1.0
* Author: Fabio Communi <fabrix.xm@gmail.com>
+ * Maintainer: Fabio Communi <fabrix.xm@gmail.com>
+ * Maintainer: Mike Macgirvin <mike@macgirvin.com>
*/
$a->theme_info = array(
diff --git a/view/theme/diabook/icons/community.png b/view/theme/diabook/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook/icons/community.png
Binary files differ
diff --git a/view/theme/diabook/icons/dislike.png b/view/theme/diabook/icons/dislike.png
index fcf340258..23de426c5 100644
--- a/view/theme/diabook/icons/dislike.png
+++ b/view/theme/diabook/icons/dislike.png
Binary files differ
diff --git a/view/theme/diabook/icons/ftdevs.gif b/view/theme/diabook/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook/icons/ftdevs.gif
Binary files differ
diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png
index bf27a8f3f..6bb9bc09d 100755..100644
--- a/view/theme/diabook/icons/globe.png
+++ b/view/theme/diabook/icons/globe.png
Binary files differ
diff --git a/view/theme/diabook/icons/language.png b/view/theme/diabook/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook/icons/language.png
Binary files differ
diff --git a/view/theme/diabook/icons/like.png b/view/theme/diabook/icons/like.png
index c9543afd5..b65edccc0 100644
--- a/view/theme/diabook/icons/like.png
+++ b/view/theme/diabook/icons/like.png
Binary files differ
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
new file mode 100755
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 34a37ad2e..a77f4ce04 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -1,6 +1,7 @@
<header>
- {# $langselector version 0.01#}
-
+
+
+
<div id="site-location">$sitelocation</div>
<div id="banner">$banner</div>
</header>
@@ -24,7 +25,7 @@
<span class="icon contacts">$nav.contacts.1</span></a>
<span id="intro-update" class="nav-notify"></span>
<ul id="nav-contacts-menu" class="menu-popup">
- <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">Kontaktanfragen</a><span id="intro-update" class="nav-notify"></span></li>
+ <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@@ -37,9 +38,9 @@
<span id="mail-update" class="nav-notify"></span>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
- <li id="nav-messages-inbox"><a href="$nav.messages.0">Eingang</a></li>
- <li id="nav-messages-outbox"><a href="message/sent">Ausgang</a></li>
- <li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
</li>
{{ endif }}
@@ -53,7 +54,15 @@
<li class="empty">$emptynotifications</li>
</ul>
</li>
- {{ endif }}
+ {{ endif }}
+
+ {{ if $nav.search}}
+ <li id="search-box">
+ <form method="get" action="$nav.search.0">
+ <input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+ </form>
+ </li>
+ {{ endif }}
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
<ul id="nav-site-menu" class="menu-popup">
@@ -61,7 +70,13 @@
{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
- <li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+
+ <li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+
+
+ <li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+
+ <li><a class="$nav.search.2" href="friendica" title="About" >About</a></li>
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
@@ -121,14 +136,22 @@
</ul>
+
+
</nav>
<ul id="nav-notifications-template" style="display:none;" rel="template">
- <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+ <li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+ <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
{#
{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 06ddf6de1..fe1d3d882 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -91,6 +91,8 @@
background-image: url("../../../view/theme/diabook/icons/notify.png");}
.icon.messages {
background-image: url("../../../view/theme/diabook/icons/messages.png");}
+.icon.community {
+ background-image: url("../../../view/theme/diabook/icons/community.png");}
.icon.drop { background-image: url("../../../view/theme/diabook/icons/drop.png");}
.icon.drophide { background-image: url("../../../view/theme/diabook/icons/drop.png");}
@@ -106,6 +108,7 @@
.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");}
.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");}
.icon.isstar { background-image: url("../../../view/theme/diabook/icons/isstar.png");}
+.icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");}
.camera { background-image: url("../../../view/theme/diabook/icons/camera.png");
@@ -170,7 +173,7 @@
.youtube { background-position: -130px -40px;}
/*.attach { background-position: -190px -40px;}*/
-.language { background-position: -210px -40px;}
+/*.language { background-position: -210px -40px;}*/
.icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
@@ -526,7 +529,7 @@ header #banner a:hover {
color: #ffffff;
text-decoration: none;
outline: none;
- vertical-align: bottom;
+ vertical-align: middle;
}
header #banner #logo-img {
height: 25px;
@@ -610,12 +613,20 @@ nav #logo-text {
margin-top: 3px;
margin-right: 15px;
}
+nav .nav-menu-search {
+ position: relative;
+
+ margin: 3px 17px;
+ margin-right: 0px;
+ height: 17px;
+ width: 205px;
+}
nav .nav-menu-icon {
position: relative;
height: 22px;
padding: 5px;
- margin: 0px 12px;
+ margin: 0px 7px;
-moz-border-radius: 5px 5px 0 0;
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
@@ -846,7 +857,7 @@ aside {
/* background: #F1F1F1; */
}
aside .vcard .fn {
- font-size: 16px;
+ font-size: 18px;
font-weight: bold;
margin-bottom: 5px;
}
@@ -1181,6 +1192,7 @@ section {
color: #999999;
border: 1px solid #DDD;
padding: 0.3em;
+ font-size: 14px;
}
.wall-item-comment-wrapper .comment-edit-text-full {
font-size: 14px;
@@ -1329,9 +1341,9 @@ section {
margin: 0px 2em 20px 0px;
}
#profile-jot-form #profile-jot-text {
- height: 3.0em;
+ height: 2.0em;
width: 99%;
- font-size: 10px;
+ font-size: 15px;
color: #999999;
border: 1px solid #DDD;
padding: 0.3em;
@@ -1416,12 +1428,13 @@ section {
margin-top: 10px;
}
#profile-jot-form #jot-title {
- border: 0px;
- margin: 0px;
- height: 20px;
- width: 700px;
- font-weight: bold;
- border: 1px solid #ffffff;
+
+ border-radius: 5px 5px 5px 5px;
+ font-weight: bold;
+ height: 20px;
+ margin: 0 0 5px;
+ width: 60%;
+ border: 1px solid #ffffff;
}
#profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal;
@@ -1528,6 +1541,7 @@ section {
float: right;
margin-left: 10px;
margin-top: 2px;
+ font-size: 10px;
}
#profile-jot-perms{
float: right;
@@ -1871,7 +1885,12 @@ blockquote {
padding-left: 9px;
margin: 0 0 0 .8ex;
}
-
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+ color: #666666;
+ margin: 15px 0 5px;
+ padding-left: 5px;
+ }
/* ================== */
/* = Contacts Block = */
/* ================== */
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 177b03f4f..671d9652b 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -24,9 +24,9 @@ audio:not([controls]) {
display: none;
}
-/* =============================================================================
- Base
- ========================================================================== */
+/*
+ * Base
+ */
/*
* 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
@@ -177,14 +177,14 @@ input[type=submit] {
padding: 1em;
}
.pager {
- padding-top: 30px;
+ margin-top: 60px;
display: block;
clear: both;
text-align: center;
}
.pager span {
padding: 4px;
- margin:4px;
+ margin: 4px;
}
.pager_current {
background-color: #729fcf;
@@ -613,25 +613,33 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
aside {
position: absolute;
right: 15px;
- width: 255px;
+ width: 230px;
font-size: smaller;
}
.vcard .fn {
font-size: 1.7em;
- font-weight: 700;
+ font-weight: bold;
border-bottom: 1px solid #729fcf;
- padding-top: 1px;
+ padding-bottom: 3px;
}
.vcard #profile-photo-wrapper {
- margin: 10px 0px;
+ margin: 20px;
+}
+.vcard #profile-photo-wrapper img {
+ box-shadow: 3px 3px 10px 0;
}
aside h4 {
font-size: 1.2em;
}
-
aside #viewcontacts {
text-align: right;
}
+.aprofile dt {
+ box-shadow: 1px 1px 5px 0;
+ color: #666666;
+ margin: 15px 0 5px;
+ padding-left: 5px;
+}
#profile-extra-links ul {
margin-left: 0px;
padding-left: 0px;
@@ -750,34 +758,27 @@ aside #viewcontacts {
}
#jot #jot-title {
border: 0px;
- margin: 0px;
+ margin: 0 0 5px;
height: 20px;
- width: 100%;
+ width: 90%;
font-weight: bold;
- border: 1px solid #ffffff;
border-radius: 5px;
-}
-#jot #jot-title:-webkit-input-placeholder {
- font-weight: normal;
-}
-#jot #jot-title:-moz-placeholder {
- font-weight: normal;
-}
-#jot #jot-title:placeholder {
- font-weight: normal;
+ vertical-align: middle;
+ padding: 5px 1px;
}
#jot #jot-title:hover,
#jot #jot-title:focus {
- border: 1px solid #999999;
+ border: 1px solid #999;
border-radius: 5px;
}
#jot #character-counter {
- width: 80px;
+ width: 40px;
float: right;
text-align: right;
height: 20px;
line-height: 20px;
- padding-right: 20px;
+ padding: 5px;
+ margin: 0 0 5px;
}
#profile-jot-text_tbl {
margin-bottom: 10px;
@@ -796,10 +797,6 @@ aside #viewcontacts {
float: left;
margin-left: 10px;
}
-#character-counter {
- float:right;
- padding:8px 10px;
-}
#profile-rotator-wrapper {
float: right;
}
@@ -959,7 +956,7 @@ aside #viewcontacts {
section {
margin: 20px 6% 0 4%;
font-size: 0.8em;
- padding-right: 250px;
+ padding-right: 220px;
min-width: 475px;
}
@@ -1005,7 +1002,6 @@ section {
.wall-item-content-wrapper {
position: relative;
padding: 10px;
- overflow-x: auto;
width: auto;
}
.wall-item-outside-wrapper .wall-item-comment-wrapper {
@@ -1110,9 +1106,9 @@ section {
clear:both;
}
.wall-item-location {
- margin-top: 5px;
+ margin-top: 10px;
width: 100px;
- overflow:hidden;
+ overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
@@ -1133,14 +1129,14 @@ section {
display: none;
}
.wallwall .wwto {
- left:-10px;
+ left: 5px;
margin: 0;
- position:absolute;
- top:65px;
+ position: absolute;
+ top: 75px;
width: 30px;
- z-index:10001;
- width:30px;
- height:30px;
+ z-index: 10001;
+ width: 30px;
+ height: 30px;
}
.wallwall .wwto img {
width: 30px !important;
@@ -1151,8 +1147,8 @@ section {
}
.wall-item-arrowphoto-wrapper {
position: absolute;
- left: 20px;
- top: 70px;
+ left: 35px;
+ top: 80px;
z-index: 10002;
}
.wall-item-photo-menu {
@@ -1556,10 +1552,11 @@ div[id$="wrapper"] br {
.view-contact-wrapper,
.contact-entry-wrapper {
float: left;
- margin-right: 20px;
- margin-bottom: 20px;
+ margin-right: 5px;
+ margin-bottom: 40px;
width: 120px;
- /*height: 120px;*/
+ height: 120px;
+ padding: 3px;
position: relative;
}
.contact-direction-wrapper {
@@ -1703,13 +1700,15 @@ div[id$="wrapper"] br {
}
#settings-nickname-desc {
- background-color:#DDEFFF;
- -webkit-border-radius:5px;
- -moz-border-radius:5px;
- border-radius:5px;
- padding:5px;
+ background-color: #eee;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding: 5px;
+}
+#settings-default-perms {
+ margin-bottom: 20px;
}
-
#register-form div,
#profile-edit-form div {
clear: both;
@@ -1732,11 +1731,11 @@ div[id$="wrapper"] br {
margin: 30px 0px;
}
.profile-edit-side-div {
- margin-top: 10px;
+ margin-top: 0px;
}
.profile-edit-side-link {
float: right;
- margin: 10px 20px -16px 0;
+ margin: 0px 20px -18px 0;
}
.profile-listing {
float: left;
@@ -2112,17 +2111,16 @@ div[id$="wrapper"] br {
display: block;
font-size: 1.077em;
/*font-weight: bold;*/
- margin-bottom: 0.2em;
- margin: 0 10px 0.2em 0;
+ margin: 0 10px 0.5em 0;
border: 1px #999 solid;
padding: 5px;
- background: #f2eedf;
+ background: #eee;
vertical-align: middle;
}
.field input {
width: 250px;
height: 25px;
- border: 1px #666 solid;
+ border: 1px #999 solid;
}
.field textarea {
width: 80%;
@@ -2132,7 +2130,7 @@ div[id$="wrapper"] br {
}
.field_help {
display: block;
- margin-left: 0px;
+ margin-left: 297px;
color: #666;
}
.field .onoff {
@@ -2142,32 +2140,26 @@ div[id$="wrapper"] br {
.field .onoff a {
display: block;
border: 1px solid #666;
- background: url("../../../images/onoff.jpg") no-repeat;
- padding: 4px 2px 2px;
+ padding: 3px 6px 4px 10px;
height: 16px;
text-decoration: none;
}
-.field .onoff .off {
- border-color: #666;
- padding-left: 40px;
- background: #ccc left center;
- color: #666;
- text-align:right;
-}
.field .onoff .on {
- border-color:#204a87;
- padding-right:40px;
- background-position:right center;
- background-color:#3465A4;
- color:#fff;
- text-align:left;
+ background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+ color: #111;
+ text-align: left;
+}
+.field .onoff .off {
+ background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+ color: #333;
+ text-align: right;
}
.hidden {
display:none !important;
}
.field.radio .field_help {
- margin-left:0;
+ margin-left: 0;
}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 938fbe471..acd97eb94 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -3036,4 +3036,4 @@ ul.menu-popup {
.notify-seen {
background: #DDDDDD;
-} \ No newline at end of file
+}
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
new file mode 100644
index 000000000..7e5ab1e62
--- /dev/null
+++ b/view/theme/quattro/theme.php
@@ -0,0 +1,46 @@
+<?php
+
+$a->hooks[] = array('plugin_settings', 'view/theme/quattro/theme.php', 'quattro_settings');
+$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro/theme.php', 'quattro_settings_post');
+
+
+function quattro_settings(&$a, &$o){
+ if(!local_user())
+ return;
+
+ $align = get_pconfig(local_user(), 'quattro', 'align' );
+
+ $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+ $o .= replace_macros($t, array(
+ '$submit' => t('Submit'),
+ '$baseurl' => $a->get_baseurl(),
+ '$title' => t("Theme settings"),
+ '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
+ ));
+}
+
+function quattro_settings_post(&$a){
+ if(! local_user())
+ return;
+ if (isset($_POST['quattro-settings-submit'])){
+ set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
+ }
+ goaway($a->get_baseurl()."/settings/addon");
+}
+
+
+$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
+
+if(local_user() && $quattro_align=="center"){
+
+ $a->page['htmlhead'].="
+ <style>
+ html { width: 100%; margin:0px; padding:0px; }
+ body {
+ margin: 50px auto;
+ width: 900px;
+ }
+ </style>
+ ";
+
+}
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
new file mode 100644
index 000000000..25af04253
--- /dev/null
+++ b/view/theme/quattro/theme_settings.tpl
@@ -0,0 +1,11 @@
+<div class="settings-block">
+ <h3 class="settings-heading">$title</h3>
+
+ {{inc field_select.tpl with $field=$align}}{{endinc}}
+
+ <div class="settings-submit-wrapper">
+ <input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
+ </div>
+
+
+</div>
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index e515b547c..43cc7bca0 100755
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -58,6 +58,9 @@
</div>
</nav>
+
<ul id="nav-notifications-template" style="display:none;" rel="template">
- <li><a href="{0}">{2} <span class="notif-when">{3}</span></a></li>
+ <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
</ul>
+
+
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 11a639713..1e63c7ef6 100755
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -55,7 +55,7 @@ p {
}
label {
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
li {
@@ -455,7 +455,7 @@ aside a{
.vcard {
font-size: 1em;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
.vcard dd {
@@ -488,7 +488,7 @@ aside h4 { font-size: 1.3em; }
color: #626262;
text-align: center;
font-weight: bold;
- font-variant:small-caps;
+/* font-variant:small-caps; */
font-size: 1.1em;
}
.allcontact-link a {
@@ -1041,7 +1041,7 @@ profile-jot-banner-wrapper {
font-size: 0.9em;
margin: 4px 0px 0px 140px;
padding-left: 10px;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
.wall-item-author a {
@@ -1063,7 +1063,7 @@ profile-jot-banner-wrapper {
margin-left: 25px;
font-size: 0.9em;
display: block;
- font-variant:small-caps;
+/* font-variant:small-caps; */
color: #898989;
}
@@ -1072,7 +1072,7 @@ profile-jot-banner-wrapper {
.wall-item-conv a{
font-size: 0.9em;
color: #898989;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
.wallwall .wwto {
@@ -1157,7 +1157,7 @@ profile-jot-banner-wrapper {
font-size: 0.9em;
color: #898989;
margin-left: 60px;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
.wall-item-outside-wrapper.comment { margin-left: 70px; }
@@ -1189,7 +1189,7 @@ profile-jot-banner-wrapper {
.icollapse-wrapper {
font-size: 0.9em;
color: #898989;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
.comment-wwedit-wrapper,
@@ -1266,7 +1266,7 @@ profile-jot-banner-wrapper {
margin-bottom: 0px;
padding-bottom: 5px;
font-size: 18px;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
div[id$="wrapper"] { height: 100%;}
@@ -1298,7 +1298,7 @@ div[id$="wrapper"] br { clear: left; }
.profile-listing-name {
font-size: 1em;
- font-variant: small-caps;
+/* font-variant: small-caps;*/
}
.profile-listing-name a {
color: #898989;
@@ -1342,7 +1342,7 @@ div[id$="wrapper"] br { clear: left; }
.profile-match-name a{
color: #999;
- font-variant: small-caps;
+/* font-variant: small-caps; */
font-size: 1em;
}
@@ -1462,7 +1462,7 @@ div[id$="wrapper"] br { clear: left; }
padding: 0px 5px;
font-weight: bold;
font-stretch:semi-expanded;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
.photo-top-album-name a{
@@ -1476,7 +1476,7 @@ div[id$="wrapper"] br { clear: left; }
text-align: center;
color: #6e6e6e;
font-size: 0.9em;
- font-variant: small-caps;
+/* font-variant: small-caps; */
}
#photo-photo{
@@ -1487,7 +1487,7 @@ div[id$="wrapper"] br { clear: left; }
#photo-caption {
margin-top: 10px;
color: #6E6E6E;
- font-variant:small-caps;
+/* font-variant:small-caps; */
font-size: 1.1em;
}
@@ -1712,18 +1712,18 @@ input#photo_edit_form {
}
#prvmail-subject-label {
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
#prvmail-to {
padding-left: 10px;
}
#prvmail-to-label {
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
#prvmail-message-label {
- font-variant:small-caps;
+/* font-variant:small-caps; */
font-size: 1em;
}
@@ -1769,7 +1769,7 @@ margin-left: 0px;
.mail-list-sender-name {
font-size: 1.1em;
display: inline;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
.mail-list-date {
@@ -1779,7 +1779,7 @@ margin-left: 0px;
font-size: 0.9em;
padding-left: 10px;
font-stretch:ultra-condensed;
- font-variant:small-caps;
+/* font-variant:small-caps; */
}
.mail-list-subject {
@@ -1808,8 +1808,8 @@ margin-left: 0px;
height: 64px;
}
-.mail-conv-sender-name { float: left; font-variant:small-caps; font-style: bold; }
-.mail-conv-date { float: right; font-variant:small-caps; }
+.mail-conv-sender-name { float: left; font-style: bold; }
+.mail-conv-date { float: right; }
.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
.mail-conv-body {
clear: both;
@@ -1903,7 +1903,7 @@ margin-left: 0px;
font: #999;
font-size: 12px;
text-align:center;
- font-variant:small-caps;
+/* font-variant:small-caps; */
font-weight: bold;
margin-top:5px;
}
@@ -1920,7 +1920,7 @@ margin-left: 0px;
background-color: #ffffff;
}
-#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; font-variant: small-caps; }
+#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; }
#contact-edit-update-now {
@@ -2003,7 +2003,7 @@ margin-left: 0px;
}
.view-contact-name {
- font-variant: small-caps;
+/* font-variant: small-caps; */
}
#div.side-link {
@@ -2540,7 +2540,7 @@ margin-left: 0px;
margin-bottom: 2px;
margin-top: 2px;
font-size: 0.9em;
- font-variant: small-caps;
+/* font-variant: small-caps; */
text-align: left;
}
@@ -2606,7 +2606,7 @@ margin-left: 0px;
.event-list-date {
color: #626262;
margin-bottom: 10px;
- font-variant:small-caps;
+/* font-variant:small-caps; */
font-stretch:condensed;
}
@@ -2642,7 +2642,7 @@ margin-left: 0px;
color: #ffffff;
font-weight: bold;
text-align:center;
- font-variant:small-caps;
+/* font-variant:small-caps; */
-moz-box-shadow: 5px 2px 8px #959494;
-webkit-box-shadow: 5px 2px 8px #959494;
box-shadow: 5px 2px 8px #959494;
@@ -2720,13 +2720,13 @@ tr {
.directory-details {
font-size: 0.9em;
- font-variant: small-caps;
+/* font-variant: small-caps; */
width: 160px;
}
.directory-name {
font-size: 1em;
- font-variant: small-caps;
+/* font-variant: small-caps; */
width: 150px;
}
@@ -3277,3 +3277,6 @@ ul.menu-popup {
opacity: 1.0;
filter:alpha(opacity=100);
}
+.notify-seen {
+ background: #000;
+}