New common tab template. Update css

diff --git a/boot.php b/boot.php
index c8ec846810865eab338f174004d8dfb1fa0a25f3..d4e9ed0d63a1d473259089f6e0b2505be3771015 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1161,3 +1161,47 @@ function load_contact_links($uid) {
        return;         
 }}
 
+if(! function_exists('profile_tabs')){
+function profile_tabs($a, $is_owner=False){
+       //echo "<pre>"; var_dump($a->user); killme();
+       
+               
+       if(x($_GET,'tab'))
+               $tab = notags(trim($_GET['tab']));
+       
+       $url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+
+       $tabs = array(
+               array(
+                       'label'=>t('Status'),
+                       'url' => $url,
+                       'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
+               ),
+               array(
+                       'label' => t('Profile'),
+                       'url'   => $url.'/?tab=profile',
+                       'sel'   => (($tab=='profile')?'active':''),
+               ),
+               array(
+                       'label' => t('Photos'),
+                       'url'   => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
+                       'sel'   => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
+               ),
+       );
+       
+       if ($is_owner){
+                $tabs[] = array(
+                       'label' => t('Events'),
+                       'url'   => $a->get_baseurl() . '/events',
+                       'sel'   =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
+               );
+               $tabs[] = array(
+                       'label' => t('Personal Notes'),
+                       'url'   => $a->get_baseurl() . '/notes',
+                       'sel'   =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
+               );
+       }
+
+       $tpl = get_markup_template('common_tabs.tpl');
+       return replace_macros($tpl,array('$tabs'=>$tabs));
+}}     

diff --git a/mod/events.php b/mod/events.php
index 5bc9807ed7b60e9f33c69f8ab351f8c9a0dcf697..fb68d53dbc020593ca5cdd282a85735af0a165f6 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -112,17 +112,7 @@ function events_content(&$a) {
 
        $o ="";
        // tabs
-       $tpl = get_markup_template('profile_tabs.tpl');
-       $o .= replace_macros($tpl,array(
-               '$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
-               '$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
-               '$status' => t('Status'),
-               '$profile' => t('Profile'),
-               '$photos' => t('Photos'),
-               '$events' => t('Events') ,
-               '$notes' => t('Personal Notes'),
-               '$activetab' => "events",
-       ));     
+       $o .= profile_tabs($a, True);   
 
        $o .= '<h2>' . t('Events') . '</h2>';
 

diff --git a/mod/network.php b/mod/network.php
index f0e9e4441cfe5d3739d5962685aef42098ed253f..9b7c4e6112778dffae3435133b6f26ab5290af26 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -42,66 +42,7 @@ function network_init(&$a) {
                );
        }
 
