From: Michael Vogel Date: Sat, 15 Dec 2012 13:39:37 +0000 (+0100) Subject: vier: Added Delegations and optical changes. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d253d59668b52b4ef12383e14d83231ff4ac2939;p=friendica.git vier: Added Delegations and optical changes. --- diff --git a/include/nav.php b/include/nav.php index 3c058e04f6..d94bf03be1 100644 --- a/include/nav.php +++ b/include/nav.php @@ -44,14 +44,14 @@ function nav(&$a) { if(local_user()) { $nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); - + // user menu $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('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); $nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events')); $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - + // user info $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); $userinfo = array( @@ -130,11 +130,13 @@ function nav(&$a) { $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox')); $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox')); $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message')); - + if(is_array($a->identities) && count($a->identities) > 1) { $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')); if(feature_enabled(local_user(),'multi_profiles')) $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles')); diff --git a/view/theme/vier/nav.tpl b/view/theme/vier/nav.tpl index b2b6cc7855..f615be85f0 100644 --- a/view/theme/vier/nav.tpl +++ b/view/theme/vier/nav.tpl @@ -41,6 +41,7 @@ {{ if $nav.help }}
  • $nav.help.1
    • {{ endif }}
  • Info/Impressum
  • $nav.directory.1
    • + {{ if $nav.delegations }}
  • $nav.delegations.1
    • {{ endif }} {{ if $nav.settings }}
  • $nav.settings.1
    • {{ endif }} {{ if $nav.admin }}
  • $nav.admin.1
    • {{ endif }} @@ -74,7 +75,6 @@ {{ for $nav.usermenu as $usermenu }}
  • $usermenu.1
    • {{ endfor }} - {{ if $nav.notifications }}
  • $nav.notifications.1
    • {{ endif }} {{ if $nav.messages }}
  • $nav.messages.1
    • {{ endif }} {{ if $nav.contacts }}
  • $nav.contacts.1
    • {{ endif }} diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index f5e64ca478..f41b70bbbc 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -332,10 +332,10 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 14px; background-color: #ffffff; color: #2d2d2d; - margin: 50px 0px 0px 0px; + margin: 37px 0px 0px 0px; display: table; } h4 { @@ -345,7 +345,8 @@ h4 { a { /* color: #36C; */ /* color: #3e3e8c; */ - color: #3465A4; + /* color: #3465A4; */ + color: #3E3E8C; text-decoration: none; } a:hover { @@ -379,7 +380,8 @@ a:hover { .fakelink { /* color: #36c; */ /* color: #3e3e8c; */ - color: #3465A4; + /* color: #3465A4; */ + color: #3E3E8C; text-decoration: none; cursor: pointer; } @@ -580,7 +582,7 @@ nav .nav-menu { padding-left: 5px; padding-right: 5px; margin: 3px 3px 0px; - font-size: 13px; + font-size: 14px; border-bottom: 3px solid #364A84; } nav .nav-menu.selected { @@ -790,6 +792,8 @@ aside { width: 185px; padding: 0px 10px 0px 20px; border-right: 1px solid #D2D2D2; + background-color: #ECECF2; + font-size: 13px; /* background: #F1F1F1; */ } aside .vcard .fn { @@ -1006,7 +1010,7 @@ section { display: table-row; } .wall-item-bottom { - font-size: 13px; + font-size: 14px; } .wall-item-container .wall-item-bottom { opacity: 0.5; @@ -1045,10 +1049,10 @@ section { } .wall-item-container .wall-item-content { - font-size: 13px; + font-size: 14px; max-width: 660px; word-wrap: break-word; - line-height: 1.4; + line-height: 1.36; } .wall-item-container .wall-item-content img { @@ -1620,15 +1624,51 @@ section { ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 13px; + font-size: 14px; } ul.tabs li { float: left; margin-left: 7px; } -ul.tabs li .active { +/*ul.tabs li .active { 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 */ diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 97199723ea..5e483c5adc 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -12,7 +12,7 @@ $a->theme_info = array(); function vier_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; }