aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/cleanzero
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/cleanzero')
-rw-r--r--view/theme/cleanzero/config.php20
-rw-r--r--view/theme/cleanzero/nav.tpl46
-rw-r--r--view/theme/cleanzero/style.php73
-rw-r--r--view/theme/cleanzero/theme.php2
-rw-r--r--view/theme/cleanzero/theme_settings.tpl2
5 files changed, 112 insertions, 31 deletions
diff --git a/view/theme/cleanzero/config.php b/view/theme/cleanzero/config.php
index 7982a75c5..312e9d3dd 100644
--- a/view/theme/cleanzero/config.php
+++ b/view/theme/cleanzero/config.php
@@ -12,8 +12,9 @@ function theme_content(&$a){
$resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
$color = get_pconfig(local_user(), 'cleanzero', 'color' );
$font_size = get_pconfig(local_user(), 'cleanzero', 'font_size' );
+ $theme_width= get_pconfig(local_user(), 'cleanzero', 'theme_width' );
- return cleanzero_form($a,$color,$font_size,$resize);
+ return cleanzero_form($a,$color,$font_size,$resize,$theme_width);
}
function theme_post(&$a){
@@ -24,6 +25,7 @@ function theme_post(&$a){
set_pconfig(local_user(), 'cleanzero', 'resize', $_POST['cleanzero_resize']);
set_pconfig(local_user(), 'cleanzero', 'color', $_POST['cleanzero_color']);
set_pconfig(local_user(), 'cleanzero', 'font_size', $_POST['cleanzero_font_size']);
+ set_pconfig(local_user(), 'cleanzero', 'theme_width', $_POST['cleanzero_theme_width']);
}
}
@@ -32,8 +34,8 @@ function theme_admin(&$a){
$resize = get_config('cleanzero', 'resize' );
$color = get_config('cleanzero', 'color' );
$font_size = get_config('cleanzero', 'font_size' );
-
- return cleanzero_form($a,$color,$font_size,$resize);
+ $theme_width= get_config('cleanzero', 'theme_width' );
+ return cleanzero_form($a,$color,$font_size,$resize,$theme_width);
}
function theme_admin_post(&$a){
@@ -41,11 +43,13 @@ function theme_admin_post(&$a){
set_config('cleanzero', 'resize', $_POST['cleanzero_resize']);
set_config('cleanzero', 'color', $_POST['cleanzero_color']);
set_config('cleanzero', 'font_size', $_POST['cleanzero_font_size']);
+ set_config('cleanzero', 'theme_width', $_POST['cleanzero_theme_width']);
+
}
}
-function cleanzero_form(&$a, $color,$font_size,$resize){
+function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){
$colors = array(
"cleanzero"=>"cleanzero",
"cleanzero-green"=>"green",
@@ -65,7 +69,12 @@ function cleanzero_form(&$a, $color,$font_size,$resize){
"250"=>"3 (250px)",
"150"=>"4 (150px)",
);
-
+ $theme_widths =array (
+ "standard"=>"standard",
+ "narrow"=>"narrow",
+ "wide"=>"wide",
+ );
+
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
@@ -73,6 +82,7 @@ function cleanzero_form(&$a, $color,$font_size,$resize){
'$title' => t("Theme settings"),
'$resize' => array('cleanzero_resize',t ('Set resize level for images in posts and comments (width and height)'),$resize,'',$resizes),
'$font_size' => array('cleanzero_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
+ '$theme_width' => array('cleanzero_theme_width', t('Set theme width'), $theme_width, '', $theme_widths),
'$color' => array('cleanzero_color', t('Color scheme'), $color, '', $colors),
));
return $o;
diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl
index 4dacf3858..9fe5ac0fe 100644
--- a/view/theme/cleanzero/nav.tpl
+++ b/view/theme/cleanzero/nav.tpl
@@ -1,23 +1,14 @@
-<nav>
+ <nav>
$langselector
<div id="site-location">$sitelocation</div>
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
- <span id="nav-link-wrapper" >
+ <span id="nav-commlink-wrapper">
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
- {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
{{ if $nav.network }}
<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
@@ -27,7 +18,9 @@
<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-ajax-left"></span>
{{ endif }}
-
+ {{ if $nav.community }}
+ <a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+ {{ endif }}
{{ if $nav.introductions }}
<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
<span id="intro-update" class="nav-ajax-left"></span>
@@ -36,11 +29,6 @@
<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
<span id="mail-update" class="nav-ajax-left"></span>
{{ endif }}
-
-
-
-
-
{{ if $nav.notifications }}
<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
<span id="notify-update" class="nav-ajax-left"></span>
@@ -49,7 +37,24 @@
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
<li class="empty">$emptynotifications</li>
</ul>
- {{ endif }}
+ {{ endif }}
+ </span>
+ <span id="banner">$banner</span>
+ <span id="nav-link-wrapper">
+ {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+ {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+ {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+
+ {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+ <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+ <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+ {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+
+
+
{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
@@ -58,12 +63,9 @@
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-link $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
</span>
<span id="nav-end"></span>
- <span id="banner">$banner</span>
+
</nav>
<ul id="nav-notifications-template" style="display:none;" rel="template">
diff --git a/view/theme/cleanzero/style.php b/view/theme/cleanzero/style.php
index b820d3b7a..682c527f1 100644
--- a/view/theme/cleanzero/style.php
+++ b/view/theme/cleanzero/style.php
@@ -1,21 +1,24 @@
<?php
$color=false;
$cleanzero_font_size=false;
+ $cleanzero_theme_width=false;
$site_color = get_config("cleanzero","color");
$site_cleanzero_font_size = get_config("cleanzero", "font_size" );
-
+ $site_cleanzero_theme_width = get_config("cleanzero", "theme_width");
if (local_user()) {
$color = get_pconfig(local_user(), "cleanzero","color");
$cleanzero_font_size = get_pconfig(local_user(), "cleanzero", "font_size");
+ $cleanzero_theme_width = get_pconfig(local_user(), "cleanzero", "theme_width");
}
if ($color===false) $color=$site_color;
if ($color===false) $color="cleanzero";
if ($cleanzero_font_size===false) $cleanzero_font_size=$site_cleanzero_font_size;
-
+ if ($cleanzero_theme_width===false) $cleanzero_theme_width=$site_cleanzero_theme_width;
+ if ($cleanzero_theme_width===false) $cleanzero_theme_width="standard";
if (file_exists("$THEMEPATH/$color/style.css")){
@@ -68,4 +71,70 @@
}
";
}
+ if ($cleanzero_theme_width === "standard") {
+ echo "
+ section {
+ margin: 0px 10%;
+ margin-right:10%;
+ }
+
+ aside {
+ margin-left: 10%;
+ }
+ nav {
+ margin-left: 10%;
+ margin-right: 10%;
+
+ }
+
+ nav #site-location {
+ right: 10%;
+
+ }
+ ";
+ }
+
+ if ($cleanzero_theme_width === "narrow") {
+ echo "
+ section {
+ margin: 0px 15%;
+ margin-right:15%;
+ }
+
+ aside {
+ margin-left: 15%;
+ }
+ nav {
+ margin-left: 15%;
+ margin-right: 15%;
+ }
+
+ nav #site-location {
+ right: 15%;
+
+ }
+ ";
+ }
+ if ($cleanzero_theme_width === "wide") {
+ echo "
+ section {
+ margin: 0px 5%;
+ margin-right:5%;
+ }
+
+ aside {
+ margin-left: 5%;
+ }
+ nav {
+ margin-left: 5%;
+ margin-right: 5%;
+
+ }
+
+ nav #site-location {
+ right: 5%;
+
+ }
+ ";
+ }
diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php
index cc924539e..c99361997 100644
--- a/view/theme/cleanzero/theme.php
+++ b/view/theme/cleanzero/theme.php
@@ -108,7 +108,7 @@ $a->page['htmlhead'] .= '
<script>
$(function() {
- $(".wall-item-content-wrapper img").aeImageResize({height: '.$resize.', width: '.$resize.'});
+ $(".wall-item-content img").aeImageResize({height: '.$resize.', width: '.$resize.'});
});
</script>';}
}
diff --git a/view/theme/cleanzero/theme_settings.tpl b/view/theme/cleanzero/theme_settings.tpl
index 07e7cba05..bfe18af27 100644
--- a/view/theme/cleanzero/theme_settings.tpl
+++ b/view/theme/cleanzero/theme_settings.tpl
@@ -1,7 +1,7 @@
{{inc field_select.tpl with $field=$color}}{{endinc}}
{{inc field_select.tpl with $field=$font_size}}{{endinc}}
{{inc field_select.tpl with $field=$resize}}{{endinc}}
-
+{{inc field_select.tpl with $field=$theme_width}}{{endinc}}
<div class="settings-submit-wrapper">
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-23 08:17:37 +0000