isoron/wikiufc
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Alinson S. Xavier
2015-09-05 11:29:13 -04:00
parent 60fea13794
commit 1cf1c28d3a
30 changed files with 154 additions and 1184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/wiki/_history.html.haml
View File

@@ -1,6 +1,6 @@
= action_icon('undo', "Reverter", edit_course_wiki_instance_url(@course, @wiki_page, :description => "Revertendo para versão #{page.version}", :version => page.version)) + " "
= link_to tz(page.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_instance_url(@course, @wiki_page, :version => page.version)
= "por #{link_to h(page.user.display_name), user_path(page.user)}" if page.respond_to?(:user) and !page.user.nil?
= raw action_icon('undo', "Reverter", edit_course_wiki_instance_url(@course, @wiki_page, :description => "Revertendo para versão #{page.version}", :version => page.version)) + " "
= raw link_to tz(page.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_instance_url(@course, @wiki_page, :version => page.version)
= raw "por #{link_to h(page.user.display_name), user_path(page.user)}" if page.respond_to?(:user) and !page.user.nil?
- if page.description and !page.description.empty?
= "(<i>#{h(page.description)}</i>)"
= raw "(<i>#{h(page.description)}</i>)"

8
app/views/wiki/diff.html.haml
View File

@@ -1,11 +1,11 @@
%h4.title= h(@course.full_name)
%h1.title= h(@wiki_page.title)
%h4.title= @course.full_name
%h1.title= @wiki_page.title
%p
Comparando versões:
%ul
%li= render :partial => 'wiki/history', :locals => { :page => @to }
%li= render :partial => 'wiki/history', :locals => { :page => @to }
%li= render :partial => 'wiki/history', :locals => { :page => @from }
= link_to "Comparar outras versões", versions_course_wiki_instance_url(@course, @wiki_page, :from => @from.version, :to => @to.version)
= format_diff h(@diff)
= raw format_diff h(@diff)

4
app/views/wiki/edit.html.haml
View File

@@ -1,7 +1,7 @@
= javascript_include_tag 'wiki'
%h4.title= h(@course.full_name)
%h1.title= "Editar #{h(@wiki_page.title)}"
%h4.title= @course.full_name
%h1.title= "Editar #{(@wiki_page.title)}"
%p
= form_tag course_wiki_instance_url(@course, @wiki_page.id), :method => :put do

2
app/views/wiki/index.html.haml
View File

@@ -11,7 +11,7 @@
%li
= link_to(w.title, course_wiki_instance_url(@course.to_param, w.to_param))
- if w.front_page
%i{:class => 'fa fa-home'}
%i{class: 'fa fa-home', title: 'Exibido na página inicial do curso'}
- else
.box

6
app/views/wiki/show.html.haml
View File

@@ -12,12 +12,12 @@
{:confirm => 'Tem certeza que deseja excluir?', :method => :delete,
:accesskey => '-'}
%h4.title= h(@course.full_name)
%h1.title= h(@wiki_page.title)
%h4.title= @course.full_name
%h1.title= html_escape(@wiki_page.title)
#contents{:style => "display: none"}
%h1 Índice
#wiki_text
= @wiki_page.content.format_wiki
= @wiki_page.content.format_wiki rescue "<p class='wiki-error'>Invalid wiki syntax</p>".html_safe
%script
= "enumerate_headers();"

8
app/views/wiki/versions.html.haml
View File

@@ -9,7 +9,7 @@
== radios_from = #{h(@history_from)};
= form_tag diff_course_wiki_instance_url(@course, @wiki_page), :method => :get do
%button{:type => "submit"}= "Comparar as versões selecionadas"
%button{:type => "submit"} Comparar as versões selecionadas
.box
%table
%tr
@@ -24,12 +24,12 @@
%input{:type => "radio", :name => "to", :value => entry.version, :onclick => "history_to(#{entry.version})"}
%td.narrow
%input{:type => "radio", :name => "from", :value => entry.version, :onclick => %"history_from(#{entry.version})"}
%td= link_to(tz(entry.updated_at).strftime("%d/%m/%y&nbsp;%H:%M:%S"), course_wiki_instance_url(@course, @wiki_page, :version => entry.version))
%td= link_to(tz(entry.updated_at).strftime("%d/%m/%y&nbsp;%H:%M:%S").html_safe, 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
= entry.description
- if (entry.version > @wiki_page.versions.minimum(:version))
= "(" + link_to("diff", diff_course_wiki_instance_url(@course, @wiki_page, :from => entry.version - 1, :to => entry.version)) + ")"
= "(" + link_to("edit", edit_course_wiki_instance_url(@course, @wiki_page, :description => "Revertendo para versão #{entry.version}", :version => entry.version)) + ")"
= raw "(" + link_to("diff", diff_course_wiki_instance_url(@course, @wiki_page, :from => entry.version - 1, :to => entry.version)) + ")"
= raw "(" + link_to("edit", edit_course_wiki_instance_url(@course, @wiki_page, :description => "Revertendo para versão #{entry.version}", :version => entry.version)) + ")"
/= will_paginate @versions