diabook-themes: move "common tabs" to left side on settings page

diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl
index 513778e7622f38dc312e022ae499e7dc4b05b79b..6a1c5c71bd118b69ec84dd8385e618f807ded0cb 100755 (executable)
--- 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 af08f0ffba12ae6d4e1aa39ce162b96515a6b87a..0326dbcfcaea354463a6fa407c84df9d01c09ed4 100644 (file)
--- 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 38dd9ae8c22faf0d4ff5f4df3d2f0ee46a7ec9ee..132d69b4759b9fc517722ade7f5118fc481bcd6d 100755 (executable)
--- 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 513778e7622f38dc312e022ae499e7dc4b05b79b..6a1c5c71bd118b69ec84dd8385e618f807ded0cb 100755 (executable)
--- 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 4d57d3782331cf88777bc125f453926031c00a3d..197b53d306a60a1747e058b67feffae6297280ae 100644 (file)
--- 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 52879649a05823305bf39b0a21c874ff0f0d3ca5..4d9e31bfa2b02a72deb920adfdd45ef1d09cefdb 100755 (executable)
--- 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 513778e7622f38dc312e022ae499e7dc4b05b79b..6a1c5c71bd118b69ec84dd8385e618f807ded0cb 100755 (executable)
--- 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 4282b026a51be541189639e376508c16ecd1187f..9407c68f9e1827bc7f0e37204b6da365b29bce1e 100644 (file)
--- 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 6b8d6b6d4b994e65ad2cf6b870053cf34f317c68..ba5a69d252abb1e4677d2a587eef3e87307d3264 100755 (executable)
--- 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 513778e7622f38dc312e022ae499e7dc4b05b79b..6a1c5c71bd118b69ec84dd8385e618f807ded0cb 100755 (executable)
--- 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 e077e608d9120d1788c96d247cbe8ae2826bbef5..46f7e957e962413754a4170c4b7da8c567c1ae90 100644 (file)
--- 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 08bdfaf89cef4e385c6df702d5e60de0963a82e8..6973951a0efa95e1ebce74b512a741453afa6367 100755 (executable)
--- 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,
        ));