Merge pull request #231 from tomtom84/master

fixes in theme diabook

diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php
new file mode 100644 (file)
index 0000000..f4eb7aa
--- /dev/null
+++ b/view/theme/diabook/config.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Theme settings
+ */
+
+
+
+function theme_content(&$a){
+       if(!local_user())
+               return;         
+       
+       $font_size = get_pconfig(local_user(), 'diabook', 'font_size' );
+       $line_height = get_pconfig(local_user(), 'diabook', 'line_height' );
+       
+       return diabook_form($a,$font_size, $line_height);
+}
+
+function theme_post(&$a){
+       if(! local_user())
+               return;
+       
+       if (isset($_POST['diabook-settings-submit'])){
+               set_pconfig(local_user(), 'diabook', 'font_size', $_POST['diabook_font_size']);
+               set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']);
+       }
+}
+
+
+function theme_admin(&$a){
+       $font_size = get_config('diabook', 'font_size' );
+       $line_height = get_config('diabook', 'line_height' );
+       
+       return quattro_form($a,$font_size, $line_height);
+}
+
+function theme_admin_post(&$a){
+       if (isset($_POST['diabook-settings-submit'])){
+               set_config('diabook', 'font_size', $_POST['diabook_font_size']);
+               set_config('diabook', 'line_height', $_POST['diabook_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_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
+               '$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
+       ));
+       return $o;
+}

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index e9fa9d8ba405dad4ba73eb8e1e069562e2b008cd..1e57041e4a01f1b4fd58c980c2294442b986b1dc 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1318,10 +1318,10 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
   margin-bottom: 14px;
 }
 

diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 31e1f056c6bbde11b34d3b599f81795dbd5eed5b..ff39a0456e144381182bd6ef2b11c9f62e8490fc 100644 (file)
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1298,10 +1298,10 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
   margin-bottom: 14px;
 }
 

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 6edde2520dfad511f3d19ce9e6a0e649ed6adb36..e73bd1f577b7eb50d54158d4e12fd4c4eb3f3d66 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1435,17 +1435,17 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.2;
+
   margin-bottom: 14px;
 }
 .wall-item-photo-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.2;
+  
   margin-bottom: 14px;
 }
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php
new file mode 100644 (file)
index 0000000..72e8899
--- /dev/null
+++ b/view/theme/diabook/style.php
@@ -0,0 +1,120 @@
+<?php
+       $line_height=false;
+       $diabook_font_size=false;
+       $site_line_height = get_config("diabook","line_height");
+       $site_diabook_font_size = get_config("diabook", "font_size" );
+       
+       if (local_user()) {
+               $line_height = get_pconfig(local_user(), "diabook","line_height");
+               $diabook_font_size = get_pconfig(local_user(), "diabook", "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;
+                                       }
+               ";
+       }

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index a341d01c6c011dc13f66061fc4af91f17cecf89f..b039e1b826769b95cbdc5605bb96dd7c0c5878a5 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.017)
+ * Version: (Version: 1.018)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.017)";
+$diabook_version = "Diabook (Version: 1.018)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages

diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl
new file mode 100644 (file)
index 0000000..564ecc2
--- /dev/null
+++ b/view/theme/diabook/theme_settings.tpl
@@ -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-settings-submit" />
+</div>
+