Merge pull request #193 from tomtom84/master
diabook-themes: move "common tabs" to left side on settings page
This commit is contained in:
commit
05ad28fb9b
12 changed files with 31 additions and 47 deletions
|
@ -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>
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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,
|
||||
));
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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,
|
||||
));
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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,
|
||||
));
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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,
|
||||
));
|
||||
|
||||
|
|
Loading…
Reference in a new issue