Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
e71f01b549
48 changed files with 1085 additions and 115 deletions
|
|
@ -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>
|
||||
|
|
|
|||
71
view/theme/diabook-aerith/config.php
Normal file
71
view/theme/diabook-aerith/config.php
Normal file
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
BIN
view/theme/diabook-aerith/icons/selected.png
Executable file → Normal file
BIN
view/theme/diabook-aerith/icons/selected.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 293 B |
BIN
view/theme/diabook-aerith/icons/unselected.png
Normal file
BIN
view/theme/diabook-aerith/icons/unselected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 225 B |
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
120
view/theme/diabook-aerith/style.php
Normal file
120
view/theme/diabook-aerith/style.php
Normal file
|
|
@ -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;
|
||||
}
|
||||
";
|
||||
}
|
||||
|
|
@ -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");
|
||||
|
|
|
|||
8
view/theme/diabook-aerith/theme_settings.tpl
Normal file
8
view/theme/diabook-aerith/theme_settings.tpl
Normal file
|
|
@ -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>
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
71
view/theme/diabook-blue/config.php
Normal file
71
view/theme/diabook-blue/config.php
Normal file
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
BIN
view/theme/diabook-blue/icons/selected.png
Executable file → Normal file
BIN
view/theme/diabook-blue/icons/selected.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 293 B |
BIN
view/theme/diabook-blue/icons/unselected.png
Normal file
BIN
view/theme/diabook-blue/icons/unselected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 225 B |
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
120
view/theme/diabook-blue/style.php
Normal file
120
view/theme/diabook-blue/style.php
Normal file
|
|
@ -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;
|
||||
}
|
||||
";
|
||||
}
|
||||
|
|
@ -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");
|
||||
|
|
|
|||
8
view/theme/diabook-blue/theme_settings.tpl
Normal file
8
view/theme/diabook-blue/theme_settings.tpl
Normal file
|
|
@ -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>
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
71
view/theme/diabook-red/config.php
Normal file
71
view/theme/diabook-red/config.php
Normal file
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
BIN
view/theme/diabook-red/icons/selected.png
Executable file → Normal file
BIN
view/theme/diabook-red/icons/selected.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 293 B |
BIN
view/theme/diabook-red/icons/unselected.png
Normal file
BIN
view/theme/diabook-red/icons/unselected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 225 B |
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
120
view/theme/diabook-red/style.php
Normal file
120
view/theme/diabook-red/style.php
Normal file
|
|
@ -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;
|
||||
}
|
||||
";
|
||||
}
|
||||
|
|
@ -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");
|
||||
|
|
|
|||
8
view/theme/diabook-red/theme_settings.tpl
Normal file
8
view/theme/diabook-red/theme_settings.tpl
Normal file
|
|
@ -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>
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
71
view/theme/diabook/config.php
Normal file
71
view/theme/diabook/config.php
Normal file
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
BIN
view/theme/diabook/icons/selected.png
Executable file → Normal file
BIN
view/theme/diabook/icons/selected.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 293 B |
BIN
view/theme/diabook/icons/unselected.png
Normal file
BIN
view/theme/diabook/icons/unselected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 225 B |
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
120
view/theme/diabook/style.php
Normal file
120
view/theme/diabook/style.php
Normal file
|
|
@ -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;
|
||||
}
|
||||
";
|
||||
}
|
||||
|
|
@ -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,13 +469,14 @@ 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");
|
||||
|
|
|
|||
8
view/theme/diabook/theme_settings.tpl
Normal file
8
view/theme/diabook/theme_settings.tpl
Normal file
|
|
@ -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>
|
||||
|
||||
Loading…
Reference in a new issue