Merge pull request #2053 from annando/1511-only-supported-themes

Only show supported themes on the admin site.

diff --git a/js/main.js b/js/main.js
index 572a6ebfe16e631c712c61cae1717c0e5d4502a7..df454afe1fb8bbccdf1aa86fafe9486917da74c0 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -153,7 +153,7 @@
                var notifications_empty = unescape($("#nav-notifications-menu").html());
 
                /* nav update event  */
-               $('nav').bind('nav-update', function(e,data){;
+               $('nav').bind('nav-update', function(e,data){
                        var invalid = $(data).find('invalid').text();
                        if(invalid == 1) { window.location.href=window.location.href }
 
@@ -203,6 +203,13 @@
                        var birthdaystoday = $(data).find('birthdays-today').text();
                        if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') }
 
+                       $(".sidebar-group-li .notify").removeClass("show");
+                       $(data).find("group").each(function() {
+                               var gid = this.id;
+                               var gcount = this.innerHTML;
+                               $(".group-"+gid+" .notify").addClass("show").text(gcount);
+                       });
+
 
                        var eNotif = $(data).find('notif')
 

diff --git a/mod/ping.php b/mod/ping.php
index a7a2755c5ed1712fbba664bf81dc56850fb74472..30b5785aeca7d2df4e8524c56c67299e30775627 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -203,8 +203,8 @@ function ping_init(&$a) {
                        if ($a->is_friendica_app() OR !$regularnotifications)
                                $n['message'] = str_replace("{0}", $n['name'], $n['message']);
 
-                       $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']); 
-                               
+                       $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
+
                        call_hooks('ping_xmlize', $n);
                        $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
                        return sprintf ( $notsxml,
@@ -250,41 +250,41 @@ function ping_init(&$a) {
                                $n = array(
                                        'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
                                        'name' => $i['name'],
-                                       'url' => $i['url'], 
+                                       'url' => $i['url'],
                                        'photo' => $i['photo'],
                                        'date' => $i['datetime'],
                                        'seen' => false,
-                                       'message' => t("{0} wants to be your friend"),                          
+                                       'message' => t("{0} wants to be your friend"),
                                );
                                $notifs[] = $n;
                        }
                }
-               
+
                if ($mail>0){
                        foreach ($mails as $i) {
                                $n = array(
                                        'href' => $a->get_baseurl().'/message/'.$i['id'],
                                        'name' => $i['from-name'],
-                                       'url' => $i['from-url'], 
+                                       'url' => $i['from-url'],
                                        'photo' => $i['from-photo'],
                                        'date' => $i['created'],
                                        'seen' => false,
-                                       'message' => t("{0} sent you a message"),                               
+                                       'message' => t("{0} sent you a message"),
                                );
                                $notifs[] = $n;
                        }
                }
-               
+
                if ($register>0){
                        foreach ($regs as $i) {
                                $n = array(
                                        'href' => $a->get_baseurl().'/admin/users/',
                                        'name' => $i['name'],
-                                       'url' => $i['url'], 
+                                       'url' => $i['url'],
                                        'photo' => $i['micro'],
                                        'date' => $i['created'],
                                        'seen' => false,
-                                       'message' => t("{0} requested registration"),                           
+                                       'message' => t("{0} requested registration"),
                                );
                                $notifs[] = $n;
                        }
@@ -363,7 +363,7 @@ function ping_get_notifications($uid) {
                        $quit = true;
                else
                        $offset += 50;
-                       
+
 
                foreach ($r AS $notification) {
                        if (is_null($notification["visible"]))
@@ -386,7 +386,7 @@ function ping_get_notifications($uid) {
                                $notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));
 
                        $notification['href'] = $a->get_baseurl() . '/notify/view/' . $notification['id'];
-                               
+
                        if ($notification["visible"] AND !$notification["spam"] AND
                                !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
                                $result[$notification["parent"]] = $notification;
@@ -395,6 +395,6 @@ function ping_get_notifications($uid) {
 
        } while ((count($result) < 50) AND !$quit);
 
-       
+
        return($result);
 }

diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl
index c7e1aa895e2c063a3b567aa83a0fb1eee3eb7083..4905c2fa1a1346fc2c8ccce86d67b00cceecd340 100644 (file)
--- a/view/templates/group_side.tpl
+++ b/view/templates/group_side.tpl
@@ -4,18 +4,19 @@
 <div id="sidebar-group-list">
        <ul role="menu" id="sidebar-group-ul">
                {{foreach $groups as $group}}
-                       <li role="menuitem" class="sidebar-group-li">
+                       <li role="menuitem" class="sidebar-group-li group-{{$group.id}}">
                                {{if $group.cid}}
-                                       <input type="checkbox" 
-                                               class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+                                       <input type="checkbox"
+                                               class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
                                                onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
                                                {{if $group.ismember}}checked="checked"{{/if}}
                                        />
-                               {{/if}}                 
+                               {{/if}}
                                {{if $group.edit}}
                                        <a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"><span class="sr-only">{{$edittext}}</span></span></a>
                                {{/if}}
                                <a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+                               <span class="notify"></span>
                        </li>
                {{/foreach}}
        </ul>

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 5bec657f6c653176e0b297ac1fe69606af51559c..0198431919bfc9759dcfb1b3a1dc1236532689f7 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2039,6 +2039,17 @@ a.mail-list-link {
 #sidebar-group-list ul {
        list-style-type: none;
 }
+.sidebar-group-li .notify {
+       display: none;
+       font-size: 9px;
+       border: 1px solid rgb(221, 221, 221);
+       padding: 2px;
+       float: right;
+       background-color: #BABDB6;
+}
+.sidebar-group-li .notify.show {
+       display: block;
+}
 
 #sidebar-group-list .icon, #sidebar-group-list .iconspacer {
        display: inline-block;

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 485ac393870f71ecc7ecf5f258f3e2589e8f3d0f..93ee1ccd58feefcf6014b4675c01bd77bae850eb 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #ffffff;
+  background: #FFFFFF;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -1013,6 +1013,21 @@ aside .posted-date-selector-months {
 .widget .tool.selected {
   background: url('../../../images/selected.png') no-repeat left center;
 }
+.widget .notify {
+  display: none;
+  background-color: #19AEFF;
+  border-radius: 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  min-width: 15px;
+  text-align: right;
+  float: right;
+  color: #ffffff;
+  margin-right: 10px;
+}
+.widget .notify.on {
+  display: block;
+}
 /* widget: search */
 #add-search-popup {
   width: 200px;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 345043ffb46cf1370af8f8cae54cded162ecfb57..ab50d93ae1b0ed8a72b0d41dd0c0b5cf38de9a69 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #ffffff;
+  background: #FFFFFF;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -1013,6 +1013,21 @@ aside .posted-date-selector-months {
 .widget .tool.selected {
   background: url('../../../images/selected.png') no-repeat left center;
 }
+.widget .notify {
+  display: none;
+  background-color: #19AEFF;
+  border-radius: 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  min-width: 15px;
+  text-align: right;
+  float: right;
+  color: #ffffff;
+  margin-right: 10px;
+}
+.widget .notify.on {
+  display: block;
+}
 /* widget: search */
 #add-search-popup {
   width: 200px;

diff --git a/view/theme/quattro/js/quattro.js b/view/theme/quattro/js/quattro.js
new file mode 100644 (file)
index 0000000..c2573eb
--- /dev/null
+++ b/view/theme/quattro/js/quattro.js
@@ -0,0 +1,143 @@
+$(document).ready(function(){
+       $('nav').bind('nav-update', function(e,data){
+               var notifCount = $(data).find('notif').attr('count');
+               var intro = $(data).find('intro').text();
+               var mail = $(data).find('mail').text();
+
+               $(".tool .notify").removeClass("on");
+               $(data).find("group").each(function() {
+                       var gid = this.id;
+                       var gcount = this.innerHTML;
+                       $(".group-"+gid+" .notify").addClass("on").text(gcount);
+               });
+
+               console.log(intro,mail);
+
+               if (notifCount > 0 ) {
+                       Tinycon.setBubble(notifCount);
+               } else {
+                       Tinycon.setBubble('');
+               }
+
+               if (intro>0){
+                       $("#nav-introductions-link").addClass("on");
+               } else {
+                       $("#nav-introductions-link").removeClass("on");
+               }
+
+               if (mail>0){
+                       $("#nav-messages-link").addClass("on");
+               } else {
+                       $("#nav-messages-link").removeClass("on");
+               }
+
+       });
+
+       /*
+        * show and hide contact action buttons in
+        * contacts page on contacts' checkbox selection
+        */
+       $('.contact-select').bind('click', function(e) {
+               var y = e.clientY;
+               var elm = $("#contacts-actions");
+               y=y-40;
+               if (y<0) y=0;
+               if (y+elm.height() > $("html").height()) y=$("html").height()-elm.height();
+               elm.css('top', y+"px");
+               if ($(".contact-select:checked").length > 0) {
+                       elm.show();
+               } else {
+                       elm.hide();
+               }
+       });
+});
+
+function insertFormatting(comment,BBcode,id) {
+
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               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);
+                       $("#comment-edit-text-" + id).val(tmpStr);
+               }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+                       } else
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function showThread(id) {
+       $("#collapsed-comments-" + id).show()
+       $("#collapsed-comments-" + id + " .collapsed-comments").show()
+}
+function hideThread(id) {
+       $("#collapsed-comments-" + id).hide()
+       $("#collapsed-comments-" + id + " .collapsed-comments").hide()
+}
+
+
+function cmtBbOpen(id) {
+       $("#comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $("#comment-edit-bb-" + id).hide();
+}
+
+$(document).ready(function() {
+
+       $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+       $('.group-edit-icon').hover(
+               function() {
+                       $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+               function() {
+                       $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+               );
+
+       $('.sidebar-group-element').hover(
+               function() {
+                       id = $(this).attr('id');
+                       $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+               function() {
+                       id = $(this).attr('id');
+                       $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+               );
+
+
+       $('.savedsearchdrop').hover(
+               function() {
+                       $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+               function() {
+                       $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+               );
+
+       $('.savedsearchterm').hover(
+               function() {
+                       id = $(this).attr('id');
+                       $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+               function() {
+                       id = $(this).attr('id');
+                       $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+       );
+
+});
+
+

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index b2dec86c843c5eddd7f7177772b84a0a20212716..510b2f7c8c6539548eebc63db6e65d483b16dcd4 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -420,7 +420,7 @@
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
   font-size: 11px;
-  background-color: #f6ecf9;
+  background-color: #F6ECF9;
   color: #2d2d2d;
   margin: 50px 0px 0px 0px;
   display: table;
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #ffffff;
+  background: #FFFFFF;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -1013,6 +1013,21 @@ aside .posted-date-selector-months {
 .widget .tool.selected {
   background: url('../../../images/selected.png') no-repeat left center;
 }
+.widget .notify {
+  display: none;
+  background-color: #19AEFF;
+  border-radius: 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  min-width: 15px;
+  text-align: right;
+  float: right;
+  color: #ffffff;
+  margin-right: 10px;
+}
+.widget .notify.on {
+  display: block;
+}
 /* widget: search */
 #add-search-popup {
   width: 200px;
@@ -1689,7 +1704,7 @@ span[id^="showmore-wrap"] {
   height: 20px;
   width: 500px;
   font-weight: bold;
-  border: 1px solid #f6ecf9;
+  border: 1px solid #F6ECF9;
 }
 #jot #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1716,7 +1731,7 @@ span[id^="showmore-wrap"] {
   margin: 0px;
   height: 20px;
   width: 200px;
-  border: 1px solid #f6ecf9;
+  border: 1px solid #F6ECF9;
 }
 #jot #jot-category:hover {
   border: 1px solid #999999;

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 7aede8df08274b92f627d5117b047faf3e30b5bb..2faa7966f06c38a875ec02aaa8c04ca08d530fc4 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -442,6 +442,20 @@ aside {
        /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
        .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
 
+       .notify {
+               display: none;
+               background-color: #19AEFF;
+               border-radius: 5px;
+               font-size: 10px;
+               padding: 1px 3px;
+               min-width: 15px;
+               text-align: right;
+               float: right;
+               color: rgb(255, 255, 255);
+               margin-right: 10px;
+
+               &.on { display: block; }
+       }
 }
 
 /* widget: search */

diff --git a/view/theme/quattro/templates/generic_links_widget.tpl b/view/theme/quattro/templates/generic_links_widget.tpl
index 6f7a082c1e5439395c3c1cd0e4ca44a65e052340..1a26c9741da682daf9192901eabfae04aa07a5b7 100644 (file)
--- a/view/theme/quattro/templates/generic_links_widget.tpl
+++ b/view/theme/quattro/templates/generic_links_widget.tpl
@@ -1,11 +1,11 @@
 <div class="widget">
        {{if $title}}<h3>{{$title}}</h3>{{/if}}
        {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
-       
+
        <ul role="menu">
                {{foreach $items as $item}}
                        <li role="menuitem" class="tool {{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}} class="link">{{$item.label}}</a></li>
                {{/foreach}}
        </ul>
-       
+
 </div>

diff --git a/view/theme/quattro/templates/group_side.tpl b/view/theme/quattro/templates/group_side.tpl
index d0fb5d62b69e241a231720ba1184a2f7b9d11951..620d2de75aae7db2f29982176b8dc7088ce57e50 100644 (file)
--- a/view/theme/quattro/templates/group_side.tpl
+++ b/view/theme/quattro/templates/group_side.tpl
@@ -7,7 +7,7 @@
        <div id="sidebar-group-list">
                <ul>
                        {{foreach $groups as $group}}
-                       <li class="tool  {{if $group.selected}}selected{{/if}}">
+                       <li class="tool  {{if $group.selected}}selected{{/if}} group-{{$group.id}}">
                                <a href="{{$group.href}}" class="label">
                                        {{$group.text}}
                                </a>
@@ -15,15 +15,16 @@
                                        <a href="{{$group.edit.href}}" class="action"><span class="icon text s10 edit">{{$group.edit.title}}</span></a>
                                {{/if}}
                                {{if $group.cid}}
-                                       <input type="checkbox" 
-                                               class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+                                       <input type="checkbox"
+                                               class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
                                                onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
                                                {{if $group.ismember}}checked="checked"{{/if}}
                                        />
                                {{/if}}
+                               <span class="notify"></span>
                        </li>
                        {{/foreach}}
                </ul>
        </div>
-</div> 
+</div>
 

diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 1be5c02678ff7a2784aabf0e7b49c1c428c807a0..a1cd29ee72ad84c1ff2fe3da4850e46b9daec213 100644 (file)
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -6,151 +6,10 @@
  * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
  * Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
  */
- 
-function quattro_init(&$a) {
-$a->theme_info = array();
-set_template_engine($a, 'smarty3');
-
-
-$a->page['htmlhead'] .= '<script src="'.$a->get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(document).ready(function(){
-    $('nav').bind('nav-update', function(e,data){
-        var notifCount = $(data).find('notif').attr('count');
-        var intro = $(data).find('intro').text();
-        var mail = $(data).find('mail').text();
-        
-        console.log(intro,mail);
-        
-        if (notifCount > 0 ) {
-            Tinycon.setBubble(notifCount);
-        } else {
-            Tinycon.setBubble('');
-        }
-        
-        if (intro>0){
-                       $("#nav-introductions-link").addClass("on");
-               } else {
-                       $("#nav-introductions-link").removeClass("on");
-               }
-               
-        if (mail>0){
-                       $("#nav-messages-link").addClass("on");
-               } else {
-                       $("#nav-messages-link").removeClass("on");
-               }
-               
-    });
-       
-       /* 
-        * show and hide contact action buttons in 
-        * contacts page on contacts' checkbox selection
-        */
-       $('.contact-select').bind('click', function(e) {
-               var y = e.clientY;
-               var elm = $("#contacts-actions");
-               y=y-40;
-               if (y<0) y=0;
-               if (y+elm.height() > $("html").height()) y=$("html").height()-elm.height();
-               elm.css('top', y+"px");
-               if ($(".contact-select:checked").length > 0) {
-                       elm.show();
-               } else {
-                       elm.hide();
-               }
-       });
-});        
-
-function insertFormatting(comment,BBcode,id) {
-       
-               var tmpStr = $("#comment-edit-text-" + id).val();
-               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);
-                       $("#comment-edit-text-" + id).val(tmpStr);
-               }
-
-       textarea = document.getElementById("comment-edit-text-" +id);
-       if (document.selection) {
-               textarea.focus();
-               selected = document.selection.createRange();
-               if (BBcode == "url"){
-                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-                       } else                  
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
-               var start = textarea.selectionStart;
-               var end = textarea.selectionEnd;
-               if (BBcode == "url"){
-                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-       }
-       return true;
-}
-
-function showThread(id) {
-       $("#collapsed-comments-" + id).show()
-       $("#collapsed-comments-" + id + " .collapsed-comments").show()
-}
-function hideThread(id) {
-       $("#collapsed-comments-" + id).hide()
-       $("#collapsed-comments-" + id + " .collapsed-comments").hide()
-}
-
-
-function cmtBbOpen(id) {
-       $("#comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-       $("#comment-edit-bb-" + id).hide();
-}
-
-$(document).ready(function() {
-
-       $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
-
-       $('.group-edit-icon').hover(
-               function() {
-                       $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-               function() {
-                       $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-               );
-
-       $('.sidebar-group-element').hover(
-               function() {
-                       id = $(this).attr('id');
-                       $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-               function() {
-                       id = $(this).attr('id');
-                       $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-               );
-
-
-       $('.savedsearchdrop').hover(
-               function() {
-                       $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-               function() {
-                       $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-               );
-
-       $('.savedsearchterm').hover(
-               function() {
-                       id = $(this).attr('id');
-                       $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-               function() {
-                       id = $(this).attr('id');
-                       $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-       );
-
-});
 
+function quattro_init(&$a) {
+       $a->theme_info = array();
 
-</script>
-EOT;
+       $a->page['htmlhead'] .= '<script src="'.$a->get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
+       $a->page['htmlhead'] .= '<script src="'.$a->get_baseurl().'/view/theme/quattro/js/quattro.js"></script>';;
 }

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 75b8288636224e682a4f171ccf75bb112483e6f3..3d30db809345c8983dc693c1e96c83b22148179b 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -366,6 +366,17 @@ code {
 #sidebar-group-list .tool:hover {
        background: #EEE;
 }
+#sidebar-group-list .notify {
+       min-width: 10px;
+       text-align: center;
+       color: #FFF;
+       background-color: #CB4437;
+       font: bold 10px Arial;
+       padding: 3px;
+       border-radius: 10px;
+       display: none;
+}
+#sidebar-group-list .notify.show { display: inline-block; }
 .tool .label {
 /*  float: left; */
 }
@@ -1360,12 +1371,12 @@ section.minimal {
   width: 100%;
   margin-bottom: 0.3em;
 }
-.wall-item-container .wall-item-actions-social, 
+.wall-item-container .wall-item-actions-social,
 .wall-item-container .wall-item-actions-isevent {
   float: left;
   margin-bottom: 1px;
 }
-.wall-item-container .wall-item-actions-social a, 
+.wall-item-container .wall-item-actions-social a,
 .wall-item-container .wall-item-actions-isevent a {
   float: left;
   margin-right: 1em;
@@ -2287,7 +2298,7 @@ aside #id_password {
   width: 120px;
   height: 130px;
   float: left;
-  overflow: hidden; 
+  overflow: hidden;
   margin-left: 5px;
 }*/