aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/diabook-aerith/comment_item.tpl14
-rw-r--r--view/theme/diabook-aerith/config.php71
-rwxr-xr-xview/theme/diabook-aerith/group_side.tpl16
-rw-r--r--[-rwxr-xr-x]view/theme/diabook-aerith/icons/selected.pngbin211 -> 293 bytes
-rw-r--r--view/theme/diabook-aerith/icons/unselected.pngbin0 -> 225 bytes
-rw-r--r--view/theme/diabook-aerith/nets.tpl2
-rw-r--r--view/theme/diabook-aerith/style-network.css4
-rw-r--r--view/theme/diabook-aerith/style-profile.css4
-rw-r--r--view/theme/diabook-aerith/style.css52
-rw-r--r--view/theme/diabook-aerith/style.php120
-rwxr-xr-xview/theme/diabook-aerith/theme.php8
-rw-r--r--view/theme/diabook-aerith/theme_settings.tpl8
-rw-r--r--view/theme/diabook-blue/comment_item.tpl14
-rw-r--r--view/theme/diabook-blue/config.php71
-rwxr-xr-xview/theme/diabook-blue/group_side.tpl16
-rw-r--r--[-rwxr-xr-x]view/theme/diabook-blue/icons/selected.pngbin211 -> 293 bytes
-rw-r--r--view/theme/diabook-blue/icons/unselected.pngbin0 -> 225 bytes
-rw-r--r--view/theme/diabook-blue/nets.tpl2
-rw-r--r--view/theme/diabook-blue/style-network.css4
-rw-r--r--view/theme/diabook-blue/style-profile.css4
-rw-r--r--view/theme/diabook-blue/style.css52
-rw-r--r--view/theme/diabook-blue/style.php120
-rwxr-xr-xview/theme/diabook-blue/theme.php8
-rw-r--r--view/theme/diabook-blue/theme_settings.tpl8
-rw-r--r--view/theme/diabook-red/comment_item.tpl14
-rw-r--r--view/theme/diabook-red/config.php71
-rwxr-xr-xview/theme/diabook-red/group_side.tpl16
-rw-r--r--[-rwxr-xr-x]view/theme/diabook-red/icons/selected.pngbin211 -> 293 bytes
-rw-r--r--view/theme/diabook-red/icons/unselected.pngbin0 -> 225 bytes
-rw-r--r--view/theme/diabook-red/nets.tpl2
-rw-r--r--view/theme/diabook-red/style-network.css4
-rw-r--r--view/theme/diabook-red/style-profile.css4
-rw-r--r--view/theme/diabook-red/style.css52
-rw-r--r--view/theme/diabook-red/style.php120
-rwxr-xr-xview/theme/diabook-red/theme.php8
-rw-r--r--view/theme/diabook-red/theme_settings.tpl8
-rw-r--r--view/theme/diabook/comment_item.tpl14
-rw-r--r--view/theme/diabook/config.php71
-rwxr-xr-xview/theme/diabook/group_side.tpl16
-rw-r--r--[-rwxr-xr-x]view/theme/diabook/icons/selected.pngbin211 -> 293 bytes
-rw-r--r--view/theme/diabook/icons/unselected.pngbin0 -> 225 bytes
-rw-r--r--view/theme/diabook/nets.tpl2
-rw-r--r--view/theme/diabook/style-network.css4
-rw-r--r--view/theme/diabook/style-profile.css4
-rw-r--r--view/theme/diabook/style.css51
-rw-r--r--view/theme/diabook/style.php120
-rwxr-xr-xview/theme/diabook/theme.php13
-rw-r--r--view/theme/diabook/theme_settings.tpl8
-rw-r--r--view/theme/dispy-dark/default.php6
-rw-r--r--view/theme/dispy-dark/head.tpl4
-rw-r--r--view/theme/dispy-dark/header.tpl0
-rw-r--r--view/theme/dispy-dark/jot-header.tpl2
-rw-r--r--view/theme/dispy-dark/nav.tpl8
-rw-r--r--view/theme/dispy-dark/style.css37
-rw-r--r--view/theme/dispy-dark/theme.php18
-rw-r--r--view/theme/dispy/default.php6
-rw-r--r--view/theme/dispy/head.tpl4
-rw-r--r--view/theme/dispy/icons/scroll_top.pngbin0 -> 539 bytes
-rw-r--r--view/theme/dispy/jot-header.tpl2
-rw-r--r--view/theme/dispy/nav.tpl8
-rw-r--r--view/theme/dispy/style.css37
-rw-r--r--view/theme/dispy/theme.php18
-rw-r--r--view/theme/quattro/TODO2
-rw-r--r--view/theme/quattro/config.php42
-rw-r--r--view/theme/quattro/conversation.tpl7
-rw-r--r--view/theme/quattro/dark/colors.less8
-rw-r--r--view/theme/quattro/dark/style.css130
-rw-r--r--view/theme/quattro/green/colors.less3
-rw-r--r--view/theme/quattro/green/style.css130
-rw-r--r--view/theme/quattro/icons.less3
-rw-r--r--view/theme/quattro/icons/language.pngbin0 -> 849 bytes
-rw-r--r--view/theme/quattro/jot.tpl6
-rw-r--r--view/theme/quattro/nav.tpl2
-rw-r--r--view/theme/quattro/quattro.less106
-rw-r--r--view/theme/quattro/style.php9
-rw-r--r--view/theme/quattro/theme.php12
-rw-r--r--view/theme/quattro/wall_item_tag.tpl23
77 files changed, 1518 insertions, 315 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
index 2a30ae252..3fcb95c29 100755..100644
--- a/view/theme/diabook-aerith/icons/selected.png
+++ b/view/theme/diabook-aerith/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/unselected.png b/view/theme/diabook-aerith/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/unselected.png
Binary files differ
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
index 2a30ae252..3fcb95c29 100755..100644
--- a/view/theme/diabook-blue/icons/selected.png
+++ b/view/theme/diabook-blue/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/unselected.png b/view/theme/diabook-blue/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook-blue/icons/unselected.png
Binary files differ
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
index 2a30ae252..3fcb95c29 100755..100644
--- a/view/theme/diabook-red/icons/selected.png
+++ b/view/theme/diabook-red/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/unselected.png b/view/theme/diabook-red/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook-red/icons/unselected.png
Binary files differ
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
index 2a30ae252..3fcb95c29 100755..100644
--- a/view/theme/diabook/icons/selected.png
+++ b/view/theme/diabook/icons/selected.png
Binary files differ
diff --git a/view/theme/diabook/icons/unselected.png b/view/theme/diabook/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook/icons/unselected.png
Binary files differ
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>
+
diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php
index 32393f08d..b02f41947 100644
--- a/view/theme/dispy-dark/default.php
+++ b/view/theme/dispy-dark/default.php
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
- <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <title><?php if(x($page,'title')) echo $page['title']; ?></title>
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
- <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
</head>
<body>
<header>
- <!-- header stuff will go here -->
+ <?php if(x($page, 'header')) echo $page['header']; ?>
</header>
<article id="articlemain">
<?php if(x($page,'nav')) echo $page['nav']; ?>
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
index cd6f5ca97..d1bdc256b 100644
--- a/view/theme/dispy-dark/head.tpl
+++ b/view/theme/dispy-dark/head.tpl
@@ -91,8 +91,4 @@
$('#hide-comments-' + id).html('$showfewer');
}
}
-
-
</script>
-
-
diff --git a/view/theme/dispy-dark/header.tpl b/view/theme/dispy-dark/header.tpl
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/view/theme/dispy-dark/header.tpl
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 5838729cc..44120da40 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -36,7 +36,7 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
+ force_p_newlines : true,
force_br_newlines : true,
forced_root_block : '',
convert_urls: false,
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index 34aba50de..b58ae7e3a 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -4,7 +4,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
-
+<a name="top" id="top"></a>
<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
@@ -116,6 +116,12 @@ works -->
$langselector
</div>
+<div id="scrollup">
+<a href="#top"><img
+ src="view/theme/dispy/icons/scroll_top.png"
+ alt="back to top" title="Back to top" /></a>
+</div>
+
<div class="search-box">
<form method="get" action="$nav.search.0">
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 68d7e230f..a87317d9b 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -311,6 +311,7 @@ ul#user-menu-popup {
-webkit-border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
+ box-shadow: 5px 10px 10px 0 #111;
z-index: 10000;
}
ul#user-menu-popup li {
@@ -543,7 +544,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
width: 10em;
color: #eec;
}
+#scrollup {
+ position: fixed;
+ right: 5px;
+ bottom: 40px;
+ z-index: 100;
+}
+#scrollup a:hover {
+ text-decoration: none;
+ border: 0;
+}
#user-menu {
+ box-shadow: 5px 0 10px 0 #111;
display: block;
width: 75%;
margin: 3px 0 0 0;
@@ -880,12 +892,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
line-height: 20px;
padding: 2px 20px 5px 0;
}
+#profile-jot-text_parent {
+ /*border-radius: 10px;*/
+ box-shadow: 5px 0 10px 0 #111;
+}
#profile-jot-text_tbl {
margin-bottom: 10px;
+ /*border-radius: 10px;*/
+ background: #888;
}
#profile-jot-text_ifr {
width:99.900002% !important;
}
+#profile-jot-text_toolbargroup {
+ background: #888;
+}
+.mceCenter table tr {
+ background: #888;
+}
[id$="jot-text_ifr"] {
width: 99.900002% !important;
color: #2e2f2e;
@@ -895,6 +919,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: #2e2f2e;
background: #eec;
}
+.mceFirst tr {
+ background: #888;
+}
+.mceFirst td {
+ /*border-radius: 10px 10px 0px 0px;*/
+}
+.mceLast td {
+ /*border-radius: 0 0 10px 10px;*/
+}
#profile-attach-wrapper,
#profile-audio-wrapper,
#profile-link-wrapper,
@@ -1121,6 +1154,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.wall-item-outside-wrapper {
border: 1px solid #aaa;
border-radius: 5px;
+ box-shadow: 5px 0 10px 0 #111;
}
.wall-item-outside-wrapper.comment {
margin-top: 5px;
@@ -1946,7 +1980,7 @@ div[id$="wrapper"] br {
position: absolute;
text-decoration: none;
top: 113px;
- right: 250px;
+ right: 260px;
}
#profile-edit-links ul {
margin: 20px 0;
@@ -2812,6 +2846,7 @@ footer {
background: #fff url("../../../images/search_18.png") no-repeat right center;
padding-right: 20px;
margin: 6px;
+ color: #111;
}
#acl-showall {
float: left;
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index c9028b9a9..affffc9cb 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -114,11 +114,27 @@ function dispy_dark_init(&$a) {
return false;
});
- // (attempt) to change the text colour in a top post
+ // (attempt to) change the text colour in a top post
$('#profile-jot-text').focusin(function() {
$(this).css({color: '#eec'});
});
+ $('a[href=#top]').click(function() {
+ $('html, body').animate({scrollTop:0}, '500');
+ return false;
+ });
+
+ });
+ // shadowing effect for floating toolbars
+ $(document).scroll(function(e) {
+ var pageTop = $('html').scrollTop();
+ if (pageTop) {
+ $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
+ $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
+ } else {
+ $('#nav-floater').css({boxShadow: '0 0 0 0'});
+ $('.search-box').css({boxShadow: '0 0 0 0'});
+ }
});
</script>
EOT;
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php
index 32393f08d..b02f41947 100644
--- a/view/theme/dispy/default.php
+++ b/view/theme/dispy/default.php
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
- <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <title><?php if(x($page,'title')) echo $page['title']; ?></title>
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
- <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
</head>
<body>
<header>
- <!-- header stuff will go here -->
+ <?php if(x($page, 'header')) echo $page['header']; ?>
</header>
<article id="articlemain">
<?php if(x($page,'nav')) echo $page['nav']; ?>
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index cd6f5ca97..d1bdc256b 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -91,8 +91,4 @@
$('#hide-comments-' + id).html('$showfewer');
}
}
-
-
</script>
-
-
diff --git a/view/theme/dispy/icons/scroll_top.png b/view/theme/dispy/icons/scroll_top.png
new file mode 100644
index 000000000..fa6736086
--- /dev/null
+++ b/view/theme/dispy/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 5838729cc..44120da40 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -36,7 +36,7 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : false,
+ force_p_newlines : true,
force_br_newlines : true,
forced_root_block : '',
convert_urls: false,
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 34aba50de..b58ae7e3a 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -4,7 +4,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
-
+<a name="top" id="top"></a>
<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
@@ -116,6 +116,12 @@ works -->
$langselector
</div>
+<div id="scrollup">
+<a href="#top"><img
+ src="view/theme/dispy/icons/scroll_top.png"
+ alt="back to top" title="Back to top" /></a>
+</div>
+
<div class="search-box">
<form method="get" action="$nav.search.0">
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 66d19e091..47e1d1132 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -312,6 +312,7 @@ ul#user-menu-popup {
-webkit-border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
+ box-shadow: 5px 10px 10px 0 #111;
z-index: 10000;
}
ul#user-menu-popup li {
@@ -544,7 +545,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
width: 10em;
color: #eec;
}
+#scrollup {
+ position: fixed;
+ right: 5px;
+ bottom: 40px;
+ z-index: 100;
+}
+#scrollup a:hover {
+ text-decoration: none;
+ border: 0;
+}
#user-menu {
+ box-shadow: 5px 0 10px 0 #111;
display: block;
width: 75%;
margin: 3px 0 0 0;
@@ -881,12 +893,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
line-height: 20px;
padding: 2px 20px 5px 0;
}
+#profile-jot-text_parent {
+ /*border-radius: 10px;*/
+ box-shadow: 5px 0 10px 0 #111;
+}
#profile-jot-text_tbl {
margin-bottom: 10px;
+ /*border-radius: 10px;*/
+ background: #888;
}
#profile-jot-text_ifr {
width:99.900002% !important;
}
+#profile-jot-text_toolbargroup {
+ background: #888;
+}
+.mceCenter table tr {
+ background: #888;
+}
[id$="jot-text_ifr"] {
width: 99.900002% !important;
color: #2e2f2e;
@@ -896,6 +920,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: #2e2f2e;
background: #eec;
}
+.mceFirst tr {
+ background: #888;
+}
+.mceFirst td {
+ /*border-radius: 10px 10px 0px 0px;*/
+}
+.mceLast td {
+ /*border-radius: 0 0 10px 10px;*/
+}
#profile-attach-wrapper,
#profile-audio-wrapper,
#profile-link-wrapper,
@@ -1122,6 +1155,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.wall-item-outside-wrapper {
border: 1px solid #aaa;
border-radius: 5px;
+ box-shadow: 5px 0 10px 0 #999;
}
.wall-item-outside-wrapper.comment {
margin-top: 5px;
@@ -1947,7 +1981,7 @@ div[id$="wrapper"] br {
position: absolute;
text-decoration: none;
top: 113px;
- right: 250px;
+ right: 260px;
}
#profile-edit-links ul {
margin: 20px 0;
@@ -2813,6 +2847,7 @@ footer {
background: #fff url("../../../images/search_18.png") no-repeat right center;
padding-right: 20px;
margin: 6px;
+ color: #111;
}
#acl-showall {
float: left;
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 5df193aa6..8af61d78b 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -114,11 +114,27 @@ function dispy_init(&$a) {
return false;
});
- // (attempt) to change the text colour in a top post
+ // (attempt to) change the text colour in a top post
$('#profile-jot-text').focusin(function() {
$(this).css({color: '#eec'});
});
+ $('a[href=#top]').click(function() {
+ $('html, body').animate({scrollTop:0}, '500');
+ return false;
+ });
+
+ });
+ // shadowing effect for floating toolbars
+ $(document).scroll(function(e) {
+ var pageTop = $('html').scrollTop();
+ if (pageTop) {
+ $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
+ $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
+ } else {
+ $('#nav-floater').css({boxShadow: '0 0 0 0'});
+ $('.search-box').css({boxShadow: '0 0 0 0'});
+ }
});
</script>
EOT;
diff --git a/view/theme/quattro/TODO b/view/theme/quattro/TODO
new file mode 100644
index 000000000..12638551a
--- /dev/null
+++ b/view/theme/quattro/TODO
@@ -0,0 +1,2 @@
+jot.tpl: <!-- TODO: waiting for a better placement
+nav.tpl: <!-- TODO: better icons! -->
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index c9ab3a4a1..c261a78ec 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -11,6 +11,37 @@ function theme_content(&$a){
$align = get_pconfig(local_user(), 'quattro', 'align' );
$color = get_pconfig(local_user(), 'quattro', 'color' );
+
+ return quattro_form($a,$align, $color);
+}
+
+function theme_post(&$a){
+ if(! local_user())
+ return;
+
+ if (isset($_POST['quattro-settings-submit'])){
+ set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
+ set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
+ }
+}
+
+
+function theme_admin(&$a){
+ $align = get_config('quattro', 'align' );
+ $color = get_config('quattro', 'color' );
+
+ return quattro_form($a,$align, $color);
+}
+
+function theme_admin_post(&$a){
+ if (isset($_POST['quattro-settings-submit'])){
+ set_config('quattro', 'align', $_POST['quattro_align']);
+ set_config('quattro', 'color', $_POST['quattro_color']);
+ }
+}
+
+
+function quattro_form(&$a, $align, $color){
$colors = array(
"dark"=>"Quattro",
"green"=>"Green"
@@ -26,14 +57,3 @@ function theme_content(&$a){
));
return $o;
}
-
-function theme_post(&$a){
- if(! local_user())
- return;
-
- if (isset($_POST['quattro-settings-submit'])){
- set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
- set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
- }
-}
-
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
index ff202bbe4..7bb7cd2fd 100644
--- a/view/theme/quattro/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
@@ -9,8 +9,11 @@
{{endif}}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
- {{ inc $item.template }}{{ endinc }}
-
+ {{ if $item.type == tag }}
+ {{ inc wall_item_tag.tpl }}{{ endinc }}
+ {{ else }}
+ {{ inc $item.template }}{{ endinc }}
+ {{ endif }}
{{ endfor }}
</div>
diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less
index b6d487f92..42fdd34bb 100644
--- a/view/theme/quattro/dark/colors.less
+++ b/view/theme/quattro/dark/colors.less
@@ -38,7 +38,7 @@
@Link: @Blue3;
@LinkHover: @Blue3;
@LinkVisited: @Blue3;
-
+@LinkDimmed: @Blue2;
@ButtonColor: @Grey1;
@ButtonBackgroundColor: @Grey5;
@@ -73,9 +73,13 @@
@FieldHelpColor: @Grey3;
-@ThreadBackgroundColor: #f6f7f8;
+@ThreadBackgroundColor: #eff0f1;
+@ThreadBottomBorderColor: @Grey2;
@ShinyBorderColor: @Yellow1;
+@ItemColor: @Grey5;
+@ItemColorDimmed: @Grey3;
+
@CommentBoxEmptyColor: @Grey3;
@CommentBoxEmptyBorderColor: @Grey3;
@CommentBoxFullColor: @Grey5;
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 16c786d20..1fa03b253 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -66,6 +66,9 @@
.icon.s10.type-text {
background-image: url("../../../images/icons/10/text.png");
}
+.icon.s10.language {
+ background-image: url("icons/language.png");
+}
.icon.s10.text {
padding: 2px 0px 0px 15px;
}
@@ -121,6 +124,9 @@
.icon.s16.type-text {
background-image: url("../../../images/icons/16/text.png");
}
+.icon.s16.language {
+ background-image: url("icons/language.png");
+}
.icon.s16.text {
padding: 4px 0px 0px 20px;
}
@@ -176,6 +182,9 @@
.icon.s22.type-text {
background-image: url("../../../images/icons/22/text.png");
}
+.icon.s22.language {
+ background-image: url("icons/language.png");
+}
.icon.s22.text {
padding: 10px 0px 0px 25px;
}
@@ -231,6 +240,9 @@
.icon.s48.type-text {
background-image: url("../../../images/icons/48/text.png");
}
+.icon.s48.language {
+ background-image: url("icons/language.png");
+}
/* global */
body {
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -314,6 +326,10 @@ code {
float: right;
}
/* popup notifications */
+#jGrowl.top-right {
+ top: 30px;
+ right: 15px;
+}
div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff;
@@ -565,7 +581,7 @@ ul.menu-popup .toolbar a:hover {
color: #9eabb0;
display: block;
}
-/* aside */
+/* aside 230px*/
aside {
display: table-cell;
vertical-align: top;
@@ -772,20 +788,21 @@ aside #profiles-menu {
width: 200px;
top: 18px;
}
-/* section */
+/* section 800px */
section {
display: table-cell;
vertical-align: top;
- width: 800px;
+ width: 770px;
padding: 0px 20px 0px 10px;
}
/* wall item */
.tread-wrapper {
- background-color: #f6f7f8;
+ background-color: #eff0f1;
position: relative;
padding: 10px;
margin-bottom: 20px;
- width: 780px;
+ width: 750px;
+ border-bottom: 1px solid #cccccc;
}
.wall-item-decor {
position: absolute;
@@ -798,7 +815,7 @@ section {
}
.wall-item-container {
display: table;
- width: 780px;
+ width: 750px;
}
.wall-item-container .wall-item-item,
.wall-item-container .wall-item-bottom {
@@ -890,26 +907,42 @@ section {
.wall-item-container .wall-item-actions-tools input {
float: right;
}
-.wall-item-container.comment {
- /*margin-top: 50px;*/
-
+.wall-item-container.comment .contact-photo-wrapper {
+ margin-left: 16px;
}
.wall-item-container.comment .contact-photo {
width: 32px;
height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
}
.wall-item-container.comment .contact-photo-menu-button {
top: 15px !important;
- left: 15px !important;
+ left: 0px !important;
}
.wall-item-container.comment .wall-item-links {
padding-left: 12px;
}
+/* 'tag' item type */
+.wall-item-container.item-tag .wall-item-content {
+ opacity: 0.5;
+ -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;
+}
+.wall-item-container.item-tag .contact-photo-wrapper {
+ margin-left: 32px;
+}
+.wall-item-container.item-tag .contact-photo {
+ width: 16px;
+ height: 16px;
+}
+.wall-item-container.item-tag .contact-photo-menu-button {
+ top: 15px !important;
+ left: 15px !important;
+}
.wall-item-comment-wrapper {
- margin: 30px 2em 2em 60px;
+ margin: 1em 2em 1em 60px;
}
.wall-item-comment-wrapper .comment-edit-photo {
display: none;
@@ -961,6 +994,9 @@ section {
#jot-preview-content .tread-wrapper {
background-color: #fce94f;
}
+.hide-comments-outer {
+ margin-bottom: 0.8em;
+}
.wall-item-tags {
padding-top: 5px;
}
@@ -1087,7 +1123,7 @@ section {
padding: 0px;
height: 40px;
overflow: none;
- width: 800px;
+ width: 770px;
background-color: #0e232e;
border-bottom: 2px solid #9eabb0;
}
@@ -1162,7 +1198,7 @@ section {
border: 0px;
margin: 0px;
height: 20px;
- width: 700px;
+ width: 500px;
font-weight: bold;
border: 1px solid #ffffff;
}
@@ -1179,13 +1215,26 @@ section {
border: 1px solid #999999;
}
#jot #character-counter {
- width: 80px;
+ width: 40px;
float: right;
text-align: right;
height: 20px;
line-height: 20px;
padding-right: 20px;
}
+#jot #jot-category {
+ border: 0px;
+ margin: 0px;
+ height: 20px;
+ width: 200px;
+ border: 1px solid #ffffff;
+}
+#jot #jot-category:hover {
+ border: 1px solid #999999;
+}
+#jot #jot-category:focus {
+ border: 1px solid #999999;
+}
/** buttons **/
/*input[type="submit"] {
border: 0px;
@@ -1592,44 +1641,19 @@ ul.tabs li .active {
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
-/* mail view */
-/*
-.mail-conv-sender,
-.mail-conv-detail {
- float: left;
-}
-.mail-conv-detail {
- margin-left: 20px;
- width: 500px;
-}
-
-.mail-conv-subject {
- font-size: 1.4em;
- margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
- clear: both;
-}
-
-.mail-conv-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-.mail-conv-break {
- clear: both;
+/* theme screenshot */
+.screenshot,
+#theme-preview {
+ position: absolute;
+ width: 202px;
+ left: 70%;
+ top: 50px;
}
-
-.mail-conv-delete-icon {
- border: none;
+.screenshot img,
+#theme-preview img {
+ width: 200px;
+ height: 150px;
}
-
-*/
/* page footer */
footer {
height: 100px;
diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less
index bc78c3fda..1f1df4c55 100644
--- a/view/theme/quattro/green/colors.less
+++ b/view/theme/quattro/green/colors.less
@@ -74,7 +74,8 @@
@FieldHelpColor: @Grey3;
-@ThreadBackgroundColor: #f6f7f8;
+@ThreadBackgroundColor: #eff0f1;
+@ThreadBottomBorderColor: @Grey2;
@ShinyBorderColor: @Green4;
@CommentBoxEmptyColor: @Grey3;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index df43aa152..317112f6f 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -66,6 +66,9 @@
.icon.s10.type-text {
background-image: url("../../../images/icons/10/text.png");
}
+.icon.s10.language {
+ background-image: url("icons/language.png");
+}
.icon.s10.text {
padding: 2px 0px 0px 15px;
}
@@ -121,6 +124,9 @@
.icon.s16.type-text {
background-image: url("../../../images/icons/16/text.png");
}
+.icon.s16.language {
+ background-image: url("icons/language.png");
+}
.icon.s16.text {
padding: 4px 0px 0px 20px;
}
@@ -176,6 +182,9 @@
.icon.s22.type-text {
background-image: url("../../../images/icons/22/text.png");
}
+.icon.s22.language {
+ background-image: url("icons/language.png");
+}
.icon.s22.text {
padding: 10px 0px 0px 25px;
}
@@ -231,6 +240,9 @@
.icon.s48.type-text {
background-image: url("../../../images/icons/48/text.png");
}
+.icon.s48.language {
+ background-image: url("icons/language.png");
+}
/* global */
body {
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -314,6 +326,10 @@ code {
float: right;
}
/* popup notifications */
+#jGrowl.top-right {
+ top: 30px;
+ right: 15px;
+}
div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff;
@@ -565,7 +581,7 @@ ul.menu-popup .toolbar a:hover {
color: #9eabb0;
display: block;
}
-/* aside */
+/* aside 230px*/
aside {
display: table-cell;
vertical-align: top;
@@ -772,20 +788,21 @@ aside #profiles-menu {
width: 200px;
top: 18px;
}
-/* section */
+/* section 800px */
section {
display: table-cell;
vertical-align: top;
- width: 800px;
+ width: 770px;
padding: 0px 20px 0px 10px;
}
/* wall item */
.tread-wrapper {
- background-color: #f6f7f8;
+ background-color: #eff0f1;
position: relative;
padding: 10px;
margin-bottom: 20px;
- width: 780px;
+ width: 750px;
+ border-bottom: 1px solid #cccccc;
}
.wall-item-decor {
position: absolute;
@@ -798,7 +815,7 @@ section {
}
.wall-item-container {
display: table;
- width: 780px;
+ width: 750px;
}
.wall-item-container .wall-item-item,
.wall-item-container .wall-item-bottom {
@@ -890,26 +907,42 @@ section {
.wall-item-container .wall-item-actions-tools input {
float: right;
}
-.wall-item-container.comment {
- /*margin-top: 50px;*/
-
+.wall-item-container.comment .contact-photo-wrapper {
+ margin-left: 16px;
}
.wall-item-container.comment .contact-photo {
width: 32px;
height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
}
.wall-item-container.comment .contact-photo-menu-button {
top: 15px !important;
- left: 15px !important;
+ left: 0px !important;
}
.wall-item-container.comment .wall-item-links {
padding-left: 12px;
}
+/* 'tag' item type */
+.wall-item-container.item-tag .wall-item-content {
+ opacity: 0.5;
+ -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;
+}
+.wall-item-container.item-tag .contact-photo-wrapper {
+ margin-left: 32px;
+}
+.wall-item-container.item-tag .contact-photo {
+ width: 16px;
+ height: 16px;
+}
+.wall-item-container.item-tag .contact-photo-menu-button {
+ top: 15px !important;
+ left: 15px !important;
+}
.wall-item-comment-wrapper {
- margin: 30px 2em 2em 60px;
+ margin: 1em 2em 1em 60px;
}
.wall-item-comment-wrapper .comment-edit-photo {
display: none;
@@ -961,6 +994,9 @@ section {
#jot-preview-content .tread-wrapper {
background-color: #ddffdd;
}
+.hide-comments-outer {
+ margin-bottom: 0.8em;
+}
.wall-item-tags {
padding-top: 5px;
}
@@ -1087,7 +1123,7 @@ section {
padding: 0px;
height: 40px;
overflow: none;
- width: 800px;
+ width: 770px;
background-color: #009100;
border-bottom: 2px solid #9eabb0;
}
@@ -1162,7 +1198,7 @@ section {
border: 0px;
margin: 0px;
height: 20px;
- width: 700px;
+ width: 500px;
font-weight: bold;
border: 1px solid #ffffff;
}
@@ -1179,13 +1215,26 @@ section {
border: 1px solid #999999;
}
#jot #character-counter {
- width: 80px;
+ width: 40px;
float: right;
text-align: right;
height: 20px;
line-height: 20px;
padding-right: 20px;
}
+#jot #jot-category {
+ border: 0px;
+ margin: 0px;
+ height: 20px;
+ width: 200px;
+ border: 1px solid #ffffff;
+}
+#jot #jot-category:hover {
+ border: 1px solid #999999;
+}
+#jot #jot-category:focus {
+ border: 1px solid #999999;
+}
/** buttons **/
/*input[type="submit"] {
border: 0px;
@@ -1592,44 +1641,19 @@ ul.tabs li .active {
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
-/* mail view */
-/*
-.mail-conv-sender,
-.mail-conv-detail {
- float: left;
-}
-.mail-conv-detail {
- margin-left: 20px;
- width: 500px;
-}
-
-.mail-conv-subject {
- font-size: 1.4em;
- margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
- clear: both;
-}
-
-.mail-conv-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-.mail-conv-break {
- clear: both;
+/* theme screenshot */
+.screenshot,
+#theme-preview {
+ position: absolute;
+ width: 202px;
+ left: 70%;
+ top: 50px;
}
-
-.mail-conv-delete-icon {
- border: none;
+.screenshot img,
+#theme-preview img {
+ width: 200px;
+ height: 150px;
}
-
-*/
/* page footer */
footer {
height: 100px;
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index 3688ae021..24e96b5aa 100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -19,6 +19,9 @@
&.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); }
&.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); }
&.type-text { background-image: url("../../../images/icons/@{size}/text.png"); }
+
+ &.language { background-image: url("icons/language.png"); }
+
}
diff --git a/view/theme/quattro/icons/language.png b/view/theme/quattro/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/quattro/icons/language.png
Binary files differ
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
index 2f89d4372..95c0ff6b1 100644
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
@@ -1,8 +1,10 @@
<form id="profile-jot-form" action="$action" method="post">
<div id="jot">
<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
- <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+ <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" title="$placeholdertitle" value="$title" class="jothidden" style="display:none" /><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" title="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
<div id="character-counter" class="grey jothidden"></div>
+
+
<input type="hidden" name="type" value="$ptyp" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
@@ -20,8 +22,10 @@
<li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
+ <!-- TODO: waiting for a better placement
<li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
+ -->
<li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
$jotplugins
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
index 26f04f134..af1fc9414 100644
--- a/view/theme/quattro/nav.tpl
+++ b/view/theme/quattro/nav.tpl
@@ -43,6 +43,7 @@
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
<span id="notify-update" class="nav-notify"></span>
<ul id="nav-notifications-menu" class="menu-popup">
+ <!-- TODO: better icons! -->
<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li>
<li class="empty">$emptynotifications</li>
</ul>
@@ -91,3 +92,4 @@
<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul>
+<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 0660a3ad7..4c3279943 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -87,6 +87,10 @@ code {
/* popup notifications */
+#jGrowl.top-right {
+ top: 30px;
+ right: 15px;
+}
div.jGrowl div.notice {
background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: @NoticeColor;
@@ -270,7 +274,7 @@ ul.menu-popup {
-/* aside */
+/* aside 230px*/
aside {
display: table-cell;
vertical-align: top;
@@ -403,11 +407,11 @@ aside {
}
-/* section */
+/* section 800px */
section {
display: table-cell;
vertical-align: top;
- width: 800px;
+ width: 770px;
padding:0px 20px 0px 10px;
}
@@ -417,14 +421,15 @@ section {
position: relative;
padding: 10px;
margin-bottom: 20px;
- width: 780px;
+ width: 750px;
+ border-bottom: 1px solid @ThreadBottomBorderColor;
}
.wall-item-decor { position: absolute; left: 97%; top: -10px; width: 16px;}
.unstarred { display: none; }
.wall-item-container {
display: table;
- width: 780px;
+ width: 750px;
.wall-item-item,
.wall-item-bottom { display: table-row; }
@@ -478,19 +483,35 @@ section {
.wall-item-container.comment {
- /*margin-top: 50px;*/
- .contact-photo { width: 32px; height: 32px; margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+ .contact-photo-wrapper { margin-left: 16px; }
+ .contact-photo {
+ width: 32px; height: 32px;
}
.contact-photo-menu-button {
top: 15px !important;
- left: 15px !important;
+ left: 0px !important;
}
.wall-item-links { padding-left: 12px; }
}
+/* 'tag' item type */
+.wall-item-container.item-tag {
+ .wall-item-content {
+ .opaque(0.5);
+ }
+ .contact-photo-wrapper { margin-left: 32px; }
+ .contact-photo {
+ width: 16px; height: 16px;
+ }
+ .contact-photo-menu-button {
+ top: 15px !important;
+ left: 15px !important;
+ }
+}
+
+
.wall-item-comment-wrapper {
- margin: 30px 2em 2em 60px;
+ margin: 1em 2em 1em 60px;
.comment-edit-photo { display: none; }
textarea {
height: 1em; width: 100%; font-size: 10px;
@@ -522,13 +543,12 @@ section {
.wall-item-container { width: 700px; }
.tread-wrapper { width: 700px; padding: 0; margin: 10px 0;}
-
-
}
.shiny { border-right:10px solid @ShinyBorderColor; }
#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; }
+.hide-comments-outer {margin-bottom: 0.8em; }
.wall-item-tags { padding-top: 5px; }
.tag {
@@ -638,7 +658,7 @@ section {
#jot-tools {
margin: 0px; padding: 0px;
height: 40px; overflow: none;
- width: 800px;
+ width: 770px;
background-color: @JotToolsBackgroundColor;
border-bottom: 2px solid @JotToolsBorderColor;
li {
@@ -710,7 +730,7 @@ section {
border: 0px;
margin: 0px;
height: 20px;
- width: 700px;
+ width: 500px;
font-weight: bold;
border: 1px solid @BodyBackground;
@@ -727,14 +747,23 @@ section {
}
#character-counter {
- width: 80px;
+ width: 40px;
float: right;
text-align: right;
height: 20px;
line-height: 20px;
padding-right: 20px;
}
-
+
+ #jot-category {
+ border: 0px;
+ margin: 0px;
+ height: 20px;
+ width: 200px;
+ border: 1px solid @BodyBackground;
+ &:hover { border: 1px solid @CommentBoxEmptyBorderColor }
+ &:focus { border: 1px solid @CommentBoxEmptyBorderColor }
+ }
}
@@ -1106,46 +1135,15 @@ ul.tabs {
}
-/* mail view */
-/*
-.mail-conv-sender,
-.mail-conv-detail {
- float: left;
-}
-.mail-conv-detail {
- margin-left: 20px;
- width: 500px;
-}
-
-.mail-conv-subject {
- font-size: 1.4em;
- margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
- clear: both;
-}
-
-.mail-conv-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-.mail-conv-break {
- clear: both;
-}
-
-.mail-conv-delete-icon {
- border: none;
+/* theme screenshot */
+.screenshot, #theme-preview {
+ position: absolute;
+ width:202px;
+ left: 70%;
+ top: 50px;
+ img { width: 200px; height: 150px; }
}
-*/
-
-
/* page footer */
footer { height: 100px; display: table-row; }
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index b6104a170..fa02a04b6 100644
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -1,11 +1,18 @@
<?php
- $color = false;
+ $color=false;
+ $quattro_align=false;
+ $site_color = get_config("quattro","color");
+ $site_quattro_align = get_config("quattro", "align" );
+
if (local_user()) {
$color = get_pconfig(local_user(), "quattro","color");
$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
}
+ if ($color===false) $color=$site_color;
if ($color===false) $color="dark";
+ if ($quattro_align===false) $quattro_align=$site_quattro_align;
+
if (file_exists("$THEMEPATH/$color/style.css")){
echo file_get_contents("$THEMEPATH/$color/style.css");
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
new file mode 100644
index 000000000..0a13c2035
--- /dev/null
+++ b/view/theme/quattro/theme.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Name: Quattro
+ * Version: 0.5
+ * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
+ * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
+ * Maintainer: Tobias <https://diekershoff.homeunix.net/friendika/profile/tobias>
+ */
+
+ $a->theme_info = array();
+
+
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
new file mode 100644
index 000000000..926fc929d
--- /dev/null
+++ b/view/theme/quattro/wall_item_tag.tpl
@@ -0,0 +1,23 @@
+<div class="wall-item-container item-tag $item.indent">
+ <div class="wall-item-item">
+ <div class="wall-item-info">
+ <div class="contact-photo-wrapper">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+ </a>
+ <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+ $item.item_photo_menu
+ </ul>
+
+ </div>
+ <div class="wall-item-location">$item.location</div>
+ </div>
+ <div class="wall-item-content">
+ $item.body
+ </div>
+ </div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+ $item.comment
+</div>