diabook-themes: small fixes

diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl
index 225a5dd5cbb583e9ee57509c23f252112498b2f0..09fd8da3dc163505ab9e771d3f7efe561ed0c1b3 100644 (file)
--- 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/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
index af183d04dad691b421a14d6833e17de64911e4ee..64201904904c0a7e2439781e933292fbe0e050ee 100755 (executable)
--- 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
old mode 100755 (executable)
new mode 100644 (file)
index 2a30ae2..3fcb95c
Binary files a/view/theme/diabook-aerith/icons/selected.png and b/view/theme/diabook-aerith/icons/selected.png differ

diff --git a/view/theme/diabook-aerith/icons/unselected.png b/view/theme/diabook-aerith/icons/unselected.png
new file mode 100644 (file)
index 0000000..9e9cead
Binary files /dev/null and b/view/theme/diabook-aerith/icons/unselected.png differ

diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl
index fe4baf8d193e7cb72bdea231dc14e1bb1a63613a..5addf38b1478018991f25373e86e9dfcfe648f66 100644 (file)
--- 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.css b/view/theme/diabook-aerith/style.css
index b26c769101848381615b029be052dc1918aeb23d..20e91518aa3b7d53487edf9df2fd20d54ae90056 100644 (file)
--- 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;

diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index a7d20a7ce80e54debd3bc107f5cacd33a128163c..39ea118cffe04d550607682f840c4bc693a303ac 100755 (executable)
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -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/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl
index 225a5dd5cbb583e9ee57509c23f252112498b2f0..09fd8da3dc163505ab9e771d3f7efe561ed0c1b3 100644 (file)
--- 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/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
index af183d04dad691b421a14d6833e17de64911e4ee..64201904904c0a7e2439781e933292fbe0e050ee 100755 (executable)
--- 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
old mode 100755 (executable)
new mode 100644 (file)
index 2a30ae2..3fcb95c
Binary files a/view/theme/diabook-blue/icons/selected.png and b/view/theme/diabook-blue/icons/selected.png differ

diff --git a/view/theme/diabook-blue/icons/unselected.png b/view/theme/diabook-blue/icons/unselected.png
new file mode 100644 (file)
index 0000000..9e9cead
Binary files /dev/null and b/view/theme/diabook-blue/icons/unselected.png differ

diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl
index fe4baf8d193e7cb72bdea231dc14e1bb1a63613a..5addf38b1478018991f25373e86e9dfcfe648f66 100644 (file)
--- 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.css b/view/theme/diabook-blue/style.css
index 1b8fe1e7278ffc7feec20115d557347184438554..5d0833931e41dd72b2c6f40775a04e2371102be2 100644 (file)
--- 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;

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 379f670080f487717618cbcc53c37f5dab104e88..3b74bf1d3c9e7998f94db483db98522694e501ad 100755 (executable)
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -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-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl
index 225a5dd5cbb583e9ee57509c23f252112498b2f0..09fd8da3dc163505ab9e771d3f7efe561ed0c1b3 100644 (file)
--- 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/group_side.tpl b/view/theme/diabook-red/group_side.tpl
index af183d04dad691b421a14d6833e17de64911e4ee..64201904904c0a7e2439781e933292fbe0e050ee 100755 (executable)
--- 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
old mode 100755 (executable)
new mode 100644 (file)
index 2a30ae2..3fcb95c
Binary files a/view/theme/diabook-red/icons/selected.png and b/view/theme/diabook-red/icons/selected.png differ

diff --git a/view/theme/diabook-red/icons/unselected.png b/view/theme/diabook-red/icons/unselected.png
new file mode 100644 (file)
index 0000000..9e9cead
Binary files /dev/null and b/view/theme/diabook-red/icons/unselected.png differ

diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl
index fe4baf8d193e7cb72bdea231dc14e1bb1a63613a..5addf38b1478018991f25373e86e9dfcfe648f66 100644 (file)
--- 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.css b/view/theme/diabook-red/style.css
index 8cca198012be23f797ad1ff3767699236cac6060..7c92590c1f23c9937878e85ca9ec16c83fa68795 100644 (file)
--- 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;

diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 22956f4f9a1f7ca3baa70de51ad6803cf7d703de..69773462f35abd76e9a43702a7a569011a558f59 100755 (executable)
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -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/comment_item.tpl b/view/theme/diabook/comment_item.tpl
index c5231be4087a14ec7d564c8d3862f66f7dd59199..09fd8da3dc163505ab9e771d3f7efe561ed0c1b3 100644 (file)
--- 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/group_side.tpl b/view/theme/diabook/group_side.tpl
index af183d04dad691b421a14d6833e17de64911e4ee..64201904904c0a7e2439781e933292fbe0e050ee 100755 (executable)
--- 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
old mode 100755 (executable)
new mode 100644 (file)
index 2a30ae2..3fcb95c
Binary files a/view/theme/diabook/icons/selected.png and b/view/theme/diabook/icons/selected.png differ

diff --git a/view/theme/diabook/icons/unselected.png b/view/theme/diabook/icons/unselected.png
new file mode 100644 (file)
index 0000000..9e9cead
Binary files /dev/null and b/view/theme/diabook/icons/unselected.png differ

diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
index fe4baf8d193e7cb72bdea231dc14e1bb1a63613a..5addf38b1478018991f25373e86e9dfcfe648f66 100644 (file)
--- 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.css b/view/theme/diabook/style.css
index 8a1a185a1f2f794808847789941eeea1b553b565..6edde2520dfad511f3d19ce9e6a0e649ed6adb36 100644 (file)
--- 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 {

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 612650e900e1a844e3deedf2c5cf4d354d5b2714..a341d01c6c011dc13f66061fc4af91f17cecf89f 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -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) {