Merge branch 'AI3074-community_dashboard' of gitlab.com:participa/noosfero into …

…AI3074-community_dashboard

Merge branch 'AI3074-community_dashboard' of gitlab.com:participa/noosfero into …
…AI3074-community_dashboard
Victor Costa
2 parents c91c7131 f968d787
Showing 7 changed files with 125 additions and 55 deletions Show diff stats
lib/community_hub_plugin/hub.rb
public/javascripts/community_hub.js
public/style.css
views/community_hub_plugin_public/_mediation.rhtml
views/community_hub_plugin_public/_mediation_comment_form.rhtml
views/community_hub_plugin_public/_post.rhtml
views/content_viewer/hub.rhtml
@@ -18,6 +18,10 @@ class CommunityHubPlugin::Hub &lt; Folder
     hub.mediators = [hub.author.id]
   end
+  def notify_comments
+    false
+  end
+
   def self.icon_name(article = nil)
     'community-hub'
   end
@@ -2,39 +2,66 @@ var latest_post_id = 0;
 var oldest_post_id = 0;
 live_scroll_position = 0;
+function clearLoadingMediationCommentSignal(mediation) {
+ jQuery(".loading-mediation-comment").filter("#" + mediation).removeClass("loading-signal-error");
+ jQuery(".loading-mediation-comment").filter("#" + mediation).removeClass("loading-signal-done");
+}
+
+function clearLoadingMessageSignal() {
+ jQuery("#loading-message").removeClass("loading-signal-error");
+ jQuery("#loading-message").removeClass("loading-signal-done");
+}
+
+function clearLoadingMediationSignal() {
+ jQuery("#loading-mediation").removeClass("loading-signal-error");
+ jQuery("#loading-mediation").removeClass("loading-signal-done");
+}
+
 function toogle_mediation_comments(mediation) {
   jQuery("#mediation-comment-list-" + mediation ).toggle();
   jQuery("#mediation-comment-form-" + mediation ).toggle();
 }
