[Git][noosfero/noosfero][master] 3 commits: Fixes media panel button on content creation

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
406c7192 by Gabriel Silva at 2018-06-21T14:10:04Z
Fixes media panel button on content creation

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
9a5078cb by Gabriel Silva at 2018-06-21T17:18:27Z
Fixes random application_helper test

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
34c660cc by Rodrigo Souto at 2018-06-22T15:04:00Z
Merge branch 'media-panel-btn' into 'master'

Fixes media panel button on content creation

See merge request noosfero/noosfero!1548
- - - - -


6 changed files:

- app/views/cms/_text_editor_sidebar.html.erb
- public/designs/themes/base/stylesheets/cms/media-panel.scss
- public/javascripts/media-panel.js
- public/stylesheets/cms/media-panel.scss
- − test.html
- test/unit/application_helper_test.rb


Changes:

=====================================
app/views/cms/_text_editor_sidebar.html.erb
=====================================
@@ -7,7 +7,7 @@
 
   <div id='media-panel-header' class='header'>
     <strong><%= _('Insert media') %></strong>
-    <%= button('vertical-toggle', _('Show/Hide'), '#', id: "media-panel-button") %>
+    <%= button('caret-square-down', _('Show/Hide'), '#', id: "media-panel-button") %>
   </div>
 
   <%= render(:partial => 'textile_quick_reference') if @article.editor?(Article::Editor::TEXTILE) %>


=====================================
public/designs/themes/base/stylesheets/cms/media-panel.scss
=====================================
@@ -11,7 +11,7 @@
   margin-bottom: 0px;
 }
 
-.text-editor-sidebar .header .icon-vertical-toggle {
+.text-editor-sidebar .header #media-panel-button {
   font-size: 1em !important;
   padding: 0.5em !important;
 }


=====================================
public/javascripts/media-panel.js
=====================================
@@ -158,7 +158,7 @@
     return false;
   });
 
-  $('.icon-vertical-toggle').click(function(){
+  $('#media-panel-button').click(function(){
     $('#content').toggleClass('show-media-panel');
     return false;
   });


=====================================
public/stylesheets/cms/media-panel.scss
=====================================
@@ -89,18 +89,11 @@
   display: flex;
   align-items: center;
   margin: 0 0 10px 0;
-  padding: 10px;
+  padding: 5px 15px;
   font-weight: bold;
   border: 1px solid #d3d7cf;
   background-color: #eeeeec;
-  background-repeat: no-repeat;
-  background-position: 98% 10px;
-  position: relative;
-}
-
-.text-editor-sidebar .header .icon-vertical-toggle {
-  position: absolute;
-  right: 6px;
+  justify-content: space-between
 }
 
 .text-editor-sidebar code,


=====================================
test.html deleted
=====================================
@@ -1,114 +0,0 @@
-<div class="row">
-  <div class="col-one example">One</div>
-  <div class="col-eleven example">Eleven</div>
-</div>
-
-<div class="row">
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-  <div class="col-one example">One</div>
-</div>
-
-<div class="row">
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-</div>
-
-<div class="row">
-  <div class="col-one example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-  <div class="col-one example">Two</div>
-</div>
-
-<div class="row">
-  <div class="col-three example">Three</div>
-  <div class="col-three example">Three</div>
-  <div class="col-three example">Three</div>
-  <div class="col-three example">Three</div>
-</div>
-
-<div class="row">
-  <div class="col-four example">Four</div>
-  <div class="col-four example">Four</div>
-  <div class="col-four example">Four</div>
-</div>
-
-<div class="row">
-  <div class="col-six example">Six</div>
-  <div class="col-six example">Six</div>
-</div>
-
-<div class="row">
-  <div class="col-two example">Two</div>
-  <div class="col-ten example">Ten</div>
-</div>
-
-<div class="row">
-  <div class="col-three example">Three</div>
-  <div class="col-nine example">Nine</div>
-</div>
-
-<div class="row">
-  <div class="col-four example">Four</div>
-  <div class="col-eight example">Eight</div>
-</div>
-
-<div class="row">
-  <div class="col-five example">Five</div>
-  <div class="col-seven example">Seven</div>
-</div>
-
-<div class="row">
-  <div class="col-six example">Six</div>
-  <div class="col-six example">Six</div>
-</div>
-
-<div class="row">
-  <div class="col-seven example">Seven</div>
-  <div class="col-five example">Five</div>
-</div>
-
-<div class="row">
-  <div class="col-eight example">Eight</div>
-  <div class="col-four example">Four</div>
-</div>
-
-<div class="row">
-  <div class="col-eight example">Eight</div>
-  <div class="col-two example">Two</div>
-  <div class="col-two example">Two</div>
-</div>
-
-<div class="row">
-  <div class="col-nine example">Nine</div>
-  <div class="col-two example">Two</div>
-  <div class="col-one example">One</div>
-</div>
-
-<div class="row">
-  <div class="col-ten example">Ten</div>
-  <div class="col-two example">Two</div>
-</div>
-
-<div class="row">
-  <div class="col-eleven example">Eleven</div>
-  <div class="col-one example">One</div>
-</div>
-


=====================================
test/unit/application_helper_test.rb
=====================================
@@ -92,15 +92,13 @@ class ApplicationHelperTest < ActionView::TestCase
     assert_same result, link_to_category(cat)
   end
 
-  should 'nil theme option when no exists theme' do
-    stubs(:current_theme).returns('something-very-unlikely')
-    File.expects(:exists?).returns(false)
+  should 'return nil theme option when theme does not exist' do
+    stubs(:theme_path).returns('/something/very/unlikely')
     assert_nil theme_option()
   end
 
-  should 'nil javascript theme when no exists theme' do
-    stubs(:current_theme).returns('something-very-unlikely')
-    File.expects(:exists?).returns(false)
+  should 'return nil javascript theme when theme does not exist' do
+    stubs(:theme_path).returns('/something/very/unlikely')
     assert_nil theme_javascript
   end
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/ca671e81bc95a39befa51168cf73855f138357b7...34c660cc4ac6378ed5a1a7ca0c3da0b4f1abfeb9

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/ca671e81bc95a39befa51168cf73855f138357b7...34c660cc4ac6378ed5a1a7ca0c3da0b4f1abfeb9
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180622/6c41ebc2/attachment-0001.html>