Merge branch 'stable'

Conflicts: public/stylesheets/application.css test/functional/content_viewer_controller_test.rb

Merge branch 'stable'
Conflicts: public/stylesheets/application.css test/functional/content_viewer_controller_test.rb
Antonio Terceiro
2 parents 30de3875 75b75c8a
Showing 7 changed files with 54 additions and 24 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/display_helper.rb
app/views/content_viewer/view_page.rhtml
public/stylesheets/application.css
test/functional/catalog_controller_test.rb
test/functional/cms_controller_test.rb
test/functional/content_viewer_controller_test.rb
@@ -94,7 +94,11 @@ class CmsController &lt; MyProfileController
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
         if !continue
-          redirect_to @article.view_url
+          if @article.content_type.nil? || @article.image?
+            redirect_to @article.view_url
+          else
+            redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
+          end
         end
       end
     end
@@ -31,9 +31,10 @@ module DisplayHelper
       gsub( /\n\s*\n/, ' <p/> ' ).
       gsub( /\n/, ' <br/> ' ).
       gsub( /(^|\s)(www\.[^\s])/, '\1http://\2' ).
-      gsub( /(https?:\/\/([^\s]+))/,
-            '<a href="\1" target="_blank" rel="nofolow" onclick="return confirm(\'' +
-            escape_javascript( _('Are you sure you want to visit this web site?') ) +
-            '\n\n\'+this.href)">\2</a>' )
+      gsub( /(https?:\/\/([^\s]+))/ ) do
+        href, content = $1, $2.scan(/.{4}/).join('&#x200B;')
+        content_tag(:a, content, :href => href, :target => '_blank', :rel => 'nofolow',
+                    :onclick => "return confirm('%s')" % escape_javascript(_('Are you sure you want to visit this web site?')))
+      end
   end
 end
@@ -55,10 +55,10 @@
       <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :class => 'button with-text icon-new' %>
     <% end %>
   <% end %>
-  <%= article_translations(@page) %>
   <div id="article-header">
     <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= article_title(@page, :no_link => true) %>
+    <%= article_translations(@page) %>
   </div>
 </div>
@@ -1066,6 +1066,7 @@ a.comment-picture {
 .comment-text {
   font-size: 11px;
   padding-right: 10px;
+  overflow: hidden;
 }
 .comment-logged-out .comment-text {
@@ -5685,23 +5686,14 @@ h1#agenda-title {
 	margin-top: 10px;
 }
-
 .article-translations-menu {
-    float: right;
-    bottom: -15px;
-}
-
-.opera .article-translations-menu {
-  bottom: -8px;
-}
-
-.webkit .article-translations-menu {
-  bottom: -10px;
+    bottom: 17px;
 }
 .article-translations-menu {
     text-decoration: none !important;
     height: 0;
+    float: right;
 }
 .article-translations .menu-submenu-header,
@@ -5712,18 +5704,11 @@ h1#agenda-title {
 .article-translations .menu-submenu {
     bottom: auto;
-    top: 60px;
     right: 0;
     border: 1px solid;
     background: #fff;
 }
-.msie7 .article-translations .menu-submenu,
-.webkit .article-translations .menu-submenu,
-.opera .article-translations .menu-submenu {
-  top: 30px;
-}
-
 .article-translations .menu-submenu-list {
     list-style: none;
 }
@@ -80,4 +80,11 @@ class CatalogControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
   end
+  should 'add an zero width space every 4 caracters of comment urls' do
+    url = 'www.an.url.to.be.splited.com'
+    prod = @enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => @product_category, :description => url)
+    get :index, :profile => @enterprise.identifier
+    assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('&#x200B;')
+  end
+
 end
@@ -1551,4 +1551,29 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_tag :a, :content => "An image"
   end
+  should 'update image and be redirect to view_page' do
+    image = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/rails.png', 'image/png'))
+    post :edit, :profile => @profile.identifier, :id => image.id, :article => { }
+    assert_redirected_to image.view_url
+  end
+
+  should 'update article and be redirect to view_page' do
+    a = fast_create(TextileArticle, :profile_id => @profile.id)
+    post :edit, :profile => @profile.identifier, :id => a.id, :article => { }
+    assert_redirected_to a.view_url
+  end
+
+  should 'update file and be redirect to cms' do
+    file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/test.txt', 'text/plain'))
+    post :edit, :profile => @profile.identifier, :id => file.id, :article => { }
+    assert_redirected_to :action => 'index'
+  end
+
+  should 'update file and be redirect to cms folder' do
+    f = fast_create(Folder, :profile_id => @profile.id, :name => 'foldername')
+    file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/test.txt', 'text/plain'), :parent_id => f.id)
+    post :edit, :profile => @profile.identifier, :id => file.id, :article => { :title => 'text file' }
+    assert_redirected_to :action => 'view', :id => f
+  end
+
 end
