Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

vier: Added Delegations and optical changes.

Browse source
This commit is contained in:
Michael Vogel 2012-12-15 14:39:37 +01:00
parent a61ac769a0
commit d253d59668
4 changed files with 60 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/nav.php
View file

@ -44,14 +44,14 @@ function nav(&$a) {
if(local_user()) { if(local_user()) {
$nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); $nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
// user menu // user menu
$nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations')); $nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations'));
$nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); $nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
$nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); $nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
$nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events')); $nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events'));
$nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
// user info // user info
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
$userinfo = array( $userinfo = array(
@ -130,11 +130,13 @@ function nav(&$a) {
$nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox')); $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
$nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox')); $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
$nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message')); $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
if(is_array($a->identities) && count($a->identities) > 1) { if(is_array($a->identities) && count($a->identities) > 1) {
$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages')); $nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
} }
$nav['delegations'] = Array('delegate', t('Delegations'), "", t('Delegate Page Management'));
$nav['settings'] = array('settings', t('Settings'),"", t('Account settings')); $nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
if(feature_enabled(local_user(),'multi_profiles')) if(feature_enabled(local_user(),'multi_profiles'))
$nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles')); $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles'));

2
view/theme/vier/nav.tpl
View file

@ -41,6 +41,7 @@
{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }} {{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li> <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
<li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a></li> <li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a></li>
{{ if $nav.delegations }}<li><a class="$nav.delegations.2" href="$nav.delegations.0" title="$nav.delegations.3">$nav.delegations.1</a></li>{{ endif }}
{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} {{ if $nav.settings }}<li><a class="$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 }} {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
@ -74,7 +75,6 @@
{{ for $nav.usermenu as $usermenu }} {{ for $nav.usermenu as $usermenu }}
<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li> <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
{{ endfor }} {{ endfor }}
{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }} {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}

60
view/theme/vier/style.css
View file

@ -332,10 +332,10 @@
/* global */ /* global */
body { body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 14px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
margin: 50px 0px 0px 0px; margin: 37px 0px 0px 0px;
display: table; display: table;
} }
h4 { h4 {
@ -345,7 +345,8 @@ h4 {
a { a {
/* color: #36C; */ /* color: #36C; */
/* color: #3e3e8c; */ /* color: #3e3e8c; */
color: #3465A4; /* color: #3465A4; */
color: #3E3E8C;
text-decoration: none; text-decoration: none;
} }
a:hover { a:hover {
@ -379,7 +380,8 @@ a:hover {
.fakelink { .fakelink {
/* color: #36c; */ /* color: #36c; */
/* color: #3e3e8c; */ /* color: #3e3e8c; */
color: #3465A4; /* color: #3465A4; */
color: #3E3E8C;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
@ -580,7 +582,7 @@ nav .nav-menu {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
margin: 3px 3px 0px; margin: 3px 3px 0px;
font-size: 13px; font-size: 14px;
border-bottom: 3px solid #364A84; border-bottom: 3px solid #364A84;
} }
nav .nav-menu.selected { nav .nav-menu.selected {
@ -790,6 +792,8 @@ aside {
width: 185px; width: 185px;
padding: 0px 10px 0px 20px; padding: 0px 10px 0px 20px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
background-color: #ECECF2;
font-size: 13px;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside .vcard .fn { aside .vcard .fn {
@ -1006,7 +1010,7 @@ section {
display: table-row; display: table-row;
} }
.wall-item-bottom { .wall-item-bottom {
font-size: 13px; font-size: 14px;
} }
.wall-item-container .wall-item-bottom { .wall-item-container .wall-item-bottom {
opacity: 0.5; opacity: 0.5;
@ -1045,10 +1049,10 @@ section {
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 13px; font-size: 14px;
max-width: 660px; max-width: 660px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.4; line-height: 1.36;
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
@ -1620,15 +1624,51 @@ section {
ul.tabs { ul.tabs {
list-style-type: none; list-style-type: none;
padding-bottom: 10px; padding-bottom: 10px;
font-size: 13px; font-size: 14px;
} }
ul.tabs li { ul.tabs li {
float: left; float: left;
margin-left: 7px; margin-left: 7px;
} }
ul.tabs li .active { /*ul.tabs li .active {
border-bottom: 1px solid #005c94; border-bottom: 1px solid #005c94;
}*/
ul.tabs a {
display: block;
float: left;
padding: 0px 10px 1px 10px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
border: 1px solid #ECECF2;
font-weight: bold;
line-height: 1.4em;
color: #3e3e8c;
text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
background: #ececf2;
background: -moz-linear-gradient(top, #ffffff 0%, #ececf2 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ececf2));
background: -webkit-linear-gradient(top, #ffffff 0%,#ececf2 100%);
background: -o-linear-gradient(top, #ffffff 0%,#ececf2 100%);
background: -ms-linear-gradient(top, #ffffff 0%,#ececf2 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ececf2',GradientType=0 );
background: linear-gradient(top, #ffffff 0%,#ececf2 100%);
} }
ul.tabs li .active, ul.tabs a:hover {
color: #fff;
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
border: 1px solid #ececf2;
background: #364a84;
background: -moz-linear-gradient(top, #7b8dbb 0%, #364a84 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
background: -webkit-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
background: -o-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
background: -ms-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);
text-decoration: none;
}
/** /**
* Form fields * Form fields
*/ */

7
view/theme/vier/theme.php
View file

@ -12,7 +12,7 @@ $a->theme_info = array();
function vier_init(&$a) { function vier_init(&$a) {
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script>
function insertFormatting(comment,BBcode,id) { /*function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) { if(tmpStr == comment) {
@ -41,6 +41,7 @@ function insertFormatting(comment,BBcode,id) {
} }
return true; return true;
} }
*/
function showThread(id) { function showThread(id) {
$("#collapsed-comments-" + id).show() $("#collapsed-comments-" + id).show()
@ -51,7 +52,7 @@ function hideThread(id) {
$("#collapsed-comments-" + id + " .collapsed-comments").hide() $("#collapsed-comments-" + id + " .collapsed-comments").hide()
} }
/*
function cmtBbOpen(id) { function cmtBbOpen(id) {
$("#comment-edit-bb-" + id).show(); $("#comment-edit-bb-" + id).show();
} }
@ -99,7 +100,7 @@ $('.savedsearchterm').hover(
}); });
*/
</script> </script>
EOT; EOT;
} }