aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authortomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net>2012-03-31 09:44:12 -0700
committertomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net>2012-03-31 09:44:12 -0700
commit05ad28fb9b75a2ad3925ed3d444e3577ee43c932 (patch)
tree8fb986714001a83587167e80f7eca55b4bcd0fd6 /view
parent19a7096be65d761abf9f9e195a862208aa6fa397 (diff)
parent36545e554bd051f602c270569a20eddf432555f0 (diff)
downloadvolse-hubzilla-05ad28fb9b75a2ad3925ed3d444e3577ee43c932.tar.gz
volse-hubzilla-05ad28fb9b75a2ad3925ed3d444e3577ee43c932.tar.bz2
volse-hubzilla-05ad28fb9b75a2ad3925ed3d444e3577ee43c932.zip
Merge pull request #193 from tomtom84/master
diabook-themes: move "common tabs" to left side on settings page
Diffstat (limited to 'view')
-rwxr-xr-xview/theme/diabook-aerith/rs_common_tabs.tpl2
-rw-r--r--view/theme/diabook-aerith/style-settings.css17
-rwxr-xr-xview/theme/diabook-aerith/theme.php2
-rwxr-xr-xview/theme/diabook-blue/rs_common_tabs.tpl2
-rw-r--r--view/theme/diabook-blue/style-settings.css15
-rwxr-xr-xview/theme/diabook-blue/theme.php2
-rwxr-xr-xview/theme/diabook-red/rs_common_tabs.tpl2
-rw-r--r--view/theme/diabook-red/style-settings.css15
-rwxr-xr-xview/theme/diabook-red/theme.php2
-rwxr-xr-xview/theme/diabook/rs_common_tabs.tpl2
-rw-r--r--view/theme/diabook/style-settings.css15
-rwxr-xr-xview/theme/diabook/theme.php2
12 files changed, 31 insertions, 47 deletions
diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl
index 513778e76..6a1c5c71b 100755
--- a/view/theme/diabook-aerith/rs_common_tabs.tpl
+++ b/view/theme/diabook-aerith/rs_common_tabs.tpl
@@ -1,4 +1,4 @@
-<h3 style="margin-top: 0px; padding-left: 0px; text-align: center;">Settings Menu</h3>
+<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
<ul class="rs_tabs">
{{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
diff --git a/view/theme/diabook-aerith/style-settings.css b/view/theme/diabook-aerith/style-settings.css
index af08f0ffb..0326dbcfc 100644
--- a/view/theme/diabook-aerith/style-settings.css
+++ b/view/theme/diabook-aerith/style-settings.css
@@ -982,18 +982,14 @@ ul.menu-popup .empty {
aside {
display: table-cell;
vertical-align: top;
- width: 160px;
+ width: 200px;
padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2;
float: left;
/* background: #F1F1F1; */
}
aside #page-sidebar{display: none;}
-aside .vcard .fn {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 5px;
-}
+aside .vcard {display: none;}
aside .vcard .title {
margin-bottom: 5px;
}
@@ -1056,10 +1052,7 @@ aside #side-follow-url {
aside #side-peoplefind-url {
width: 150px;
}
-#contact-block {
- overflow: auto;
- height: auto;
-}
+#contact-block {display: none;}
#contact-block .contact-block-h4 {
float: left;
margin: 5px 0px;
@@ -1192,8 +1185,8 @@ span.sbox input {
section {
display: table-cell;
vertical-align: top;
- width: 640px;
- padding: 0px 10px 0px 10px;
+ width: 650px;
+ padding: 0px 0px 0px 20px;
}
body .pageheader{
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 38dd9ae8c..132d69b47 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -291,7 +291,7 @@ if ($a->argv[0] === "settings"){
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
- $a->page['right_aside'] = replace_macros($tabtpl, array(
+ $a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl
index 513778e76..6a1c5c71b 100755
--- a/view/theme/diabook-blue/rs_common_tabs.tpl
+++ b/view/theme/diabook-blue/rs_common_tabs.tpl
@@ -1,4 +1,4 @@
-<h3 style="margin-top: 0px; padding-left: 0px; text-align: center;">Settings Menu</h3>
+<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
<ul class="rs_tabs">
{{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
diff --git a/view/theme/diabook-blue/style-settings.css b/view/theme/diabook-blue/style-settings.css
index 4d57d3782..197b53d30 100644
--- a/view/theme/diabook-blue/style-settings.css
+++ b/view/theme/diabook-blue/style-settings.css
@@ -945,17 +945,15 @@ ul.menu-popup .empty {
aside {
display: table-cell;
vertical-align: top;
- width: 160px;
+ width: 200px;
padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2;
float: left;
/* background: #F1F1F1; */
}
-aside .vcard .fn {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 5px;
+aside .vcard {
+ display: none;
}
aside .vcard .title {
margin-bottom: 5px;
@@ -1018,8 +1016,7 @@ aside #side-peoplefind-url {
width: 150px;
}
#contact-block {
- overflow: auto;
- height: auto;
+ display: none;
}
#contact-block .contact-block-h4 {
float: left;
@@ -1153,8 +1150,8 @@ span.sbox input {
section {
display: table-cell;
vertical-align: top;
- width: 640px;
- padding: 0px 10px 0px 10px;
+ width: 650px;
+ padding: 0px 0px 0px 20px;
}
body .pageheader{
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 52879649a..4d9e31bfa 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -291,7 +291,7 @@ if ($a->argv[0] === "settings"){
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
- $a->page['right_aside'] = replace_macros($tabtpl, array(
+ $a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl
index 513778e76..6a1c5c71b 100755
--- a/view/theme/diabook-red/rs_common_tabs.tpl
+++ b/view/theme/diabook-red/rs_common_tabs.tpl
@@ -1,4 +1,4 @@
-<h3 style="margin-top: 0px; padding-left: 0px; text-align: center;">Settings Menu</h3>
+<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
<ul class="rs_tabs">
{{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
diff --git a/view/theme/diabook-red/style-settings.css b/view/theme/diabook-red/style-settings.css
index 4282b026a..9407c68f9 100644
--- a/view/theme/diabook-red/style-settings.css
+++ b/view/theme/diabook-red/style-settings.css
@@ -960,17 +960,15 @@ ul.menu-popup .empty {
aside {
display: table-cell;
vertical-align: top;
- width: 160px;
+ width: 200px;
padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2;
float: left;
/* background: #F1F1F1; */
}
-aside .vcard .fn {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 5px;
+aside .vcard {
+ display: none;
}
aside .vcard .title {
margin-bottom: 5px;
@@ -1035,8 +1033,7 @@ aside #side-peoplefind-url {
width: 150px;
}
#contact-block {
- overflow: auto;
- height: auto;
+ display: none;
}
#contact-block .contact-block-h4 {
float: left;
@@ -1170,8 +1167,8 @@ span.sbox input {
section {
display: table-cell;
vertical-align: top;
- width: 640px;
- padding: 0px 10px 0px 10px;
+ width: 650px;
+ padding: 0px 0px 0px 20px;
}
body .pageheader{
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 6b8d6b6d4..ba5a69d25 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -292,7 +292,7 @@ if ($a->argv[0] === "settings"){
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
- $a->page['right_aside'] = replace_macros($tabtpl, array(
+ $a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl
index 513778e76..6a1c5c71b 100755
--- a/view/theme/diabook/rs_common_tabs.tpl
+++ b/view/theme/diabook/rs_common_tabs.tpl
@@ -1,4 +1,4 @@
-<h3 style="margin-top: 0px; padding-left: 0px; text-align: center;">Settings Menu</h3>
+<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
<ul class="rs_tabs">
{{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css
index e077e608d..46f7e957e 100644
--- a/view/theme/diabook/style-settings.css
+++ b/view/theme/diabook/style-settings.css
@@ -934,17 +934,15 @@ ul.menu-popup .empty {
aside {
display: table-cell;
vertical-align: top;
- width: 160px;
+ width: 200px;
padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2;
float: left;
/* background: #F1F1F1; */
}
-aside .vcard .fn {
- font-size: 18px;
- font-weight: bold;
- margin-bottom: 5px;
+aside .vcard {
+ display: none;
}
aside .vcard .title {
margin-bottom: 5px;
@@ -1007,8 +1005,7 @@ aside #side-peoplefind-url {
width: 150px;
}
#contact-block {
- overflow: auto;
- height: auto;
+ display: none;
}
#contact-block .contact-block-h4 {
float: left;
@@ -1132,8 +1129,8 @@ span.sbox input {
section {
display: table-cell;
vertical-align: top;
- width: 640px;
- padding: 0px 10px 0px 10px;
+ width: 650px;
+ padding: 0px 0px 0px 20px;
}
body .pageheader{
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 08bdfaf89..6973951a0 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -299,7 +299,7 @@ if ($a->argv[0] === "settings"){
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
- $a->page['right_aside'] = replace_macros($tabtpl, array(
+ $a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));