Browse Source
* remotes/upstream/master: well that was a silly mistake... setting wasn't being applied rev update diabook-themes: theme-settings: users can set font-size and line-height for posts and comments diabook: theme-settings: users can set font-size and line-height for posts and comments diabook-themes: small fixes quattro: language icon in navbar move html out of lang_selector() and new template lang_selector.tpl display settings: show theme screenshot on page load quattro: add admin theme settigs. darker items background with a bottom border. admin: change global theme settings quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot validate_url allow naked subdomain if is "localhost" * master:pull/232/head
Simon L'nu
10 years ago
74 changed files with 2077 additions and 830 deletions
@ -1,6 +1,6 @@
|
||||
|
||||
<div class='field checkbox'> |
||||
<label for='id_$field.0'>$field.1</label> |
||||
<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="true"{{ endif }}> |
||||
<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}> |
||||
<span class='field_help'>$field.3</span> |
||||
</div> |
||||
|
||||
@ -0,0 +1,10 @@
|
||||
<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" >lang</div> |
||||
<div id="language-selector" style="display: none;" > |
||||
<form action="#" method="post" > |
||||
<select name="system_language" onchange="this.form.submit();" > |
||||
{{ for $langs.0 as $v=>$l }} |
||||
<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option> |
||||
{{ endfor }} |
||||
</select> |
||||
</form> |
||||
</div> |
||||
@ -0,0 +1,71 @@
|
||||
<?php |
||||
/** |
||||
* Theme settings |
||||
*/ |
||||
|
||||
|
||||
|
||||
function theme_content(&$a){ |
||||
if(!local_user()) |
||||
return; |
||||
|
||||
$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' ); |
||||
$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' ); |
||||
|
||||
return diabook_form($a,$font_size, $line_height); |
||||
} |
||||
|
||||
function theme_post(&$a){ |
||||
if(! local_user()) |
||||
return; |
||||
|
||||
if (isset($_POST['diabook-aerith-settings-submit'])){ |
||||
set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']); |
||||
set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']); |
||||
} |
||||
} |
||||
|
||||
|
||||
function theme_admin(&$a){ |
||||
$font_size = get_config('diabook-aerith', 'font_size' ); |
||||
$line_height = get_config('diabook-aerith', 'line_height' ); |
||||
|
||||
return diabook_form($a,$font_size, $line_height); |
||||
} |
||||
|
||||
function theme_admin_post(&$a){ |
||||
if (isset($_POST['diabook-aerith-settings-submit'])){ |
||||
set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']); |
||||
set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']); |
||||
} |
||||
} |
||||
|
||||
|
||||
function diabook_form(&$a, $font_size, $line_height){ |
||||
$line_heights = array( |
||||
"1.4"=>"1.4", |
||||
"1.3"=>"1.3", |
||||
"1.2"=>"1.2", |
||||
"1.1"=>"1.1", |
||||
); |
||||
|
||||
$font_sizes = array( |
||||
'14'=>'14', |
||||
'13.5'=>'13.5', |
||||
'13'=>'13', |
||||
'12.5'=>'12.5', |
||||
'12'=>'12', |
||||
); |
||||
|
||||
|
||||
|
||||
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); |
||||
$o .= replace_macros($t, array( |
||||
'$submit' => t('Submit'), |
||||
'$baseurl' => $a->get_baseurl(), |
||||
'$title' => t("Theme settings"), |
||||
'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), |
||||
'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), |
||||
)); |
||||
return $o; |
||||
} |
||||
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 293 B |
|
After Width: | Height: | Size: 225 B |
@ -0,0 +1,120 @@
|
||||
<?php |
||||
$line_height=false; |
||||
$diabook_font_size=false; |
||||
$site_line_height = get_config("diabook-aerith","line_height"); |
||||
$site_diabook_font_size = get_config("diabook-aerith", "font_size" ); |
||||
|
||||
if (local_user()) { |
||||
$line_height = get_pconfig(local_user(), "diabook-aerith","line_height"); |
||||
$diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size"); |
||||
} |
||||
|
||||
if ($line_height===false) $line_height=$site_line_height; |
||||
if ($line_height===false) $line_height="1.3"; |
||||
if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; |
||||
if ($diabook_font_size===false) $diabook_font_size="13"; |
||||
|
||||
|
||||
if (file_exists("$THEMEPATH/style.css")){ |
||||
echo file_get_contents("$THEMEPATH/style.css"); |
||||
} |
||||
|
||||
if($diabook_font_size == "14"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 14px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 14px; |
||||
} |
||||
"; |
||||
} |
||||
if($diabook_font_size == "13.5"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 13.5px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 13.5px; |
||||
} |
||||
"; |
||||
} |
||||
if($diabook_font_size == "13"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 13px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 13px; |
||||
} |
||||
"; |
||||
} |
||||
if($diabook_font_size == "12.5"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 12.5px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 12.5px; |
||||
} |
||||
"; |
||||
} |
||||
if($diabook_font_size == "12"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 12px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 12px; |
||||
} |
||||
"; |
||||
} |
||||
if($line_height == "1.4"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
line-height: 1.4; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
line-height: 1.4; |
||||
} |
||||
"; |
||||
} |
||||
if($line_height == "1.3"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
line-height: 1.3; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
line-height: 1.3; |
||||
} |
||||
"; |
||||
} |
||||
if($line_height == "1.2"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
line-height: 1.2; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
line-height: 1.2; |
||||
} |
||||
"; |
||||
} |
||||
if($line_height == "1.1"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
line-height: 1.1; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
line-height: 1.1; |
||||
} |
||||
"; |
||||
} |
||||
@ -0,0 +1,8 @@
|
||||
{{inc field_select.tpl with $field=$font_size}}{{endinc}} |
||||
|
||||
{{inc field_select.tpl with $field=$line_height}}{{endinc}} |
||||
|
||||
<div class="settings-submit-wrapper"> |
||||
<input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" /> |
||||
</div> |
||||
|
||||
@ -0,0 +1,71 @@
|
||||
<?php |
||||
/** |
||||
* Theme settings |
||||
*/ |
||||
|
||||
|
||||
|
||||
function theme_content(&$a){ |
||||
if(!local_user()) |
||||
return; |
||||
|
||||
$font_size = get_pconfig(local_user(), 'diabook-blue', 'font_size' ); |
||||
$line_height = get_pconfig(local_user(), 'diabook-blue', 'line_height' ); |
||||
|
||||
return diabook_form($a,$font_size, $line_height); |
||||
} |
||||
|
||||
function theme_post(&$a){ |
||||
if(! local_user()) |
||||
return; |
||||
|
||||
if (isset($_POST['diabook-blue-settings-submit'])){ |
||||
set_pconfig(local_user(), 'diabook-blue', 'font_size', $_POST['diabook-blue_font_size']); |
||||
set_pconfig(local_user(), 'diabook-blue', 'line_height', $_POST['diabook-blue_line_height']); |
||||
} |
||||
} |
||||
|
||||
|
||||
function theme_admin(&$a){ |
||||
$font_size = get_config('diabook-blue', 'font_size' ); |
||||
$line_height = get_config('diabook-blue', 'line_height' ); |
||||
|
||||
return diabook_form($a,$font_size, $line_height); |
||||
} |
||||
|
||||
function theme_admin_post(&$a){ |
||||
if (isset($_POST['diabook-blue-settings-submit'])){ |
||||
set_config('diabook-blue', 'font_size', $_POST['diabook-blue_font_size']); |
||||
set_config('diabook-blue', 'line_height', $_POST['diabook-blue_line_height']); |
||||
} |
||||
} |
||||
|
||||
|
||||
function diabook_form(&$a, $font_size, $line_height){ |
||||
$line_heights = array( |
||||
"1.4"=>"1.4", |
||||
"1.3"=>"1.3", |
||||
"1.2"=>"1.2", |
||||
"1.1"=>"1.1", |
||||
); |
||||
|
||||
$font_sizes = array( |
||||
'14'=>'14', |
||||
'13.5'=>'13.5', |
||||
'13'=>'13', |
||||
'12.5'=>'12.5', |
||||
'12'=>'12', |
||||
); |
||||
|
||||
|
||||
|
||||
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); |
||||
$o .= replace_macros($t, array( |
||||
'$submit' => t('Submit'), |
||||
'$baseurl' => $a->get_baseurl(), |
||||
'$title' => t("Theme settings"), |
||||
'$font_size' => array('diabook-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), |
||||
'$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), |
||||
)); |
||||
return $o; |
||||
} |
||||
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 293 B |
|
After Width: | Height: | Size: 225 B |
@ -0,0 +1,120 @@
|
||||
<?php |
||||
$line_height=false; |
||||
$diabook_font_size=false; |
||||
$site_line_height = get_config("diabook-blue","line_height"); |
||||
$site_diabook_font_size = get_config("diabook-blue", "font_size" ); |
||||
|
||||
if (local_user()) { |
||||
$line_height = get_pconfig(local_user(), "diabook-blue","line_height"); |
||||
$diabook_font_size = get_pconfig(local_user(), "diabook-blue", "font_size"); |
||||
} |
||||
|
||||
if ($line_height===false) $line_height=$site_line_height; |
||||
if ($line_height===false) $line_height="1.3"; |
||||
if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; |
||||
if ($diabook_font_size===false) $diabook_font_size="13"; |
||||
|
||||
|
||||
if (file_exists("$THEMEPATH/style.css")){ |
||||
echo file_get_contents("$THEMEPATH/style.css"); |
||||
} |
||||
|
||||
if($diabook_font_size == "14"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 14px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 14px; |
||||
} |
||||
"; |
||||
} |
||||
if($diabook_font_size == "13.5"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 13.5px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 13.5px; |
||||
} |
||||
"; |
||||
} |
||||
if($diabook_font_size == "13"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 13px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 13px; |
||||
} |
||||
"; |
||||
} |
||||
if($diabook_font_size == "12.5"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 12.5px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 12.5px; |
||||
} |
||||
"; |
||||
} |
||||
if($diabook_font_size == "12"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
font-size: 12px; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
font-size: 12px; |
||||
} |
||||
"; |
||||
} |
||||
if($line_height == "1.4"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
line-height: 1.4; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
line-height: 1.4; |
||||
} |
||||
"; |
||||
} |
||||
if($line_height == "1.3"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
line-height: 1.3; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
line-height: 1.3; |
||||
} |
||||
"; |
||||
} |
||||
if($line_height == "1.2"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
line-height: 1.2; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
line-height: 1.2; |
||||
} |
||||
"; |
||||
} |
||||
if($line_height == "1.1"){ |
||||
echo " |
||||
.wall-item-container .wall-item-content { |
||||
line-height: 1.1; |
||||
} |
||||
|
||||
.wall-item-photo-container .wall-item-content { |
||||
line-height: 1.1; |
||||
} |
||||
"; |
||||
} |
||||
@ -0,0 +1,8 @@
|
||||
{{inc field_select.tpl with $field=$font_size}}{{endinc}} |
||||
|
||||
{{inc field_select.tpl with $field=$line_height}}{{endinc}} |
||||
|
||||
<div class="settings-submit-wrapper"> |
||||
<input type="submit" value="$submit" class="settings-submit" name="diabook-blue-settings-submit" /> |
||||
</div> |
||||
|
||||
@ -0,0 +1,71 @@
|
||||
<?php |
||||
/** |
||||
* Theme settings |
||||
*/ |
||||
|
||||
|
||||
|
||||
function theme_content(&$a){ |
||||
if(!local_user()) |
||||
return; |
||||
|
||||
$font_size = get_pconfig(local_user(), 'diabook-red', 'font_size' ); |
||||
$line_height = get_pconfig(local_user(), 'diabook-red', 'line_height' ); |
||||
|
||||
return diabook_form($a,$font_size, $line_height); |
||||
} |
||||
|
||||
function theme_post(&$a){ |
||||
if(! local_user()) |
||||
return; |
||||
|
||||
if (isset($_POST['diabook-blue-settings-submit'])){ |
||||
set_pconfig(local_user(), 'diabook-red', 'font_size', $_POST['diabook-red_font_size']); |
||||
set_pconfig(local_user(), 'diabook-red', 'line_height', $_POST['diabook-red_line_height']); |
||||
} |
||||
} |
||||
|
||||
|
||||
function theme_admin(&$a){ |
||||
$font_size = get_config('diabook-red', 'font_size' ); |
||||
$line_height = get_config('diabook-red', 'line_height' ); |
||||
|
||||
return diabook_form($a,$font_size, $line_height); |
||||
} |
||||
|
||||
function theme_admin_post(&$a){ |
||||
if (isset($_POST['diabook-red-settings-submit'])){ |
||||
set_config('diabook-red', 'font_size', $_POST['diabook-red_font_size']); |
||||
set_config('diabook-red', 'line_height', $_POST['diabook-red_line_height']); |
||||
} |
||||
} |
||||
|
||||
|
||||
function diabook_form(&$a, $font_size, $line_height){ |
||||
$line_heights = array( |
||||
"1.4"=>"1.4", |
||||
"1.3"=>"1.3", |
||||
"1.2"=>"1.2", |
||||
"1.1"=>"1.1", |
||||
); |
||||
|
||||
$font_sizes = array( |
||||
'14'=>'14', |
||||
'13.5'=>'13.5', |
||||
'13'=>'13', |
||||
'12.5'=>'12.5', |
||||
'12'=>'12', |
||||
); |
||||
|
||||
|
||||
|
||||
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); |
||||
$o .= replace_macros($t, array( |
||||
'$submit' => t('Submit'), |
||||
'$baseurl' => $a->get_baseurl(), |
||||
'$title' => t("Theme settings"), |
||||
'$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), |
||||
'$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), |
||||
)); |
||||
return $o; |
||||
} |
||||
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 293 B |
|
After Width: | Height: | Size: 225 B |