Link_List_Block_Improvements: Merge request corrections

(ActionItem2582) Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>

Link_List_Block_Improvements: Merge request corrections
(ActionItem2582) Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Fabio Teixeira
1 parent b15b9498
Showing 5 changed files with 18 additions and 38 deletions Show diff stats
app/controllers/box_organizer_controller.rb
app/views/box_organizer/_link_list_block.rhtml
public/javascripts/edit-link-list.js
public/stylesheets/application.css
test/functional/profile_design_controller_test.rb
@@ -84,7 +84,7 @@ class BoxOrganizerController &lt; ApplicationController
     if request.xhr? and params[:query]
       search = params[:query]
       articles = @profile.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20)
-      path_list = articles.map { |content| content.path }
+      path_list = articles.map { |content| "/{profile}/"+content.path }
       render :json => path_list.to_json
     else
@@ -25,7 +25,7 @@
             <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
           </li>
           <li>
-            <%= button_without_text("", _('Delete'), "#" , :class=>"icon-delete delete-link-list-row") %>
+            <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
           </li>
         </ul>
       </li>
@@ -42,7 +42,7 @@
         content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
         content_tag('li', select_tag('block[links][][target]',
         options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
-        content_tag('li', button_without_text("", _('Delete'), "#" , :class=>"icon-delete delete-link-list-row")),
+        content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
       :class=>"link-list-row new_link_row")
     ) +
     javascript_tag("new_link_action()")
@@ -23,16 +23,7 @@ function new_link_action(){
   jQuery(".delete-link-list-row").click(function(){
     jQuery(this).parent().parent().remove();
-  });
-
-  jQuery(".link-address").blur(function(){
-    var value = jQuery(this).val();
-    var search = /(^$)|(^\/$)|(http|www).*|.*\{profile\}.*|.*(\.com|\.org|\.net|\.edu|\.gov|\.info|\.eu)/;
-
-    if( !search.test(value) ) {
-      value = "/{profile}/"+value;
-      jQuery(this).val(value);
-    }
+    return false;
   });
   jQuery(document).scrollTop(jQuery('#dropable-link-list').scrollTop());
@@ -1864,7 +1864,6 @@ a.button.disabled, input.disabled {
   position: relative;
   left: -24px;
 }
-
 .link-list-header {
   width: 98%;
   height: 25px;
@@ -1872,16 +1871,20 @@ a.button.disabled, input.disabled {
   margin-bottom: 5px;
   cursor: pointer;
 }
-
+.link-list-header li {
+  list-style-type: none;
+  display: inline;
+  font-weight: bold;
+  font-size: 14px;
+  text-align: center;
+}
 #dropable-link-list {
   padding-left: 23px;
   margin-top: -12px;
 }
-
 #dropable-link-list li {
   list-style-type: none;
 }
-
 .link-list-row {
   line-height: 25px;
   margin-bottom: 5px;
@@ -1890,54 +1893,37 @@ a.button.disabled, input.disabled {
   width: 90%;
 }
 .link-list-row:hover {
-  background: #aaa url(/images/drag-and-drop.png) no-repeat;
+  background: #ddd url(/images/drag-and-drop.png) no-repeat;
   background-position: 98% 15px;
 }
-
 .link-list-row li {
   list-style-type: none;
   display: inline;
   margin-left: 5px;
 }
-
 .link-list-row li div {
   float: left;
   margin-top: 4px;
 }
-
 .link-list-row li a {
   line-height: 27px !important;
   padding-right: 5px;
 }
-
-.link-list-header li {
-  list-style-type: none;
-  display: inline;
-  font-weight: bold;
-  font-size: 14px;
-  text-align: center;
-}
-
 .link-list-icon {
   margin-left: 14px;
 }
-
 .link-list-name {
   margin-left: 40px;
 }
-
 .link-list-address {
   margin-left: 90px;
 }
-
 .link-list-target {
   margin-left: 77px;
 }
-
 .new_link_row li {
   margin-left: 7px;
 }
-
 #content .link-list-block {
   padding: 10px 0px 10px 10px;
 }
@@ -326,10 +326,13 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     article3 = fast_create(Article, :profile_id => @profile.id, :name => "Not an article")
     xhr :get, :search_autocomplete, :profile => 'designtestuser' , :query => 'Some'
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
     assert_response :success
-    assert_equal @response.body.include?(article1.path), true
-    assert_equal @response.body.include?(article2.path), true
-    assert_equal @response.body.include?(article3.path), false
+    assert_equal json_response.include?("/{profile}/"+article1.path), true
+    assert_equal json_response.include?("/{profile}/"+article2.path), true
+    assert_equal json_response.include?("/{profile}/"+article3.path), false
   end
   ######################################################
	@@ -84,7 +84,7 @@ class BoxOrganizerController < ApplicationController		@@ -84,7 +84,7 @@ class BoxOrganizerController < ApplicationController
84	if request.xhr? and params[:query]	84	if request.xhr? and params[:query]
85	search = params[:query]	85	search = params[:query]
86	articles = @profile.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20)	86	articles = @profile.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20)
87	- path_list = articles.map { \|content\| content.path }	87	+ path_list = articles.map { \|content\| "/{profile}/"+content.path }
88		88
89	render :json => path_list.to_json	89	render :json => path_list.to_json
90	else	90	else
	@@ -25,7 +25,7 @@		@@ -25,7 +25,7 @@
25	<%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>	25	<%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
26	</li>	26	</li>
27	<li>	27	<li>
28	- <%= button_without_text("", _('Delete'), "#" , :class=>"icon-delete delete-link-list-row") %>	28	+ <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row") %>
29	</li>	29	</li>
30	</ul>	30	</ul>
31	</li>	31	</li>
	@@ -42,7 +42,7 @@		@@ -42,7 +42,7 @@
42	content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +	42	content_tag('li', text_field_tag('block[links][][address]', nil, :class => 'link-address')) +
43	content_tag('li', select_tag('block[links][][target]',	43	content_tag('li', select_tag('block[links][][target]',
44	options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +	44	options_for_select(LinkListBlock::TARGET_OPTIONS, '_self'))) +
45	- content_tag('li', button_without_text("", _('Delete'), "#" , :class=>"icon-delete delete-link-list-row")),	45	+ content_tag('li', button_without_text(:delete, _('Delete'), "#" , :class=>"delete-link-list-row")),
46	:class=>"link-list-row new_link_row")	46	:class=>"link-list-row new_link_row")
47	) +	47	) +
48	javascript_tag("new_link_action()")	48	javascript_tag("new_link_action()")
	@@ -23,16 +23,7 @@ function new_link_action(){		@@ -23,16 +23,7 @@ function new_link_action(){
23		23
24	jQuery(".delete-link-list-row").click(function(){	24	jQuery(".delete-link-list-row").click(function(){
25	jQuery(this).parent().parent().remove();	25	jQuery(this).parent().parent().remove();
26	- });
27	-
28	- jQuery(".link-address").blur(function(){
29	- var value = jQuery(this).val();
30	- var search = /(^$)\|(^\/$)\|(http\|www).\|.\{profile\}.\|.(\.com\|\.org\|\.net\|\.edu\|\.gov\|\.info\|\.eu)/;
31	-
32	- if( !search.test(value) ) {
33	- value = "/{profile}/"+value;
34	- jQuery(this).val(value);
35	- }	26	+ return false;
36	});	27	});
37		28
38	jQuery(document).scrollTop(jQuery('#dropable-link-list').scrollTop());	29	jQuery(document).scrollTop(jQuery('#dropable-link-list').scrollTop());