Download as
Browse Code »

Commit f746553ba542ed3db38b02de8adf2b39bc99fe73

Authored by Antonio Terceiro
1 parent e7a14fb0
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

Textile quick ref and media search working

Showing 6 changed files with 163 additions and 2 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @f746553
... ... @@ -335,6 +335,12 @@ class CmsController < MyProfileController
335 335 end
336 336 end
337 337  
  338 + def search
  339 + query = params[:q]
  340 + results = query.blank? ? [] : profile.articles.published.find_by_contents(query)
  341 + render :text => results.map { |item| { 'title' => item.title, 'url' => url_for(item.url), :icon => icon_for_article(item), :content_type => item.mime_type }}.to_json, :content_type => 'application/json'
  342 + end
  343 +
338 344 protected
339 345  
340 346 def record_coming
... ...
app/views/cms/_textile_media.rhtml 0 → 100644
  Diff comments   View file @f746553
... ... @@ -0,0 +1,55 @@
  1 +<div class='textile-editor-sidebar'>
  2 + <div class='textile-editor-sidebar-box'>
  3 + <p>
  4 + <strong><%= _('Textile markup quick reference') %></strong>
  5 + <%= link_to(_('(show)'), '#', :id => 'textile-quickref-show') %>
  6 + <%= link_to(_('(hide)'), '#', :id => 'textile-quickref-hide', :style => 'display: none') %>
  7 + </p>
  8 + <div id='textile-quickref' style='display: none;'>
  9 + <p><%= _('Simple formatting:') %> <code>_<%= _('italics') %>_</code> <code>*<%= _('bold') %>*</code>, <code>-<%= _('striked')%>-</code>.</p>
  10 + <p><%= _('Links:') %> <code>"Noosfero":http://noosfero.org/</code></p>
  11 + <p><%= _('Images:') %> <code>!http://example.com/image.png!</code></p>
  12 + <p><%= _('Bullet lists:') %></p>
  13 + <pre>* <%= _('first item') %>
  14 +* <%= _('second item') %></pre>
  15 + <p><%= _('Numbered lists:') %></p>
  16 + <pre># <%= _('first item') %>
  17 +# <%= _('second item') %></pre>
  18 + <p><%= _('See also a more complete <a href="%s">Textile Reference</a>') % 'http://redcloth.org/hobix.com/textile/' %></p>
  19 + </div>
  20 + </div>
  21 + <div class='textile-editor-sidebar-box'>
  22 + <p><strong>Media upload</strong></p>
  23 + <% @folders = profile.folders %>
  24 + <% form_tag({ :action => 'media_upload' }, :multipart => true) do |f| %>
  25 + <%= render :partial => 'upload_file_form', :locals => { :size => 30 } %>
  26 + <% end %>
  27 + <div id='media-upload-results' style='display: none'>
  28 + <ul>
  29 + </ul>
  30 + <p>
  31 + <em><%= _('Drag item names to the text to add their URL') %></em>
  32 + </p>
  33 + <p><%= link_to('#', _('Upload more files'), :id => 'media-upload-more-files') %></p>
  34 + </div>
  35 + </div>
  36 + <div class='textile-editor-sidebar-box'>
  37 + <p><strong>Media search</strong></p>
  38 + <% form_tag({ :action => 'search' }) do %>
  39 + <span class='formfield'>
  40 + <input name='q' type='text' id='media-search-query' style='width: 250px;'/>
  41 + </span>
  42 + <%= submit_button :search, _('Search'), :id => 'media-search-button' %>
  43 + <% end %>
  44 + </form>
  45 + <div id='media-search-results' style='display: none'>
  46 + <ul>
  47 + </ul>
  48 + <p>
  49 + <em><%= _('Drag item names to the text to add their URL') %></em>
  50 + </p>
  51 + </div>
  52 + </div>
  53 +</div>
  54 +
  55 +
... ...
app/views/cms/edit.rhtml
  Diff comments   View file @f746553