-function hub_open_loading(button) {
-  var html = '<div id="hub-loading">' +
-               '<img src="/images/loading-small.gif" />' +
-             '</div>';
+function new_mediation_comment(button, mediation) {
+  var form = jQuery(button).parents("form");
-   //$('.hub .form .submit').after(html);
-   jQuery(button).after(html);
-   jQuery('#hub-loading').fadeIn('slow');
-}
+  jQuery(".loading-mediation-comment").filter("#" + mediation).addClass("loading-signal-processing");
+  jQuery.post(form.attr("action"), form.serialize(), function(data) {
+    jQuery(".loading-mediation-comment").filter("#" + mediation).removeClass("loading-signal-processing");
+    if (data.ok) {
+      jQuery("#mediation-comment-form-" + mediation + " textarea").val('');
+      jQuery(".loading-mediation-comment").filter("#" + mediation).addClass("loading-signal-done");
+      setTimeout(function(){
+        clearLoadingMediationCommentSignal(mediation);
+      }, 3000);
+    }
+    else {
+      jQuery(".loading-mediation-comment").filter("#" + mediation).addClass("loading-signal-error");
+      setTimeout(clearLoadingMessageSignal, 3000);
+    }
+  }, 'json');
-function hub_close_loading() {
-  jQuery('#hub-loading').fadeOut('slow', function() {
-    jQuery('#hub-loading').remove();
-  });
 }
 function new_message(button) {
   var form = jQuery(button).parents("form");
-  //hub_open_loading();
+  jQuery("#loading-message").addClass("loading-signal-processing");
+
   jQuery.post(form.attr("action"), form.serialize(), function(data) {
+    jQuery("#loading-message").removeClass("loading-signal-processing");
     if (data.ok) {
-      jQuery("#message_body").val('');
+      jQuery(".hub .form #message_body").val('');
+      jQuery("#loading-message").addClass("loading-signal-done");
+      setTimeout(clearLoadingMessageSignal, 3000);
+    }
+    else {
+      jQuery("#loading-message").addClass("loading-signal-error");
+      setTimeout(clearLoadingMessageSignal, 3000);
     }
-    //hub_close_loading();
   }, 'json');
 }
@@ -43,23 +70,25 @@ function new_message(button) {
 function new_mediation(button) {
   var form = jQuery(button).parents("form");
-  //hub_open_loading();
+  jQuery("#loading-mediation").addClass("loading-signal-processing");
+
   tinymce.triggerSave();
   jQuery.post(form.attr("action"), form.serialize(), function(data) {
+    jQuery("#loading-mediation").removeClass("loading-signal-processing");
     if (data.ok) {
+      jQuery("#loading-mediation").addClass("loading-signal-done");
       tinymce.get('article_body').setContent('');
+      setTimeout(clearLoadingMediationSignal, 3000);
+    }
+    else {
+      jQuery("#loading-mediation").addClass("loading-signal-error");
+      setTimeout(clearLoadingMediationSignal, 3000);
     }
-    //hub_close_loading();
   }, 'json');
 }
-function toogleAutoScrolling() {
-  alert(jQuery("#auto_scrolling").attr('checked'));
-}
-
-
 function promote_user(user_id) {
   var hub_id = jQuery(".hub").attr('id');
@@ -88,7 +117,7 @@ function pin_message(post_id) {
     type: 'get',
     dataType: 'json',
     data: { message: post_id, hub: hub_id },
-    success: function(data) {    
+    success: function(data) {
     },
     error: function(ajax, stat, errorThrown) {
       console.log(stat);
@@ -108,8 +137,6 @@ function update_mediation_comments(mediation) {
     var latest_post_id = jQuery("#mediation-comment-list-" + mediation + " li.mediation-comment").last().attr('id');
   }
-  //console.log(latest_post_id);
-
   jQuery.ajax({
     url: '/plugin/community_hub/public/newer_mediation_comment',
     type: 'get',
@@ -117,6 +144,7 @@ function update_mediation_comments(mediation) {
     success: function(data) {
       if (data.trim().length > 0) {
         jQuery("#mediation-comment-list-" + mediation + "").append(data);
+        jQuery("#mediation-comment-total-" + mediation).html(jQuery("#mediation-comment-list-" + mediation + " li.mediation-comment").size());
       }
     },
     error: function(ajax, stat, errorThrown) {
@@ -201,4 +229,4 @@ jQuery(document).ready(function() {
   setTimeout(update_live_stream, 5000);
   setTimeout(update_mediations, 7000);
-});
 \ No newline at end of file
+});
@@ -78,7 +78,7 @@ clear: both;
 	font-weight: bold;
 	float: left;
 	display: inline-block;
-	line-height: 20px;
+	line-height: 16px;
 	margin-right: 5px;
 }
@@ -107,6 +107,7 @@ clear: both;
 .hub .mediation-bar ul li.pin{
 	height: 25px;
+  margin-right: 10px;
 }
 .hub .remove{}
@@ -153,6 +154,19 @@ clear: both;
   margin-bottom: 2px;
 }
+.hub .mediation-comment-form {
+  margin-left: 70px;
+  margin-top: 10px;
+}
+
+.hub input.button.with-text.icon-add.submit{
+  display: block;
+}
+
+.hub ul#mediation-posts .post {
+  padding-bottom: 10px;
+}
+
 /**/
 .hub .live {
@@ -367,3 +381,35 @@ textarea#message_body {
   width: 80%;
 }
+.hub #loading-message,
+.hub #loading-mediation {
+  width: 16px;
+  height: 16px;
+  display: inline-block;
+  float: right;
+  margin-top: 17px;
+  margin-right: 270px;
+}
+
+.hub .loading-mediation-comment {
+  width: 16px;
+  height: 16px;
+  display: inline-block;
+  float: right;
+  margin-top: 16px;
+  margin-right: 260px;
+}
+
+.loading-signal-done {
+  background-image: url(/plugins/community_hub/icons/hub-sverde-a.png);
+}
+
+.loading-signal-error {
+  background-image: url(/plugins/community_hub/icons/hub-svermelho-a.png);
+}
+
+.loading-signal-processing {
+  background-image: url(/plugins/community_hub/icons/hub-samarelo.gif);
+}
+
+
@@ -6,25 +6,25 @@
     <li class="time"><%= post_time(mediation.created_at) %></li>
     <li class="avatar"><%= image_tag(profile_icon(mediation.author, :minor)) %></li>
     <li class="message"><span class="author"><%= mediation.author_name %>:</span> <%= mediation.body %></li>
-    
+
     <% if mediator?(hub) %>
     <li class="mediation-bar">
       <ul>
-        
+
         <li class="promote">
-          <% if !promoted?(hub, mediation.author.id) %>
+          <% if promoted?(hub, mediation.author.id) %>
           <a id="<%= mediation.id %>" href="#" onclick="promote_user(<%= mediation.author.id %>); return false;">
-            <img class="promoted" src="/plugins/community_hub/icons/hub-promote-icon.png" />
+            <img class="promoted" src="/plugins/community_hub/icons/hub-promote-icon.png" title="<%= _("User promoted") %>" />
           </a>
           <% else %>
-            <img class="not-promoted" src="/plugins/community_hub/icons/hub-not-promote-icon.png" />
+            <img class="not-promoted" src="/plugins/community_hub/icons/hub-not-promote-icon.png" title="<%= _("User not  promoted") %>" />
           <% end %>
         </li>
         <% if pinned_mediation?(hub, mediation.id) %>
         <li class="pin">
-          <img class="pinned" src="/plugins/community_hub/icons/hub-not-pinned-icon.png" />
+          <img class="pinned" src="/plugins/community_hub/icons/hub-not-pinned-icon.png" title="<%= _("Message pinned")%>" />
         </li>
         <% end %>
@@ -38,16 +38,16 @@
     <% total_mediation_comments = mediation.comments.count %>
     <span class="comment-count">
-      <%= link_to(_( "#{total_mediation_comments} Comments" ) , '#', 
-            :class => 'display-comment-form', 
-            :id => 'top-post-comment-button', 
+      <%= link_to(_( "<span id='mediation-comment-total-#{mediation.id}'>#{total_mediation_comments}</span> Comments" ) , '#',
+            :class => 'display-comment-form',
+            :id => 'top-post-comment-button',
             :onclick => "toogle_mediation_comments(#{mediation.id}); return false;") %>
     </span>
     <script type="text/javascript">
       setTimeout(function() { update_mediation_comments('<%= mediation.id %>')}, 5000);
     </script>
-    
+
     <ul id="mediation-comment-list-<%=mediation.id%>" class="mediation-comment-list" style="display:none;">
     <% if mediation.accept_comments? && mediation.comments.count > 0 %>
       <%= render :partial => 'community_hub_plugin_public/mediation_comment', :collection => mediation.comments %>
@@ -60,15 +60,15 @@
                    :locals => {
                       :hub => hub,
                       :mediation => mediation,
-                      :comment => Comment.new, 
+                      :comment => Comment.new,
                       :url => {
-                        :controller => :comment, 
+                        :controller => :comment,
                         :action => :create
-                      }, 
-                      :display_link => true, 
+                      },
+                      :display_link => true,
                       :cancel_triggers_hide => true
                    } %>
       </div>
     <% end %>
-</li>
 \ No newline at end of file
+</li>
@@ -8,5 +8,6 @@
   <%= f.text_area(:body,
                   :rows => 4,
                   :placeholder => _('Type your comment here')) %>
-  <%= submit_button('add', _('Post'), :onclick => 'new_message(this); return false;') %>
-<% end %>
 \ No newline at end of file
+  <%= submit_button('add', _('Post'), :onclick => "new_mediation_comment(this,#{mediation.id}); return false;") %>
+  <span id="<%=mediation.id%>" class="loading-mediation-comment"></span>
+<% end %>
@@ -16,17 +16,7 @@
     <% if mediator?(hub) && post.title != 'hub-message-twitter' && post.title != 'hub-message-facebook' %>
     <li class="mediation-bar">
-
       <ul>
-        <li class="promote">
-          <% if promoted?(hub, post.author.id) == 'promoted' %>
-          <a id="<%= post.id %>" href="#" onclick="pin_message(<%= post.id %>); return false;">
-            <img class="promoted" src="/plugins/community_hub/icons/hub-promote-icon.png" />
-          </a>
-          <% else %>
-            <img class="not-promoted" src="/plugins/community_hub/icons/hub-not-promote-icon.png" />
-          <% end %>
-        </li>
         <li class="pin">
           <% if !pinned_message?(hub, post.id)  %>
           <a id="<%= post.id %>" href="#" onclick="pin_message(<%= post.id %>); return false;">
@@ -37,7 +27,6 @@
           <% end %>
         </li>
       </ul>
-
     </li>
     <% end %>
@@ -43,6 +43,7 @@
         <br />
         <%= f.text_area :body, :style => "width: 99%;", :cols => "38", :rows => "10", :placeholder => _("Type your message here") %>
         <%= submit_button('add', _('Post'), :onclick => 'new_message(this); return false;') %>
+        <span id="loading-message"></span>
       <% end %>
     <% else %>
@@ -59,6 +60,7 @@
         <%= f.hidden_field :parent_id, :value => @page.id %>
         <%= f.text_area :body, :style => "width: 100%;", :class => "mceEditor" %>
         <%= submit_button('add', _('Post'), :onclick => 'new_mediation(this); return false;') %>
+        <span id="loading-mediation"></span>
       <% end %>
     <% end %>
	@@ -78,7 +78,7 @@ clear: both;		@@ -78,7 +78,7 @@ clear: both;
78	font-weight: bold;	78	font-weight: bold;
79	float: left;	79	float: left;
80	display: inline-block;	80	display: inline-block;
81	- line-height: 20px;	81	+ line-height: 16px;
82	margin-right: 5px;	82	margin-right: 5px;
83	}	83	}
84		84
	@@ -107,6 +107,7 @@ clear: both;		@@ -107,6 +107,7 @@ clear: both;
107		107
108	.hub .mediation-bar ul li.pin{	108	.hub .mediation-bar ul li.pin{
109	height: 25px;	109	height: 25px;
		110	+ margin-right: 10px;
110	}	111	}
111		112
112	.hub .remove{}	113	.hub .remove{}
	@@ -153,6 +154,19 @@ clear: both;		@@ -153,6 +154,19 @@ clear: both;
153	margin-bottom: 2px;	154	margin-bottom: 2px;
154	}	155	}
155		156
		157	+.hub .mediation-comment-form {
		158	+ margin-left: 70px;
		159	+ margin-top: 10px;
		160	+}
		161	+
		162	+.hub input.button.with-text.icon-add.submit{
		163	+ display: block;
		164	+}
		165	+
		166	+.hub ul#mediation-posts .post {
		167	+ padding-bottom: 10px;
		168	+}
		169	+
