Merge pull request #2109 from annando/1511-duplicated-tags-diaspora

Avoid duplicated tags in postings to Diaspora

diff --git a/include/forums.php b/include/forums.php
index 59bf5a6b079af9a32d935bcf19b17186b8292a53..995a29cad1411d0ec6280068ac9bfca52d1b00e1 100644 (file)
--- a/include/forums.php
+++ b/include/forums.php
@@ -60,10 +60,12 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
  * Sidebar widget to show subcribed friendica forums. If activated
  * in the settings, it appears at the notwork page sidebar
  *
- * @param App $a
+ * @param int $uid
+ * @param int $cid
+ *     The contact id which is used to mark a forum as "selected"
  * @return string
  */
-function widget_forumlist($a) {
+function widget_forumlist($uid,$cid = 0) {
 
        if(! intval(feature_enabled(local_user(),'forumlist_widget')))
                return;
@@ -73,7 +75,7 @@ function widget_forumlist($a) {
        //sort by last updated item
        $lastitem = true;
 
-       $contacts = get_forumlist($a->user['uid'],true,$lastitem, true);
+       $contacts = get_forumlist($uid,true,$lastitem, true);
        $total = count($contacts);
        $visible_forums = 10;
 
@@ -83,11 +85,14 @@ function widget_forumlist($a) {
 
                foreach($contacts as $contact) {
 
+                       $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
+
                        $entry = array(
-                               'url' => $a->get_baseurl() . '/network?f=&cid=' . $contact['id'],
-                               'external_url' => $a->get_baseurl() . '/redir/' . $contact['id'],
+                               'url' => z_root() . '/network?f=&cid=' . $contact['id'],
+                               'external_url' => z_root() . '/redir/' . $contact['id'],
                                'name' => $contact['name'],
                                'cid' => $contact['id'],
+                               'selected'      => $selected,
                                'micro' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
                                'id' => ++$id,
                        );

diff --git a/include/group.php b/include/group.php
index fe29d39f1a810ae86eb6ec5ef66d630c7538831e..862d06818dd0957bb8a7428f3a7c7b996b953e89 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -213,9 +213,20 @@ function mini_group_select($uid,$gid = 0) {
 }
 
 
-
-
-function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
+/**
+ * @brief Create group sidebar widget
+ * 
+ * @param string $every
+ * @param string $each
+ * @param string $editmode
+ *     'standard' => include link 'Edit groups'
+ *     'extended' => include link 'Create new group'
+ *     'full' => include link 'Create new group' and provide for each group a link to edit this group
+ * @param int $group_id
+ * @param int $cid
+ * @return string
+ */
+function group_side($every="contacts",$each="group",$editmode = "standard", $group_id = 0, $cid = 0) {
 
        $o = '';
 
@@ -239,13 +250,13 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
        $member_of = array();
        if($cid) {
                $member_of = groups_containing(local_user(),$cid);
-       } 
+       }
 
        if(count($r)) {
                foreach($r as $rr) {
                        $selected = (($group_id == $rr['id']) ? ' group-selected' : '');
                        
-                       if ($edit) {
+                       if ($editmode == "full") {
                                $groupedit = array(
                                        'href' => "group/".$rr['id'],
                                        'title' => t('edit'),
@@ -269,14 +280,17 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 
        $tpl = get_markup_template("group_side.tpl");
        $o = replace_macros($tpl, array(
-               '$title'                => t('Groups'),
+               '$title'        => t('Groups'),
+               'newgroup'      => (($editmode == "extended") || ($editmode == "full") ? 1 : ''),
+               '$editgroupstext' => t('Edit groups'),
+               'grouppage'     => "group/",
                '$edittext'     => t('Edit group'),
                '$createtext'   => t('Create a new group'),
-    '$creategroup' => t('Group Name: '),
-    '$form_security_token' => get_form_security_token("group_edit"),
+               '$creategroup'  => t('Group Name: '),
+               '$form_security_token' => get_form_security_token("group_edit"),
                '$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
-               '$groups'               => $groups,
-               '$add'                  => t('add'),
+               '$groups'       => $groups,
+               '$add'          => t('add'),
        ));
 
 

diff --git a/include/identity.php b/include/identity.php
index a785ce981dc8074873c9fb354b2e72a4e31f310d..0282b2d9a51a1a14ff4bb0c417714ff071a41317 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -216,7 +216,12 @@ if(! function_exists('profile_sidebar')) {
                }
 
                if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
-                               $connect = false;
+                       $connect = false;
+
+               if ($connect)
+                       $subscribe_feed = t("Atom feed");
+               else
+                       $subscribe_feed = false;
 
                if (isset($profile['remoteconnect']))
                        $remoteconnect = $profile['remoteconnect'];
@@ -337,6 +342,7 @@ if(! function_exists('profile_sidebar')) {
                        '$profile' => $p,
                        '$connect'  => $connect,
                        '$remoteconnect'  => $remoteconnect,
+                       '$subscribe_feed' => $subscribe_feed,
                        '$wallmessage' => $wallmessage,
                        '$location' => $location,
                        '$gender'   => $gender,

diff --git a/mod/contacts.php b/mod/contacts.php
index 017b1d6435fd8456953d3fadcc312312fdc0b6e7..1dc886363ae1ddf699f4aa41a19a6a4d6c799e9f 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -55,7 +55,7 @@ function contacts_init(&$a) {
                $findpeople_widget .= findpeople_widget();
        }
 
-       $groups_widget .= group_side('contacts','group',false,0,$contact_id);
+       $groups_widget .= group_side('contacts','group','full',0,$contact_id);
        
        $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
                '$vcard_widget' => $vcard_widget,

diff --git a/mod/group.php b/mod/group.php
index 263586e2e903458f1cf7627a8849ffc4bdc64149..e9f9561f4613eaa0728b06f5e1113828e1cb7c15 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -7,7 +7,7 @@ function validate_members(&$item) {
 function group_init(&$a) {
        if(local_user()) {
                require_once('include/group.php');
-               $a->page['aside'] = group_side('contacts','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0));
+               $a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0));
        }
 }
 

diff --git a/mod/item.php b/mod/item.php
index 91a94974e9a232cd0b7c1e2a55893fe0ee69c41b..a2b88a8e305f00474a3adecb034adb5a6ed71ddf 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -362,8 +362,7 @@ function item_post(&$a) {
        if((local_user()) && (local_user() == $profile_uid)) {
                $self = true;
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-                       intval($_SESSION['uid'])
-               );
+                       intval($_SESSION['uid']));
        }
        elseif(remote_user()) {
                if(is_array($_SESSION['remote'])) {

diff --git a/mod/network.php b/mod/network.php
index 903ee4154839ca37493a89b02dbdf8e23fdb7630..f18e3001d0dcab4548c31386c57309b04e7caaa1 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -6,6 +6,8 @@ function network_init(&$a) {
        }
 
        $is_a_date_query = false;
+       if(x($_GET['cid']) && intval($_GET['cid']) != 0)
+               $cid = $_GET['cid'];
 
        if($a->argc > 1) {
                for($x = 1; $x < $a->argc; $x ++) {
@@ -145,8 +147,8 @@ function network_init(&$a) {
                ));
        }
 
-       $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network',true,$group_id) : '');
-       $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? widget_forumlist($a) : '');
+       $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
+       $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? widget_forumlist(local_user(),$cid) : '');
        $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);
        $a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
        $a->page['aside'] .= saved_searches($search);

diff --git a/mod/nogroup.php b/mod/nogroup.php
index 06fa730e0d1a581ef7f3c1a8df8d678da6a2e029..9f6e9784331851b702434245f24256313612d6e4 100644 (file)
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -15,7 +15,7 @@ function nogroup_init(&$a) {
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
 
-       $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
+       $a->page['aside'] .= group_side('contacts','group','extended',0,$contact_id);
 }
 
 

diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl
index 4905c2fa1a1346fc2c8ccce86d67b00cceecd340..466882370f37d3961b2f0ae2522c70a372e199e6 100644 (file)
--- a/view/templates/group_side.tpl
+++ b/view/templates/group_side.tpl
@@ -1,38 +1,42 @@
 <div class="widget" id="group-sidebar">
-<h3>{{$title}}</h3>
+       <h3>{{$title}}</h3>
 
-<div id="sidebar-group-list">
-       <ul role="menu" id="sidebar-group-ul">
-               {{foreach $groups as $group}}
-                       <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"
-                                               onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
-                                               {{if $group.ismember}}checked="checked"{{/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>
+       <div id="sidebar-group-list">
+               <ul role="menu" id="sidebar-group-ul">
+                       {{foreach $groups as $group}}
+                               <li role="menuitem" class="sidebar-group-li group-{{$group.id}}">
+                                       {{if ! $newgroup}}<span class="notify badge pull-right"></span>{{/if}}
+                                       {{if $group.cid}}
+                                               <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 $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>
+                               </li>
+                       {{/foreach}}
+               </ul>
        </div>
-  <div id="sidebar-new-group">
-  <a onclick="javascript:$('#group-new-form').fadeIn('fast');return false;">{{$createtext}}</a>
-  <form id="group-new-form" action="group/new" method="post" style="display:none;">
-   <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-   <input name="groupname" id="id_groupname" placeholder="{{$creategroup}}">
-  </form>
-  </div>
-  {{if $ungrouped}}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">{{$ungrouped}}</a>
-  </div>
-  {{/if}}
+
+       {{if $newgroup}}
+       <div id="sidebar-new-group">
+               <a onclick="javascript:$('#group-new-form').fadeIn('fast');return false;">{{$createtext}}</a>
+               <form id="group-new-form" action="group/new" method="post" style="display:none;">
+                       <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+                       <input name="groupname" id="id_groupname" placeholder="{{$creategroup}}">
+               </form>
+       </div>
+       {{else}}
+       <div id="sidebar-edit-groups"><a href="{{$grouppage}}">{{$editgroupstext}}</a></div>
+       {{/if}}
+
+       {{if $ungrouped}}<div id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></div>{{/if}}
 </div>
 
 

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index 05e44432fd2d33635edd787841f3d7eace0f2079..fa209bf46fa35e83da9b1d1b631e5bbb9a80f3db 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -55,6 +55,9 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>

diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl
index 54d7df82d219cdd0da068913dc32626f87210e58..32da71f816633b51fc3d08ad4bfa683238847714 100644 (file)
--- a/view/templates/widget_forumlist.tpl
+++ b/view/templates/widget_forumlist.tpl
@@ -24,7 +24,7 @@ function showHideForumlist() {
                        <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
        
@@ -34,7 +34,7 @@ function showHideForumlist() {
                        <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
                {{/foreach}}

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 255a1d089ab606e56eb37e63e08b713c0cbac2f0..bffc8c05724e2326b4c0486bf878fb5f70c267b5 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -205,6 +205,7 @@ aside {
        font-weight: bold;
        background: #3465a4 url('friendica-16.png') no-repeat 95% center;
 }
+#subscribe-feed-link,
 #wallmessage-link {
        display: block;
        color: #FFFFFF;
@@ -340,7 +341,7 @@ div.wall-item-content-wrapper.shiny {
        margin-bottom: 10px;
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected, .forum-selected {
        padding: 3px;
        -moz-border-radius: 3px;
        border-radius: 3px;

diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
index bf2eb27349815370e1ff6fe0f488569d6b9bb187..fb5d4e420e68ca02c75127244a61be459f3a66f4 100644 (file)
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -47,6 +47,9 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>

diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index 4485c056ffedea5c70dc09acf25bdfb19799d38e..9a0c50e1e7aeb56aa757dfa9ec0b21ba7a86daa1 100644 (file)
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -511,7 +511,7 @@ footer {
        margin-bottom: 10px;\r
 }\r
 \r
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {\r
+.group-selected, .nets-selected, .fileas-selected, .categories-selected, .forum-selected {\r
        padding: 3px;\r
        -moz-border-radius: 3px;\r
        -webkit-border-radius: 3px;\r

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 24fe47559a47acb804cc53eea92fc39fb884ffa6..1f0a90938e1ed388abbd1006b087f3a9385cb6b5 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -284,6 +284,7 @@ aside {
 /*     float:left;*/
 }
 
+#subscribe-feed-link,
 #dfrn-request-link {
        display: block;
        color: #FFFFFF;
@@ -489,7 +490,7 @@ div.wall-item-content-wrapper.shiny {
        margin-bottom: 10px;
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected, .forum-selected {
        padding: 3px;
        -moz-border-radius: 3px;
        -webkit-border-radius: 3px;

diff --git a/view/theme/frost/templates/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl
index 515740871385e0951b5100fa77e4b9cbb51b5e94..b8f59ccaa8cd084dc43913dd4dfa418cd6533d86 100644 (file)
--- a/view/theme/frost/templates/profile_vcard.tpl
+++ b/view/theme/frost/templates/profile_vcard.tpl
@@ -43,10 +43,11 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>
 
 {{$contact_block}}
-
-

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 25102ba31d900ef499670e440f49d268123a920d..785b527b27c170f5d37e74ace4a6f4acb738aa86 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -838,6 +838,7 @@ aside #profile-extra-links li {
   margin: 0px;
   list-style: none;
 }
+aside #subscribe-feed-link,
 aside #wallmessage-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -850,6 +851,7 @@ aside #wallmessage-link {
   padding: 4px 2px 2px 35px;
   margin-top: 3px;
 }
+aside #subscribe-feed:hover,
 aside #wallmessage-link:hover {
   text-decoration: none;
   background-color: #19aeff;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 78de88654292add54764fa4d1c2de792de74cf80..73354403194f99485c166a0715feb40abca9c821 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -854,6 +854,7 @@ aside #wallmessage-link:hover {
   text-decoration: none;
   background-color: #ccff42;
 }
+aside #subscribe-feed-link,
 aside #dfrn-request-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -865,6 +866,7 @@ aside #dfrn-request-link {
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
 }
+aside #subscribe-feed-link:hover,
 aside #dfrn-request-link:hover {
   text-decoration: none;
   background-color: #ccff42;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 1ca27b895c058a3b527ee732039270b5bb4bd2fc..c5027928b2ffcc2af786555f4fd7af77bec8afb8 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -854,6 +854,7 @@ aside #wallmessage-link:hover {
   text-decoration: none;
   background-color: #86608e;
 }
+aside #subscribe-feed-link,
 aside #dfrn-request-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -865,6 +866,7 @@ aside #dfrn-request-link {
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
 }
+aside #subscribe-feed-link:hover,
 aside #dfrn-request-link:hover {
   text-decoration: none;
   background-color: #86608e;

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index dfa6d0445d6d0b625009914882ab1e5a5b81834b..7a06e7588f241e47602064f72491fa68b6bc7de3 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -73,6 +73,9 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>

diff --git a/view/theme/quattro/templates/widget_forumlist.tpl b/view/theme/quattro/templates/widget_forumlist.tpl
new file mode 100644 (file)
index 0000000..35c54bc
--- /dev/null
+++ b/view/theme/quattro/templates/widget_forumlist.tpl
@@ -0,0 +1,46 @@
+<script>
+
+function showHideForumlist() {
+       if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) {
+               $("li[id^='forum-widget-entry-extended-']").hide();
+               $("li#forum-widget-collapse").html(window.showMore);
+
+       }
+       else {
+               $("li[id^='forum-widget-entry-extended-']").show();
+               $("li#forum-widget-collapse").html(window.showFewer);
+       }
+}
+</script>
+
+<div id="forumlist-sidebar" class="widget">
+       <h3 id="forumlist">{{$title}}</h3>
+
+       <ul id="forumlist-sidbar-ul" role="menu">
+               {{foreach $forums as $forum}}
+               {{if $forum.id <= $visible_forums}}
+               <li class="forum-widget-entry forum-{{$forum.cid}} tool {{if $forum.selected}}selected{{/if}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
+                       <span class="notify badge pull-right"></span>
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
+                       </a>
+                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+               </li>
+               {{/if}}
+       
+               {{if $forum.id > $visible_forums}}
+               <li class="forum-widget-entry forum-{{$forum.cid}} tool {{if $forum.selected}}selected{{/if}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
+                       <span class="notify badge pull-right"></span>
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
+                       </a>
+                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+               </li>
+               {{/if}}
+               {{/foreach}}
+
+               {{if $total > $visible_forums }}
+               <li onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="forum-widget-link fakelink tool">{{$showmore}}</li>
+               {{/if}}
+       </ul>
+</div>

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index ba0c4bff6ec9ef2a4197b62191cc5f587467810d..510b7d9c6d79018967cdbb2afc9d3f6fc18a0f8a 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -690,6 +690,7 @@ aside h4 {
        list-style: none;
 }
 
+#subscribe-feed-link,
 #dfrn-request-link {
        box-shadow: inset 0px 1px 0px 0px #a65151;
                -moz-box-shadow: inset 0px 1px 0px 0px #a65151;
@@ -725,6 +726,7 @@ aside h4 {
        background-color: #3465a4;
 }
 
+#subscribe-feed-link:hover,
 #dfrn-request-link:hover {
        background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
        background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
@@ -732,6 +734,7 @@ aside h4 {
        background-color: #1873a2;
 }
 
+#subscribe-feed-link:active,
 #dfrn-request-link:active {
        position: relative;
        top: 1px;
@@ -854,7 +857,8 @@ li.widget-list {
        padding: 3px 24px;
 }
 
-#sidebar-new-group {
+#sidebar-new-group,
+#sidebar-edit-groups {
        padding: 7px;
        width: 165px;
        margin: auto;

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index ecbb2ad96cb8c156305dc69f9476911b71145ad9..868d4a50713025dc8fd82bc442cb89ba534bb304 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -347,7 +347,7 @@ code {
   display: inline-block;
   min-width: 10px;
   padding: 3px 7px;
-  font-size: 12px;
+  font-size: 10px;
   font-weight: 700;
   line-height: 1;
   color: #fff;
@@ -382,7 +382,7 @@ code {
 #sidebar-group-list .tool:hover {
        background: #EEE;
 }
-#sidebar-group-list .notify {
+/*#sidebar-group-list .notify {
        min-width: 10px;
        text-align: center;
        color: #FFF;
@@ -391,6 +391,9 @@ code {
        padding: 3px;
        border-radius: 10px;
        display: none;
+}*/
+#sidebar-group-list .notify {
+  display: none;
 }
 #sidebar-group-list .notify.show { display: inline-block; }
 .tool .label {
@@ -416,7 +419,7 @@ code {
   opacity: 1;
 }
 
-.sidebar-group-li:hover, #sidebar-new-group:hover, #forum-widget-collapse:hover,
+.sidebar-group-li:hover, #sidebar-new-group:hover, #sidebar-edit-groups:hover, #forum-widget-collapse:hover,
 #sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forumlist-sidebar li:hover, #forumlist-sidebar-right li:hover,
 .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover {
   /* background-color: #ddd; */
@@ -432,11 +435,11 @@ code {
 /*  color: #000; */
 }
 
-.group-selected, .nets-selected, .fileas-selected {
+.group-selected, .nets-selected, .fileas-selected, .forum-selected {
   font-weight: bold;
 }
 
-#forum-widget-showmore, #sidebar-new-group, #forum-widget-collapse, #forumlist-rsidebar-right, #sidebar-ungrouped,
+#forum-widget-showmore, #sidebar-new-group, #sidebar-edit-groups, #forum-widget-collapse, #forumlist-rsidebar-right, #sidebar-ungrouped,
 .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
   padding-left: 10px;
   padding-top: 3px;
@@ -464,7 +467,7 @@ code {
   display: inline-block;
 }
 
-a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a {
+a.nets-link, .side-link a, #sidebar-new-group a, #sidebar-edit-groups a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a {
   display: block;
   color: #737373;
 }
@@ -1004,9 +1007,11 @@ aside #profile-extra-links ul {
 }
 aside #profile-extra-links li {
   padding: 0px;
+  padding-bottom: 4px;
   margin: 0px;
   list-style: none;
 }
+aside #subscribe-feed-link,
 aside #dfrn-request-link,
 aside #wallmessage-link {
   display: block;
@@ -1019,6 +1024,7 @@ aside #wallmessage-link {
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
 }
+aside #subscribe-feed-link:hover,
 aside #dfrn-request-link:hover,
 aside #wallmessage-link:hover {
   text-decoration: none;

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index c5a51ccbafe9ebae73e67815868e37cec4918830..1882c155833872d7edc2d3c79f3101569df2560c 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -66,6 +66,9 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>

diff --git a/view/theme/vier/templates/widget_forumlist_right.tpl b/view/theme/vier/templates/widget_forumlist_right.tpl
index 49e7723e8e1d405eca2d3cb736d0c6967e212b17..93f8e8f105fdf7287342eb93ef66767e17798604 100644 (file)
--- a/view/theme/vier/templates/widget_forumlist_right.tpl
+++ b/view/theme/vier/templates/widget_forumlist_right.tpl
@@ -20,21 +20,21 @@ function showHideForumlist() {
                {{foreach $forums as $forum}}
                {{if $forum.id <= $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
+                       <span class="notify badge pull-right"></span>
                        <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
-                       <span class="notify badge pull-right"></span>
+                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
        
                {{if $forum.id > $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
+                       <span class="notify padge pull-right"></span>
                        <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
-                       <span class="notify padge pull-right"></span>
+                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
                {{/foreach}}

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 789ba1daf1cabdca0567eced5d4ac5f110a7e5b5..91c384f805d1692253879f31a7bdb4dd3e0ef540 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -222,6 +222,9 @@ function vier_community_info() {
 
                require_once('include/forums.php');
 
+               if(x($_GET['cid']) && intval($_GET['cid']) != 0)
+                       $cid = $_GET['cid'];
+
                //sort by last updated item
                $lastitem = true;
 
@@ -235,11 +238,14 @@ function vier_community_info() {
 
                        foreach($contacts as $contact) {
 
+                               $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
+
                                $entry = array(
-                                       'url' => $a->get_baseurl() . '/network?f=&cid=' . $contact['id'],
-                                       'external_url' => $a->get_baseurl() . '/redir/' . $contact['id'],
+                                       'url' => z_root() . '/network?f=&cid=' . $contact['id'],
+                                       'external_url' => z_root() . '/redir/' . $contact['id'],
                                        'name' => $contact['name'],
                                        'cid' => $contact['id'],
+                                       'selected'      => $selected,
                                        'micro' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
                                        'id' => ++$id,
                                );