New common tab template. Update css

18 files changed, 36 insertions, 99 deletions

diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl
new file mode 100644
index 000000000..146ad29fa
--- /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
index d57c33acf..000000000
--- 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
index 5003ed8ce..000000000
--- 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 4730b5c2f..86bca371c 100644
--- 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 828fdd104..3bc4c6aea 100644
--- 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 b85a9aada..454c578b0 100644
--- 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
index c236490b2..000000000
--- 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 8dc017c9c..3c92a877b 100644
--- 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 7dc344f5d..b46a03c38 100644
--- 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 bbe4394e9..ab2e07053 100644
--- 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 2a098e955..47985aaa8 100644
--- 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 ab309930c..204b2677e 100644
--- 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 962d08fc0..c6250c51c 100644
--- 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 16c9dc650..f624fadac 100644
--- 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 1e3e6ec40..1324af019 100644
--- 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
index ae7c65e1c..000000000
--- 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 5621a972b..341314c1d 100644
--- 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 56d36914e..ca3f6786d 100644
--- 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;