tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #193 from tomtom84/master

Browse source 
diabook-themes: move "common tabs" to left side on settings page
This commit is contained in:
tomtom84 2012-03-31 09:44:12 -07:00
parent 19a7096be6 36545e554b
commit 05ad28fb9b
12 changed files with 31 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/theme/diabook-aerith/rs_common_tabs.tpl
View file

@ -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"> <ul class="rs_tabs">
{{ for $tabs as $tab }} {{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li> <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>

17
view/theme/diabook-aerith/style-settings.css
View file

@ -982,18 +982,14 @@ ul.menu-popup .empty {
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 160px; width: 200px;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside #page-sidebar{display: none;} aside #page-sidebar{display: none;}
aside .vcard .fn { aside .vcard {display: none;}
font-size: 18px;
font-weight: bold;
margin-bottom: 5px;
}
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
} }
@ -1056,10 +1052,7 @@ aside #side-follow-url {
aside #side-peoplefind-url { aside #side-peoplefind-url {
width: 150px; width: 150px;
} }
#contact-block { #contact-block {display: none;}
overflow: auto;
height: auto;
}
#contact-block .contact-block-h4 { #contact-block .contact-block-h4 {
float: left; float: left;
margin: 5px 0px; margin: 5px 0px;
@ -1192,8 +1185,8 @@ span.sbox input {
section { section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 640px; width: 650px;
padding: 0px 10px 0px 10px; padding: 0px 0px 0px 20px;
} }
body .pageheader{ body .pageheader{

2
view/theme/diabook-aerith/theme.php
View file

@ -291,7 +291,7 @@ if ($a->argv[0] === "settings"){
) )
); );
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; $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, '$tabs' => $tabs,
)); ));

2
view/theme/diabook-blue/rs_common_tabs.tpl
View file

@ -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"> <ul class="rs_tabs">
{{ for $tabs as $tab }} {{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li> <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>

15
view/theme/diabook-blue/style-settings.css
View file

@ -945,17 +945,15 @@ ul.menu-popup .empty {
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 160px; width: 200px;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside .vcard .fn { aside .vcard {
font-size: 18px; display: none;
font-weight: bold;
margin-bottom: 5px;
} }
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
@ -1018,8 +1016,7 @@ aside #side-peoplefind-url {
width: 150px; width: 150px;
} }
#contact-block { #contact-block {
overflow: auto; display: none;
height: auto;
} }
#contact-block .contact-block-h4 { #contact-block .contact-block-h4 {
float: left; float: left;
@ -1153,8 +1150,8 @@ span.sbox input {
section { section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 640px; width: 650px;
padding: 0px 10px 0px 10px; padding: 0px 0px 0px 20px;
} }
body .pageheader{ body .pageheader{

2
view/theme/diabook-blue/theme.php
View file

@ -291,7 +291,7 @@ if ($a->argv[0] === "settings"){
) )
); );
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; $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, '$tabs' => $tabs,
)); ));

2
view/theme/diabook-red/rs_common_tabs.tpl
View file

@ -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"> <ul class="rs_tabs">
{{ for $tabs as $tab }} {{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li> <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>

15
view/theme/diabook-red/style-settings.css
View file

@ -960,17 +960,15 @@ ul.menu-popup .empty {
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 160px; width: 200px;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside .vcard .fn { aside .vcard {
font-size: 18px; display: none;
font-weight: bold;
margin-bottom: 5px;
} }
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
@ -1035,8 +1033,7 @@ aside #side-peoplefind-url {
width: 150px; width: 150px;
} }
#contact-block { #contact-block {
overflow: auto; display: none;
height: auto;
} }
#contact-block .contact-block-h4 { #contact-block .contact-block-h4 {
float: left; float: left;
@ -1170,8 +1167,8 @@ span.sbox input {
section { section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 640px; width: 650px;
padding: 0px 10px 0px 10px; padding: 0px 0px 0px 20px;
} }
body .pageheader{ body .pageheader{

2
view/theme/diabook-red/theme.php
View file

@ -292,7 +292,7 @@ if ($a->argv[0] === "settings"){
) )
); );
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; $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, '$tabs' => $tabs,
)); ));

2
view/theme/diabook/rs_common_tabs.tpl
View file

@ -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"> <ul class="rs_tabs">
{{ for $tabs as $tab }} {{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li> <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>

15
view/theme/diabook/style-settings.css
View file

@ -934,17 +934,15 @@ ul.menu-popup .empty {
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 160px; width: 200px;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside .vcard .fn { aside .vcard {
font-size: 18px; display: none;
font-weight: bold;
margin-bottom: 5px;
} }
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
@ -1007,8 +1005,7 @@ aside #side-peoplefind-url {
width: 150px; width: 150px;
} }
#contact-block { #contact-block {
overflow: auto; display: none;
height: auto;
} }
#contact-block .contact-block-h4 { #contact-block .contact-block-h4 {
float: left; float: left;
@ -1132,8 +1129,8 @@ span.sbox input {
section { section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 640px; width: 650px;
padding: 0px 10px 0px 10px; padding: 0px 0px 0px 20px;
} }
body .pageheader{ body .pageheader{

2
view/theme/diabook/theme.php
View file

@ -299,7 +299,7 @@ if ($a->argv[0] === "settings"){
) )
); );
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; $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, '$tabs' => $tabs,
)); ));