diff --git a/public/javascripts/community_hub.js b/public/javascripts/community_hub.js index c5b62c8..0c73d37 100644 --- a/public/javascripts/community_hub.js +++ b/public/javascripts/community_hub.js @@ -33,6 +33,7 @@ function new_mediation_comment(button, mediation) { if (data.ok) { jQuery("#mediation-comment-form-" + mediation + " textarea").val(''); jQuery(".loading-mediation-comment").filter("#" + mediation).addClass("loading-signal-done"); + update_mediation_comments(mediation); setTimeout(function(){ clearLoadingMediationCommentSignal(mediation); }, 3000); @@ -79,6 +80,7 @@ function new_mediation(button) { if (data.ok) { jQuery("#loading-mediation").addClass("loading-signal-done"); tinymce.get('article_body').setContent(''); + update_mediations(); setTimeout(clearLoadingMediationSignal, 3000); } else { @@ -140,7 +142,7 @@ function pin_message(post_id) { function update_mediation_comments(mediation) { - if (jQuery("#mediation-section.show").size() != 0) { + if (jQuery("#right-tab.show").size() != 0) { var hub_id = jQuery(".hub").attr('id'); @@ -201,7 +203,7 @@ function update_mediations() { } - setTimeout(update_mediations, 7000); + setTimeout(update_mediations, 5000); } @@ -270,5 +272,5 @@ jQuery(document).ready(function() { jQuery(".hub #right-tab.hide").click(hub_right_tab_click); setTimeout(update_live_stream, 5000); - setTimeout(update_mediations, 7000); + setTimeout(update_mediations, 5000); }); diff --git a/public/style.css b/public/style.css index 4ca9cc4..b1b5dc7 100644 --- a/public/style.css +++ b/public/style.css @@ -189,9 +189,9 @@ div.content-tab.hide { vertical-align: top; } -.hub .mediation-bar ul li.pin{ +.hub .mediation-bar ul li.pin { height: 25px; - /*margin-right: 10px;*/ + margin-right: 15px; } .hub .remove{} @@ -520,19 +520,30 @@ background-color: #f9f9f9; /****fim aba mediation aberta****/ -.hub .form { +.hub .form-mediation { /*clear: left;*/ /*float: left;*/ - width: 47%; + width: 93%; display: inline-block; - height: 323px; + height: 376px; padding: 10px; border: 1px solid #c0c0c0; } +.hub .form-message { + /*clear: left;*/ + /*float: left;*/ + width: 93%; + display: inline-block; + height: 148px; + padding: 10px; + border: 1px solid #c0c0c0; +} + + .hub div.settings { - float: right; - width: 50%; + width: 96%; + margin-top: 10px; } .hub ul.settings li { @@ -646,7 +657,7 @@ textarea#message_body { display: inline-block; float: right; margin-top: -24px; - margin-right: 260px; + margin-right: 585px; } .hub .loading-mediation-comment { @@ -655,7 +666,7 @@ textarea#message_body { display: inline-block; float: right; margin-top: -25px; - margin-right: 555px; + margin-right: 440px; } .loading-signal-done { diff --git a/views/cms/community_hub_plugin/_hub.rhtml b/views/cms/community_hub_plugin/_hub.rhtml index d5d70d2..384d35a 100644 --- a/views/cms/community_hub_plugin/_hub.rhtml +++ b/views/cms/community_hub_plugin/_hub.rhtml @@ -14,10 +14,6 @@
- <%= labelled_form_field(_('Proxy URL[:port] leave blank for none (example: http://161.148.1.167:3128)'), text_field(:article, :proxy_url, :size => '64', :maxlength => 150)) %> -
-
-
<%= _('Twitter Settings:') %>

@@ -25,8 +21,6 @@

<%= required labelled_form_field(_('Twitter\'s Hashtags, comma separated words
(example: participa.br,participabr,arenanetmundial,netmundial'), text_field(:article, :hashtags_twitter)) %>

- <%= required labelled_form_field(_('Twitter\'s token file
use "twurlrc_mariajoseopinto" for production and "twurlrc" for development and test'), text_field(:article, :twitter_token_file)) %>
-
<%= _('Facebook Settings:') %>
@@ -35,8 +29,4 @@

<%= required labelled_form_field(_('Id of Facebook\'s page which will be listened for comments (example: participabr'), text_field(:article, :facebook_page_id)) %>
- <%= required labelled_form_field(_('Facebook\'s access token (don\'t change unless last one has expired)'), text_field(:article, :facebook_access_token)) %> -
- <%= _('How to get a new access token?') %> -
- \ No newline at end of file + diff --git a/views/community_hub_plugin_public/_settings.rhtml b/views/community_hub_plugin_public/_settings.rhtml index 42ec2bc..68e6f50 100644 --- a/views/community_hub_plugin_public/_settings.rhtml +++ b/views/community_hub_plugin_public/_settings.rhtml @@ -1,7 +1,7 @@
-
\ No newline at end of file + diff --git a/views/content_viewer/hub.rhtml b/views/content_viewer/hub.rhtml index 1eb25da..d49e3c7 100644 --- a/views/content_viewer/hub.rhtml +++ b/views/content_viewer/hub.rhtml @@ -8,7 +8,6 @@
-

<%= @page.title %><%= _("Live") %> @@ -32,7 +31,7 @@ <% if logged_in? %> -
+
<%= render :file => 'shared/tiny_mce' %> @@ -61,7 +60,7 @@ <% if logged_in? %> -
+
<% form_for :message, :method => 'post', @@ -72,7 +71,7 @@ } do |f| %> <%= _("Streaming") %>
- <%= f.text_area :body, :style => "width: 99%;", :cols => "38", :rows => "10", :placeholder => _("Type your message here") %> + <%= f.text_area :body, :style => "width: 99%;", :cols => "38", :rows => "5", :placeholder => _("Type your message here") %> <%= submit_button('add', _('Post'), :onclick => 'new_message(this); return false;') %> <% end %> @@ -81,11 +80,6 @@ <% end %> - -
<% end %> -- libgit2 0.21.2