156	/**/	170	/**/
157		171
158	.hub .live {	172	.hub .live {
	@@ -367,3 +381,35 @@ textarea#message_body {		@@ -367,3 +381,35 @@ textarea#message_body {
367	width: 80%;	381	width: 80%;
368	}	382	}
369		383
		384	+.hub #loading-message,
		385	+.hub #loading-mediation {
		386	+ width: 16px;
		387	+ height: 16px;
		388	+ display: inline-block;
		389	+ float: right;
		390	+ margin-top: 17px;
		391	+ margin-right: 270px;
		392	+}
		393	+
		394	+.hub .loading-mediation-comment {
		395	+ width: 16px;
		396	+ height: 16px;
		397	+ display: inline-block;
		398	+ float: right;
		399	+ margin-top: 16px;
		400	+ margin-right: 260px;
		401	+}
		402	+
		403	+.loading-signal-done {
		404	+ background-image: url(/plugins/community_hub/icons/hub-sverde-a.png);
		405	+}
		406	+
		407	+.loading-signal-error {
		408	+ background-image: url(/plugins/community_hub/icons/hub-svermelho-a.png);
		409	+}
		410	+
		411	+.loading-signal-processing {
		412	+ background-image: url(/plugins/community_hub/icons/hub-samarelo.gif);
		413	+}
		414	+
		415	+