clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pull'

This commit is contained in:
friendica 2012-03-31 14:50:14 -07:00
parent 0cf2e051bb 05ad28fb9b
commit 7581b32bb3
12 changed files with 10498 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/theme/diabook-aerith/rs_common_tabs.tpl Executable file
View File

@ -0,0 +1,6 @@
<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>
{{ endfor }}
</ul>

2613
view/theme/diabook-aerith/style-settings.css Normal file
View File

File diff suppressed because it is too large Load Diff

47
view/theme/diabook-aerith/theme.php
View File

@ -254,6 +254,53 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
//tabs at right_aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'sel' => (($a->argc == 1)?'active':''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
),
array(
'label' => t('Connections'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'sel' => ''
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
$a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-settings.css";
}
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);

6
view/theme/diabook-blue/rs_common_tabs.tpl Executable file
View File

@ -0,0 +1,6 @@
<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>
{{ endfor }}
</ul>

2565
view/theme/diabook-blue/style-settings.css Normal file
View File

File diff suppressed because it is too large Load Diff

47
view/theme/diabook-blue/theme.php
View File

@ -254,6 +254,53 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
//tabs at right_aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'sel' => (($a->argc == 1)?'active':''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
),
array(
'label' => t('Connections'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'sel' => ''
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
$a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-settings.css";
}
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);

6
view/theme/diabook-red/rs_common_tabs.tpl Executable file
View File

@ -0,0 +1,6 @@
<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>
{{ endfor }}
</ul>

2588
view/theme/diabook-red/style-settings.css Normal file
View File

File diff suppressed because it is too large Load Diff

48
view/theme/diabook-red/theme.php
View File

@ -255,6 +255,54 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
//tabs at right_aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'sel' => (($a->argc == 1)?'active':''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
),
array(
'label' => t('Connections'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'sel' => ''
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
$a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-settings.css";
}
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);

6
view/theme/diabook/rs_common_tabs.tpl Executable file
View File

@ -0,0 +1,6 @@
<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>
{{ endfor }}
</ul>

2519
view/theme/diabook/style-settings.css Normal file
View File

File diff suppressed because it is too large Load Diff

47
view/theme/diabook/theme.php
View File

@ -262,6 +262,53 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
//tabs at right_aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'sel' => (($a->argc == 1)?'active':''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
),
array(
'label' => t('Connections'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'sel' => ''
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
$a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-settings.css";
}
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);