Refactoring

app/views/courses/show.html.haml

@@ -40,10 +40,10 @@
           =action_icon 'arrow2_s', t(:move_down), move_down_course_wiki_instance_url(@course.to_param, wiki.id) unless wiki.last?
           - if wiki.last?
             %span{:style => 'margin-right: 14px'}  
-        =link_to h(wiki.title), course_wiki_instance_url(@course.to_param, wiki.id)
+        =link_to h(wiki.title), course_wiki_instance_url(@course.to_param, wiki.to_param)
     - if @course.wiki_pages.empty?
       %li.no_itens= t(:no_wiki_pages)
-    - else
+    - if @course.hidden_wiki_pages?
       %li.show_all= link_to t(:see_all_wiki_pages), course_wiki_url(@course)
 
   .box

app/views/layouts/_base.html.haml

@@ -16,11 +16,14 @@
 
     /[if lte IE 6]
       %link{:href => "#{App.base_path}/stylesheets/ie/ie6.css", :rel => "stylesheet", :type => "text/css"}
-    
+
     %script{:type => 'text/javascript'}
       == BASE_PATH = "#{App.base_path}";
     = javascript_include_tag 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML'
     = javascript_include_tag :base
+    %link{:rel => 'stylesheet', :href => 'https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css'}
+
+    = csrf_meta_tag
 
   %body{'onload' => 'javascript: startup()'}
     #wrapper
@@ -54,6 +57,5 @@
             #innerwrapper_3column
               .content= @content
         %br{'style' => 'clear:both'}
-      
-    #footer
 
+    #footer

app/views/wiki/index.html.haml

@@ -7,8 +7,11 @@
 .box.div_news
   - if !@course.wiki_pages.empty?
     %ul
-      - @course.wiki_pages.find(:all, :order => 'title').each do |w|
-        %li= link_to(w.title, course_wiki_instance_url(@course.to_param, w.id))
+      - @course.wiki_pages.reorder('UPPER(title)').each do |w|
+        %li
+          = link_to(w.title, course_wiki_instance_url(@course.to_param, w.to_param))
+          - if w.front_page
+            %i{:class => 'fa fa-home'}
 
   - else
     .box

app/views/wiki/show.html.haml

@@ -2,9 +2,15 @@
 
 = javascript_include_tag 'wiki'
 .cmd
-  = action_icon 'edit', 'Editar', edit_course_wiki_instance_url, :accesskey => 'e'
-  = action_icon 'undo', 'Historico', versions_course_wiki_instance_url, :accesskey => 'h'
-  = action_icon 'trash', 'Excluir página wiki', course_wiki_instance_url, :confirm => 'Tem certeza que deseja excluir?', :method => :delete, :accesskey => '-'
+  = action_icon 'edit', 'Editar', edit_course_wiki_instance_url,
+      :accesskey => 'e'
+
+  = action_icon 'undo', 'Historico', versions_course_wiki_instance_url,
+      :accesskey => 'h'
+
+  = action_icon 'trash', 'Excluir página wiki', course_wiki_instance_url,
+      {:confirm => 'Tem certeza que deseja excluir?', :method => :delete,
+       :accesskey => '-'}
 
 %h4.title= h(@course.full_name)
 %h1.title= h(@wiki_page.title)
@@ -15,4 +21,3 @@
 
 %script
   = "enumerate_headers();"
-

app/views/wiki/versions.html.haml

@@ -21,9 +21,9 @@
       - @wiki_page.versions.reverse.each do |entry|
         %tr
           %td.narrow
-            %input{:type => "radio", :name => "from", :value => entry.version, :onclick => "history_from(#{entry.version})"}
+            %input{:type => "radio", :name => "to", :value => entry.version, :onclick => "history_to(#{entry.version})"}
           %td.narrow
-            %input{:type => "radio", :name => "to", :value => entry.version, :onclick => %"history_to(#{entry.version})"}
+            %input{:type => "radio", :name => "from", :value => entry.version, :onclick => %"history_from(#{entry.version})"}
           %td= link_to(tz(entry.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_instance_url(@course, @wiki_page, :version => entry.version))
           %td= link_to truncate(h(User.with_deleted.find(entry.user_id).display_name), :length => 20), user_path(User.with_deleted.find(entry.user_id))
           %td