diff options
48 files changed, 1085 insertions, 115 deletions
diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl index 225a5dd5c..09fd8da3d 100644 --- a/view/theme/diabook-aerith/comment_item.tpl +++ b/view/theme/diabook-aerith/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> - <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook-aerith/config.php b/view/theme/diabook-aerith/config.php new file mode 100644 index 000000000..afd3119f2 --- /dev/null +++ b/view/theme/diabook-aerith/config.php @@ -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; +} diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook-aerith/group_side.tpl +++ b/view/theme/diabook-aerith/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-aerith/icons/selected.png +++ b/view/theme/diabook-aerith/icons/selected.png diff --git a/view/theme/diabook-aerith/icons/unselected.png b/view/theme/diabook-aerith/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-aerith/icons/unselected.png diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl index fe4baf8d1..5addf38b1 100644 --- a/view/theme/diabook-aerith/nets.tpl +++ b/view/theme/diabook-aerith/nets.tpl @@ -3,7 +3,7 @@ <div id="nets-desc">$desc</div> <ul class="nets-ul"> - <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> {{ for $nets as $net }} <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index b9754ac32..17335389d 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1380,10 +1380,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-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 078b6d01f..3dea20697 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1358,10 +1358,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-aerith/style.css b/view/theme/diabook-aerith/style.css index b26c76910..a9269f21d 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1230,6 +1230,50 @@ aside #likes a:hover{ float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1410,10 +1454,10 @@ body .pageheader{ color: #999; } .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-photo-container .wall-item-content img { @@ -1555,10 +1599,10 @@ 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; } diff --git a/view/theme/diabook-aerith/style.php b/view/theme/diabook-aerith/style.php new file mode 100644 index 000000000..1ae62503c --- /dev/null +++ b/view/theme/diabook-aerith/style.php @@ -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; + } + "; + } diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index a7d20a7ce..53c564a94 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : 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-aerith (Version: 1.017)"; +$diabook_version = "Diabook-aerith (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); @@ -462,10 +462,10 @@ function restore_boxes(){ $a->page['htmlhead'] .= ' <script type="text/javascript"> -function insertFormatting(BBcode,id) { +function insertFormatting(comment,BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == "Kommentar") { + if(tmpStr == comment) { tmpStr = ""; $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); diff --git a/view/theme/diabook-aerith/theme_settings.tpl b/view/theme/diabook-aerith/theme_settings.tpl new file mode 100644 index 000000000..002923a2a --- /dev/null +++ b/view/theme/diabook-aerith/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-aerith-settings-submit" /> +</div> + diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl index 225a5dd5c..09fd8da3d 100644 --- a/view/theme/diabook-blue/comment_item.tpl +++ b/view/theme/diabook-blue/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> - <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook-blue/config.php b/view/theme/diabook-blue/config.php new file mode 100644 index 000000000..3ad88b5bb --- /dev/null +++ b/view/theme/diabook-blue/config.php @@ -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; +} diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook-blue/group_side.tpl +++ b/view/theme/diabook-blue/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-blue/icons/selected.png +++ b/view/theme/diabook-blue/icons/selected.png diff --git a/view/theme/diabook-blue/icons/unselected.png b/view/theme/diabook-blue/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-blue/icons/unselected.png diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl index fe4baf8d1..5addf38b1 100644 --- a/view/theme/diabook-blue/nets.tpl +++ b/view/theme/diabook-blue/nets.tpl @@ -3,7 +3,7 @@ <div id="nets-desc">$desc</div> <ul class="nets-ul"> - <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> {{ for $nets as $net }} <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 021edc45e..2f25372a9 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1342,10 +1342,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-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index ae7fa8d14..f0b4fbd02 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1325,10 +1325,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-blue/style.css b/view/theme/diabook-blue/style.css index 1b8fe1e72..923e63e3e 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1190,6 +1190,50 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1367,10 +1411,10 @@ body .pageheader{ color: #999; } .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-photo-container .wall-item-content img { @@ -1513,10 +1557,10 @@ 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; } diff --git a/view/theme/diabook-blue/style.php b/view/theme/diabook-blue/style.php new file mode 100644 index 000000000..330911b77 --- /dev/null +++ b/view/theme/diabook-blue/style.php @@ -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; + } + "; + } diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 379f67008..844682943 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-blue * Description: Diabook-blue: 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-blue (Version: 1.017)"; +$diabook_version = "Diabook-blue (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -462,10 +462,10 @@ function restore_boxes(){ $a->page['htmlhead'] .= ' <script type="text/javascript"> -function insertFormatting(BBcode,id) { +function insertFormatting(comment,BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == "Kommentar") { + if(tmpStr == comment) { tmpStr = ""; $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); diff --git a/view/theme/diabook-blue/theme_settings.tpl b/view/theme/diabook-blue/theme_settings.tpl new file mode 100644 index 000000000..a40e0e298 --- /dev/null +++ b/view/theme/diabook-blue/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-blue-settings-submit" /> +</div> + diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl index 225a5dd5c..09fd8da3d 100644 --- a/view/theme/diabook-red/comment_item.tpl +++ b/view/theme/diabook-red/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> - <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook-red/config.php b/view/theme/diabook-red/config.php new file mode 100644 index 000000000..0b09a8751 --- /dev/null +++ b/view/theme/diabook-red/config.php @@ -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; +} diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook-red/group_side.tpl +++ b/view/theme/diabook-red/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-red/icons/selected.png +++ b/view/theme/diabook-red/icons/selected.png diff --git a/view/theme/diabook-red/icons/unselected.png b/view/theme/diabook-red/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-red/icons/unselected.png diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl index fe4baf8d1..5addf38b1 100644 --- a/view/theme/diabook-red/nets.tpl +++ b/view/theme/diabook-red/nets.tpl @@ -3,7 +3,7 @@ <div id="nets-desc">$desc</div> <ul class="nets-ul"> - <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> {{ for $nets as $net }} <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index ca32be231..17b7af09b 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1376,10 +1376,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-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 242c08c68..74566d5c5 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1338,10 +1338,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-red/style.css b/view/theme/diabook-red/style.css index 8cca19801..a722dbae9 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1219,6 +1219,50 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1396,10 +1440,10 @@ body .pageheader{ color: #999; } .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-photo-container .wall-item-content img { @@ -1541,10 +1585,10 @@ 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; } diff --git a/view/theme/diabook-red/style.php b/view/theme/diabook-red/style.php new file mode 100644 index 000000000..35b82ee96 --- /dev/null +++ b/view/theme/diabook-red/style.php @@ -0,0 +1,120 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $site_line_height = get_config("diabook-red","line_height"); + $site_diabook_font_size = get_config("diabook-red", "font_size" ); + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook-red","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook-red", "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-red/theme.php b/view/theme/diabook-red/theme.php index 22956f4f9..c7fa77985 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-red * Description: Diabook-red: 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-red (Version: 1.017)"; +$diabook_version = "Diabook-red (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -461,10 +461,10 @@ function restore_boxes(){ $a->page['htmlhead'] .= ' <script type="text/javascript"> -function insertFormatting(BBcode,id) { +function insertFormatting(comment,BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == "Kommentar") { + if(tmpStr == comment) { tmpStr = ""; $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); diff --git a/view/theme/diabook-red/theme_settings.tpl b/view/theme/diabook-red/theme_settings.tpl new file mode 100644 index 000000000..9e83ae8f2 --- /dev/null +++ b/view/theme/diabook-red/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-red-settings-submit" /> +</div> + diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index c5231be40..09fd8da3d 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> - <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php new file mode 100644 index 000000000..25b3c4b54 --- /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 diabook_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/group_side.tpl b/view/theme/diabook/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook/group_side.tpl +++ b/view/theme/diabook/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook/icons/selected.png +++ b/view/theme/diabook/icons/selected.png diff --git a/view/theme/diabook/icons/unselected.png b/view/theme/diabook/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook/icons/unselected.png diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl index fe4baf8d1..5addf38b1 100644 --- a/view/theme/diabook/nets.tpl +++ b/view/theme/diabook/nets.tpl @@ -3,7 +3,7 @@ <div id="nets-desc">$desc</div> <ul class="nets-ul"> - <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> {{ for $nets as $net }} <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index e9fa9d8ba..1e57041e4 100644 --- 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 31e1f056c..ff39a0456 100644 --- 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 8a1a185a1..e73bd1f57 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1241,8 +1241,49 @@ aside #side-peoplefind-url { min-height: 16px; list-style: none; } -.widget .tool.selected { +.group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; } /* widget: search */ #add-search-popup { @@ -1394,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 index 000000000..72e8899d4 --- /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 612650e90..b039e1b82 100755 --- 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 @@ -469,18 +469,19 @@ function restore_boxes(){ } </script>';} + $a->page['htmlhead'] .= ' -<script type="text/javascript"> -function insertFormatting(BBcode,id) { +<script> +function insertFormatting(comment,BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == "Kommentar") { + if(tmpStr == comment) { tmpStr = ""; $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); openMenu("comment-edit-submit-wrapper-" + id); - } + } textarea = document.getElementById("comment-edit-text-" +id); if (document.selection) { diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl new file mode 100644 index 000000000..564ecc283 --- /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> + |