-       // item filter tabs
-       // TODO: fix this logic, reduce duplication
-       $a->page['content'] .= '<div class="tabs-wrapper">';
-       
-       $starred_active = '';
-       $new_active = '';
-       $bookmarked_active = '';
-       $all_active = '';
-       $search_active = '';
-       
-       if(($a->argc > 1 && $a->argv[1] === 'new') 
-               || ($a->argc > 2 && $a->argv[2] === 'new')) {
-                       $new_active = 'active';
-       }
-       
-       if(x($_GET,'search')) {
-               $search_active = 'active';
-       }
-       
-       if(x($_GET,'star')) {
-               $starred_active = 'active';
-       }
-       
-       if($_GET['bmark']) {
-               $bookmarked_active = 'active';
-       }
-       
-       if (($new_active == '') 
-               && ($starred_active == '') 
-               && ($bookmarked_active == '')
-               && ($search_active == '')) {
-                       $all_active = 'active';
-       }
-       
-       // network links moved to content to match other pages
-       // all
-       // added 'button' class for easier styling - not the best place for it, should be moved into the tpl like profile_tabs.tpl
-       // once there is a network_tabs.tpl or something
-       $a->page['content'] .= '<a class="button tabs ' . $all_active . '" href="' . $a->get_baseurl() . '/' 
-               . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' 
-               . t('All') . '</a>';
-               
-       // new
-       $a->page['content'] .= '<a class="button tabs ' . $new_active . '" href="' . $a->get_baseurl() . '/' 
-               . str_replace('/new', '', $a->cmd) . '/new' 
-               . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' 
-               . t('New') . '</a>';
-       
-       // starred
-       $a->page['content'] .= '<a class="button tabs ' . $starred_active . '" href="' . $a->get_baseurl() . '/'
-               . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >' 
-               . t('Starred') . '</a>';
-       
-       // bookmarks
-       $a->page['content'] .= '<a class="button tabs ' . $bookmarked_active . '" href="' . $a->get_baseurl() . '/'
-               . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >' 
-               . t('Bookmarks') . '</a>';
-       
-       $a->page['content'] .= '</div>';
-       // --- end item filter tabs
+
        
        // search terms header
        if(x($_GET,'search')) {
@@ -157,6 +98,71 @@ function network_content(&$a, $update = 0) {
 
        $o = '';
 
+       // item filter tabs
+       // TODO: fix this logic, reduce duplication
+       $a->page['content'] .= '<div class="tabs-wrapper">';
+       
+       $starred_active = '';
+       $new_active = '';
+       $bookmarked_active = '';
+       $all_active = '';
+       $search_active = '';
+       
+       if(($a->argc > 1 && $a->argv[1] === 'new') 
+               || ($a->argc > 2 && $a->argv[2] === 'new')) {
+                       $new_active = 'active';
+       }
+       
+       if(x($_GET,'search')) {
+               $search_active = 'active';
+       }
+       
+       if(x($_GET,'star')) {
+               $starred_active = 'active';
+       }
+       
+       if($_GET['bmark']) {
+               $bookmarked_active = 'active';
+       }
+       
+       if (($new_active == '') 
+               && ($starred_active == '') 
+               && ($bookmarked_active == '')
+               && ($search_active == '')) {
+                       $all_active = 'active';
+       }
+       
+       // tabs
+       $tabs = array(
+               array(
+                       'label' => t('All'),
+                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''), 
+                       'sel'=>$all_active,
+               ),
+               array(
+                       'label' => t('New'),
+                       'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : ''),
+                       'sel' => $new_active,
+               ),
+               array(
+                       'label' => t('Starred'),
+                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1',
+                       'sel'=>$starred_active,
+               ),
+               array(
+                       'label' => t('Bookmarks'),
+                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1',
+                       'sel'=>$bookmarked_active,
+               ),      
+       );
+       $tpl = get_markup_template('common_tabs.tpl');
+       $o .= replace_macros($tpl, array('$tabs'=>$tabs));
+       // --- end item filter tabs
+
+
+
+       
+
        $contact_id = $a->cid;
 
        $group = 0;

diff --git a/mod/notes.php b/mod/notes.php
index 369f120a761c80640fe630addbff462eacecc4d1..94ea10e81133f7da20151b3bdaa91cbcf0520f54 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -38,19 +38,7 @@ function notes_content(&$a,$update = false) {
        $is_owner = true;
 
        $o ="";
-       // tabs
-       $tpl = get_markup_template('profile_tabs.tpl');
-       $o .= replace_macros($tpl,array(
-               '$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
-               '$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
-               '$status' => t('Status'),
-               '$profile' => t('Profile'),
-               '$photos' => t('Photos'),
-               '$events' => t('Events') ,
-               '$notes' => t('Personal Notes'),
-               '$activetab' => "notes",
-       ));     
-       
+       $o .= profile_tabs($a,True);
 
        if(! $update) {
                $o .= '<h3>' . t('Personal Notes') . '</h3>';

diff --git a/mod/photos.php b/mod/photos.php
index 1321af1920408ab32edb1f9da28798f74d53edc5..623b15a93b1d1fed47a36c5d68419aa45c40caa1 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -831,18 +831,8 @@ function photos_content(&$a) {
        $o = "";
 
        // tabs
-       $tpl = get_markup_template('profile_tabs.tpl');
        $_is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= replace_macros($tpl,array(
-               '$url' => $a->get_baseurl() . '/profile/' .$a->data['user']['nickname'],
-               '$phototab' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
-               '$status' => t('Status'),
-               '$profile' => t('Profile'),
-               '$photos' => t('Photos'),
-               '$events' => (($_is_owner) ? t('Events') : ''),
-               '$notes' => (($_is_owner) ?     t('Personal Notes') : ''),
-               '$activetab' => "photos",
-       ));     
+       $o .= profile_tabs($a,$_is_owner);      
 
        //
        // dispatch request

diff --git a/mod/profile.php b/mod/profile.php
index 50bbdd46e46e8c7c1ec46999b86730efb532124d..9da0784d3744315688b7245c49ba082b30d14a32 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -110,18 +110,7 @@ function profile_content(&$a, $update = 0) {
                if(x($_GET,'tab'))
                        $tab = notags(trim($_GET['tab']));
 
-               $tpl = get_markup_template('profile_tabs.tpl');
-
-               $o .= replace_macros($tpl,array(
-                       '$url' => $a->get_baseurl() . '/' . $a->cmd,
-                       '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
-                       '$status' => t('Status'),
-                       '$profile' => t('Profile'),
-                       '$photos' => t('Photos'),
-                       '$events' => (($is_owner) ? t('Events') : ''),
-                       '$notes' => (($is_owner) ?      t('Personal Notes') : ''),
-                       '$activetab' => $tab,
-               ));
+               $o.=profile_tabs($a, $is_owner);
 
 
                if($tab === 'profile') {
@@ -131,6 +120,8 @@ function profile_content(&$a, $update = 0) {
                        return $o;
                }
 
+
+
                if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
                        $o .= '<a href="newmember">' . t('Tips for New Members') . '</a>' . EOL;
 

diff --git a/mod/settings.php b/mod/settings.php
index 44ebdd77b1eb73d048f9d2bfe649011ddd73034b..7112db8878f1d25e0f4268bb94f3056549cca4c4 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -306,10 +306,22 @@ function settings_content(&$a) {
                return;
        }
        
-       $tabtpl = get_markup_template("settings_tabs.tpl");
+       $tabs = array(
+               array(
+                       'label' => t('Account settings'),
+                       'url'   => $a->get_baseurl().'/settings',
+                       'sel'   => (($a->argc == 1)?'active':''),
+               ),      
+               array(
+                       'label' => t('Plugin settings'),
+                       'url'   => $a->get_baseurl().'/settings/addon',
+                       'sel'   => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+               )
+       );
+       
+       $tabtpl = get_markup_template("common_tabs.tpl");
        $tabs = replace_macros($tabtpl, array(
-               '$account' => array( t('Account settings'), $a->get_baseurl().'/settings'),
-               '$plugins' => array( t('Plugin settings'), $a->get_baseurl().'/settings/addon')
+               '$tabs' => $tabs,
        ));
                
        

diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl
new file mode 100644 (file)
index 0000000..146ad29
--- /dev/null
+++ b/view/common_tabs.tpl
@@ -0,0 +1,5 @@
+<ul class="tabs">
+       {{ for $tabs as $tab }}
+               <li><a href="$tab.url" class="tab button $tab.sel">$tab.label</a></li>
+       {{ endfor }}
+</ul>

diff --git a/view/profile_tabs.tpl b/view/profile_tabs.tpl
deleted file mode 100644 (file)
index d57c33a..0000000
--- a/view/profile_tabs.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
-       <a href="$url" id="profile-tab-status-link" class="profile-tabs button" >$status</a>
-       <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs button" >$profile</a>
-       <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs button" >$photos</a>
-       {{ if $events }}<a href="events" id="profile-tab-events-link" class="profile-tabs button" >$events</a>{{ endif }}
-       {{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="profile-tabs button" >$notes</a>{{ endif }}
-<div id="profile-tabs-end"></div>
-</div>

diff --git a/view/settings_tabs.tpl b/view/settings_tabs.tpl
deleted file mode 100644 (file)
index 5003ed8..0000000
--- a/view/settings_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
-       <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 button" >$plugins.0</a>
-<div id="profile-tabs-end"></div>
-</div>

diff --git a/view/theme/clean/style.css b/view/theme/clean/style.css
index 4730b5c2fd6db422e080334af462ccd788a1f450..86bca371ccef6ac9f9ebefbd4573e2f77daaf66a 100644 (file)
--- a/view/theme/clean/style.css
+++ b/view/theme/clean/style.css
@@ -59,7 +59,7 @@ body {
        border: 2px solid #CCCCCC;
 }
 
-.profile-tabs {
+.tab {
        color: #444444;
        background: #EEE;
 

diff --git a/view/theme/darkness/style.css b/view/theme/darkness/style.css
index 828fdd10405d6e9476cfc274a9156d1e047211df..3bc4c6aeab709ccfb18f2f2e9e32e34883b3f283 100644 (file)
--- a/view/theme/darkness/style.css
+++ b/view/theme/darkness/style.css
@@ -26,7 +26,7 @@ input, select {
        background-color: #000000;
        color: #FF0000;
 }
-.nav-link:hover, .nav-commlink:hover, .profile-tabs:hover {
+.nav-link:hover, .nav-commlink:hover, .tab:hover {
        background: #DDDDDD;
        color: #FF0000;
 }
@@ -49,7 +49,7 @@ input, select {
        background: #444444;
 }
 
-.profile-tabs {
+.tab {
        color: #FF0000;
        background: #444444;
 
@@ -65,7 +65,3 @@ a:hover, .fakelink:hover {
        text-decoration: underline;
 }
 
-.profile-tabs {
-       color: #FF0000;
-       background: #444444;
-}

diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index b85a9aadaf71aa9830d830c3c4976ac15af5df5b..454c578b07df0afcd5c4d54ab6db8bf487a62c2f 100644 (file)
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -17,7 +17,7 @@ aside{        background-image: url(border.jpg); padding-bottom: 0px; }
 section { background-color: #333333;   background-image: url(border.jpg); }
 
 
-#profile-tabs-wrapper {        background-image: url(head.jpg); }
+.tabs {        background-image: url(head.jpg); }
 div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
 
 nav #banner #logo-text a { color: #ffffff; }

diff --git a/view/theme/dispy/profile_tabs.tpl b/view/theme/dispy/profile_tabs.tpl
deleted file mode 100644 (file)
index c236490..0000000
--- a/view/theme/dispy/profile_tabs.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="tabs-wrapper" >
-       <a href="$url" id="profile-tab-status-link" class="tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
-       <a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
-       <a href="$phototab" id="profile-tab-photos-link" class="tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
-       {{ if $events }}<a href="events" id="profile-tab-events-link" class="tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
-       {{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}  
-<div class="tabs-end"></div>
-</div>

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 8dc017c9cface26d68f48a838ec9cd54aa9a44d2..3c92a877b5ee60f770cbb33a644cc59ba335aef0 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -349,11 +349,11 @@ aside #viewcontacts { text-align: right;}
 section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 
 /** tabs **/
-.tabs-wrapper {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; }
-.tabs-wrapper li { display: inline;}
-.tabs { padding: 0px 5px; margin-right: 10px; }
-.tabs:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
-.tabs.active { background-color: #729fcf; color: #eeeeec; border: 0px; }
+.tabs {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; }
+.tabs li { display: inline;}
+.tab { padding: 0px 5px; margin-right: 10px; }
+.tab:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
+.tab.active { background-color: #729fcf; color: #eeeeec; border: 0px; }
 
 
 /**

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 7dc344f5de5a098fc273df52da4124377b651965..b46a03c3863994ed5d164d173e18e047e72fc755 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -204,33 +204,23 @@ section {
        min-height: 112px;
        
 }
-
-#profile-tabs-wrapper {
+.tabs {
        height: 27px;
        background-image: url(head.jpg);
        background-repeat: repeat-x;    
        background-position: 0px -20px;
        border-bottom: 1px solid #babdb6;
+       padding:0px;
 }
-.profile-tabs {
+.tabs li { margin: 0px; list-style: none; }
+.tab {
        display:block;
        float:left;
        padding: 0.4em;
        margin-right: 1em;
 }
-
-#tabs-wrapper {
-       height: 27px;
-       background-image: url(head.jpg);
-       background-repeat: repeat-x;    
-       background-position: 0px -20px;
-       border-bottom: 1px solid #babdb6;
-}
-.tabs {
-       display:block;
-       float:left;
-       padding: 0.4em;
-       margin-right: 1em;
+.tab.active {
+       font-weight: bold;
 }
 
 

diff --git a/view/theme/easterbunny/style.css b/view/theme/easterbunny/style.css
index bbe4394e968f12fe6d06713946a6015091a7176d..ab2e07053f6b3a33c93c179b47a86e8a97e9701d 100644 (file)
--- a/view/theme/easterbunny/style.css
+++ b/view/theme/easterbunny/style.css
@@ -29,7 +29,7 @@ a:hover {text-decoration: underline; }
 
 
 aside(         background-image: url('border.jpg'); }
-#profile-tabs-wrapper {        background-image: url('head.jpg'); }
+.tabs {        background-image: url('head.jpg'); }
 div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
 
 

diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
index 2a098e95510498169a877bada2238f53a95a0285..47985aaa8e9ff37f363968c37185ad7d8e8bd51b 100644 (file)
--- a/view/theme/goldenrod/style.css
+++ b/view/theme/goldenrod/style.css
@@ -67,7 +67,7 @@ body {
        background: #FFDDAA !important;
 }
 
-.profile-tabs {
+.tab {
        color: #444444;
        background: #FFCC55;
 

diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css
index ab309930ceda38ce1603d5fc49689e51541be957..204b2677ee3ca8b20840ba287f7c44440f94129e 100644 (file)
--- a/view/theme/greenzero/style.css
+++ b/view/theme/greenzero/style.css
@@ -22,7 +22,7 @@ a:hover {text-decoration: underline; }
 body {         background-image: url(head.jpg); }
 aside(         background-image: url(border.jpg); }
 section {      background-image: url(border.jpg); }
-#profile-tabs-wrapper {        background-image: url(head.jpg); }
+.tabs {        background-image: url(head.jpg); }
 div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
 
 .fakelink, .fakelink:visited {

diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 962d08fc075c0e7a9d813ca55a21b8041e81e42c..c6250c51c1ea855550f6ec924de8708da98d8f04 100644 (file)
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1570,7 +1570,7 @@ padding: 5px 10px 0px;
        width: 600px;
 }
 
-.profile-tabs {
+.tab {
        float: left;
        padding: 4px;
        margin-top: 10px;
@@ -1583,36 +1583,15 @@ padding: 5px 10px 0px;
        background-color: #ECECEC;
        border: 1px solid #858585;
 }
-.profile-tabs:hover {
+.tab.active,
+.tab:hover {
        background-color: #0CBEFE;
        color: #F5F6FB;
        border: 1px solid #F5F6FB;
        /*cursor: pointer;*/
 }
-
-#profile-tabs-end {
-       clear: both;
-}
-
-.tabs {
-       padding: 4px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-       margin-right: 5px;
-       /*border: 1px solid #CCC;*/
-       /*background: #F8F8F8;*/
-       font-size: 0.8em;
-       font-weight: bold;
-       background-color: #ECECEC;
-       border: 1px solid #858585;
-}
-.tabs:hover {
-       background-color: #0CBEFE;
-       color: #F5F6FB;
-       border: 1px solid #F5F6FB;
-       /*cursor: pointer;*/
-}
-
+.tabs {        padding:0px; margin: 0px; overflow: auto; height: auto;}
+.tabs li { margin: 0px; list-style: none; }
 
 .comment-edit-text-empty {
        color: gray;

diff --git a/view/theme/purplezero/style.css b/view/theme/purplezero/style.css
index 16c9dc65032a95ed669fd8ab3bb7d056fb17caaa..f624fadac304170e8a0aaf9a323ead4160ee19ac 100644 (file)
--- a/view/theme/purplezero/style.css
+++ b/view/theme/purplezero/style.css
@@ -7,7 +7,7 @@ a:hover {text-decoration: underline; }
 body {         background-image: url(head.jpg); }
 aside(         background-image: url(border.jpg); }
 section {      background-image: url(border.jpg); }
-#profile-tabs-wrapper {        background-image: url(head.jpg); }
+.tabs {        background-image: url(head.jpg); }
 div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
 
 

diff --git a/view/theme/shady/style.css b/view/theme/shady/style.css
index 1e3e6ec4010cdd9a37a89ea0829e443d7342759a..1324af019443ff9ea1ba13d0b2db94b60031402b 100644 (file)
--- a/view/theme/shady/style.css
+++ b/view/theme/shady/style.css
@@ -18,7 +18,7 @@ body {
        background: #F4F4F4;
 }
 
-.profile-tabs {
+.tab {
        color: #444444;
        background: #F4F4F4;
 

diff --git a/view/theme/testbubble/profile_tabs.tpl b/view/theme/testbubble/profile_tabs.tpl
deleted file mode 100644 (file)
index ae7c65e..0000000
--- a/view/theme/testbubble/profile_tabs.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="tabs-wrapper" >
-       <a href="$url" id="profile-tab-status-link" class="button tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
-       <a href="$url?tab=profile" id="profile-tab-profile-link" class="button tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
-       <a href="$phototab" id="profile-tab-photos-link" class="button tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
-       {{ if $events }}<a href="events" id="profile-tab-events-link" class="button tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
-       {{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="button tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}   
-<div class="tabs-end"></div>
-</div>

diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 5621a972b9b86e318eb3801966f1aaa88236ce83..341314c1d0b1e282618a5e96cadd45ba50859234 100644 (file)
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -822,22 +822,22 @@ profile-jot-banner-wrapper {
 /* = Tabs = */
 /* ======== */
 
-.tabs-wrapper {
+.tabs {
        width: 450px;
        list-style: none;
        padding: 10px;
        margin: 0px 0px 10px 0px;
        border-bottom: 1px solid #efefef;
 }
-.tabs-wrapper li { display: inline;}
+.tabs li { display: inline;}
 
-.tabs {
+.tab {
        padding: 5px 10px 5px 10px;
        margin-right: 5px;
        font-style: bold;
 }
 
-.tabs:hover {
+.tab:hover {
        padding: 5px 10px 5px 10px;
 }
 
@@ -3085,4 +3085,4 @@ ul.menu-popup {
 
 #jGrowl {
        z-index: 20000;
-}
\ No newline at end of file
+}

diff --git a/view/theme/three-d/style.css b/view/theme/three-d/style.css
index 56d36914ee1374f6e11c2b5b81eed494a44c242a..ca3f6786ddf58dea9c7c451cc93d4abdc7399d2c 100644 (file)
--- a/view/theme/three-d/style.css
+++ b/view/theme/three-d/style.css
@@ -26,7 +26,7 @@
 
 }
 
-.profile-tabs {
+.tab {
        -moz-box-shadow: 5px 5px 5px #888888;
        -webkit-box-shadow: 5px 5px 5px #888888;
        box-shadow: 5px 5px 5px #888888;