... ... @@ -52,5 +52,8 @@
52 52 <% if environment.enabled?('media_panel') && [TinyMceArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
53 53 <%= render :partial => 'media_listing' %>
54 54 <% end %>
  55 +<% if @article.is_a?(TextileArticle) %>
  56 + <%= render :partial => 'textile_media' %>
  57 +<% end %>
55 58  
56 59 <br style='clear: both'/>
... ...
public/javascripts/article.js
  Diff comments   View file @f746553
1   -(function($) {
  1 +jQuery(function($) {
2 2 $(".lead-button").live('click', function(){
3 3 article_id = this.getAttribute("article_id");
4 4 $(this).toggleClass('icon-add').toggleClass('icon-remove');
... ... @@ -10,4 +10,42 @@
10 10 $('#article-body-field').slideToggle();
11 11 return false;
12 12 })
13   -})(jQuery)
  13 +
  14 + $("#textile-quickref-show").click(function(){
  15 + $('#textile-quickref-hide').show();
  16 + $(this).hide();
  17 + $('#textile-quickref').slideToggle();
  18 + return false;
  19 + })
  20 + $("#textile-quickref-hide").click(function(){
  21 + $('#textile-quickref-show').show();
  22 + $(this).hide();
  23 + $('#textile-quickref').slideToggle();
  24 + return false;
  25 + })
  26 + function insert_items(items, selector) {
  27 + var html_for_items = '';
  28 + $.each(items, function(i, item) {
  29 + if (item.content_type && item.content_type.match(/^image/)) {
  30 + html_for_items += '<li class="icon-photos"><img src="' + item.url + '" style="max-height: 96px; max-width: 96px; border: 1px solid #d3d7cf;" alt="' + item.url + '"/><br/><a href="' + item.url + '">' + item.title + '</a></li>';
  31 + } else {
  32 + html_for_items += '<li class="' + item.icon + '"><a href="' + item.url + '">' + item.title + '</a></li>';
  33 + }
  34 + });
  35 + $(selector).html(html_for_items);
  36 + }
  37 + $('#media-search-button').click(function() {
  38 + var query = '*' + $('#media-search-query').val() + '*';
  39 + var $button = $(this);
  40 + $button.toggleClass('icon-loading');
  41 + $.get($(this).parent().attr('action'), { 'q': query }, function(data) {
  42 + $button.toggleClass('icon-loading');
  43 + insert_items(data, '#media-search-results ul');
  44 + if (data.length && data.length > 0) {
  45 + $('#media-search-results').slideDown();
  46 + }
  47 + });
  48 + return false;
  49 + });
  50 +
  51 +});
... ...
public/stylesheets/application.css
  Diff comments   View file @f746553
... ... @@ -3369,6 +3369,52 @@ div.with_media_panel .formfield input {
3369 3369 width: 100%;
3370 3370 }
3371 3371  
  3372 +/* Textile sidebar */
  3373 +
  3374 +.textile-editor-sidebar {
  3375 + position: absolute;
  3376 + width: 380px;
  3377 + right: 20px;
  3378 + top: 70px;
  3379 +}
  3380 +
  3381 +.textile-editor-sidebar-box {
  3382 + background: #eeeeec;
  3383 + border: 1px solid #d3d7cf;
  3384 + padding: 10px 10px 0px 10px;
  3385 + margin-bottom: 10px;
  3386 +}
  3387 +.textile-editor-sidebar-box p {
  3388 + margin-top: 0px;
  3389 +}
  3390 +.textile-editor-sidebar code,
  3391 +.textile-editor-sidebar pre {
  3392 + border: 1px solid #d3d7cf;
  3393 + color: black;
  3394 + padding: 2px;
  3395 +}
  3396 +.textile-editor-sidebar .icon-loading {
  3397 + background-image: url(../images/loading-small.gif);
  3398 +}
  3399 +.textile-editor-sidebar #media-search-results ul {
  3400 + padding: 0px;
  3401 + list-style: none;
  3402 +}
  3403 +.textile-editor-sidebar #media-search-results li {
  3404 + background-repeat: no-repeat;
  3405 + background-position: 0px 0px;
  3406 + padding-left: 20px;
  3407 + padding-top: 2px;
  3408 + padding-bottom: 2px;
  3409 + border: none;
  3410 + margin-bottom: 2px;
  3411 +}
  3412 +.textile-editor-sidebar #media-search-results li:hover {
  3413 + background-color: transparent;
  3414 + border: none;
  3415 +}
  3416 +
  3417 +
3372 3418 /* ==> public/stylesheets/controller_contact.css <== */
3373 3419 /*** SELECT CITY ***/
3374 3420  
... ...
test/functional/cms_controller_test.rb
  Diff comments   View file @f746553
... ... @@ -1618,4 +1618,17 @@ class CmsControllerTest &lt; Test::Unit::TestCase
1618 1618 end
1619 1619 end
1620 1620  
  1621 + should 'search for content for inclusion in articles' do
  1622 + file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/test.txt', 'text/plain'))
  1623 + get :search, :profile => @profile.identifier, :q => 'test.txt'
  1624 + assert_match /test.txt/, @response.body
  1625 + assert_equal 'application/json', @response.content_type
  1626 +
  1627 + data = eval(@response.body.gsub('":', '"=>'))
  1628 + assert_equal 'test.txt', data.first['title']
  1629 + assert_match /\/testinguser\/test.txt$/, data.first['url']
  1630 + assert_match /text/, data.first['icon']
  1631 + assert_match /text/, data.first['content_type']
  1632 + end
  1633 +
1621 1634 end
... ...