@@ -1316,4 +1316,12 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'div', :attributes => { :id => 'page-comment-form' }, :descendant => { :tag => 'div', :attributes => { :class => /post_comment_box opened/ } }
   end
+  should 'add an zero width space every 4 caracters of comment urls' do
+    url = 'www.an.url.to.be.splited.com'
+    a = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
+    c = a.comments.create!(:author => @profile, :title => 'An url', :body => url)
+    get :view_page, :profile => @profile.identifier, :page => [ 'textile' ]
+    assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('&#x200B;')
+  end
+
 end
	@@ -80,4 +80,11 @@ class CatalogControllerTest < Test::Unit::TestCase		@@ -80,4 +80,11 @@ class CatalogControllerTest < Test::Unit::TestCase
80	assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}	80	assert_tag :tag => 'a', :attributes => {:href => /assets\/products\?product_category=#{pc.id}/}
81	end	81	end
82		82
		83	+ should 'add an zero width space every 4 caracters of comment urls' do
		84	+ url = 'www.an.url.to.be.splited.com'
		85	+ prod = @enterprise.products.create!(:name => 'Product test', :price => 50.00, :product_category => @product_category, :description => url)
		86	+ get :index, :profile => @enterprise.identifier
		87	+ assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('')
		88	+ end
		89	+
83	end	90	end
	@@ -1551,4 +1551,29 @@ class CmsControllerTest < Test::Unit::TestCase		@@ -1551,4 +1551,29 @@ class CmsControllerTest < Test::Unit::TestCase
1551	assert_tag :a, :content => "An image"	1551	assert_tag :a, :content => "An image"
1552	end	1552	end
1553		1553
		1554	+ should 'update image and be redirect to view_page' do
		1555	+ image = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/rails.png', 'image/png'))
		1556	+ post :edit, :profile => @profile.identifier, :id => image.id, :article => { }
		1557	+ assert_redirected_to image.view_url
		1558	+ end
		1559	+
		1560	+ should 'update article and be redirect to view_page' do
		1561	+ a = fast_create(TextileArticle, :profile_id => @profile.id)
		1562	+ post :edit, :profile => @profile.identifier, :id => a.id, :article => { }
		1563	+ assert_redirected_to a.view_url
		1564	+ end
		1565	+
		1566	+ should 'update file and be redirect to cms' do
		1567	+ file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/test.txt', 'text/plain'))
		1568	+ post :edit, :profile => @profile.identifier, :id => file.id, :article => { }
		1569	+ assert_redirected_to :action => 'index'
		1570	+ end
		1571	+
		1572	+ should 'update file and be redirect to cms folder' do
		1573	+ f = fast_create(Folder, :profile_id => @profile.id, :name => 'foldername')
		1574	+ file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/test.txt', 'text/plain'), :parent_id => f.id)
		1575	+ post :edit, :profile => @profile.identifier, :id => file.id, :article => { :title => 'text file' }
		1576	+ assert_redirected_to :action => 'view', :id => f
		1577	+ end
		1578	+
1554	end	1579	end
	@@ -1316,4 +1316,12 @@ class ContentViewerControllerTest < Test::Unit::TestCase		@@ -1316,4 +1316,12 @@ class ContentViewerControllerTest < Test::Unit::TestCase
1316	assert_tag :tag => 'div', :attributes => { :id => 'page-comment-form' }, :descendant => { :tag => 'div', :attributes => { :class => /post_comment_box opened/ } }	1316	assert_tag :tag => 'div', :attributes => { :id => 'page-comment-form' }, :descendant => { :tag => 'div', :attributes => { :class => /post_comment_box opened/ } }
1317	end	1317	end
1318		1318
		1319	+ should 'add an zero width space every 4 caracters of comment urls' do
		1320	+ url = 'www.an.url.to.be.splited.com'
		1321	+ a = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
		1322	+ c = a.comments.create!(:author => @profile, :title => 'An url', :body => url)
		1323	+ get :view_page, :profile => @profile.identifier, :page => [ 'textile' ]
		1324	+ assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('')
		1325	+ end
		1326	+
1319	end	1327	end