Minor fixes

This commit is contained in:
2015-09-05 11:29:13 -04:00
parent 60fea13794
commit 1cf1c28d3a
30 changed files with 154 additions and 1184 deletions

View File

@@ -6,6 +6,7 @@
%title= @title || App.title
%meta{'name' => 'robots', :content => 'noindex,nofollow'}
%meta{'http-equiv' => 'Content-Type', 'content' => 'text/html; charset=UTF-8'}
%meta{'name' => "viewport", 'content' => "width=device-width" }
= stylesheet_link_tag :wiki
%link{'href' => "#{App.base_path}/favicon.ico", 'rel' => 'icon', 'type' => 'image/vnd.microsoft.icon'}
@@ -26,44 +27,48 @@
= csrf_meta_tag
%body{'onload' => 'javascript: startup()'}
#wrapper
#header
%h1= "<strong>Wiki</strong> UFC"
#header_menu
#header
.wrapper2
%h1
%strong Wiki
UFC
#header_menu
.wrapper2
%ul
- if logged_in?
%li.grey= t(:logged_in_as, :u => h(@current_user.display_name))
%li.grey= h(@current_user.display_name)
%li.last= link_to 'Logout', logout_path, :accesskey => 'l'
- else
%li= link_to 'Cadastrar', signup_path
%li.last= link_to 'Login', login_path, :accesskey => 'l'
#wrapper
.wrapper2
#strip
#strip
#flash
= flash_div
#location
= @location
#location
= flash_div
= @location
#site
%div
- if @right_panel.nil?
.float_panel_left= @left_panel
#innerwrapper_2column
.content= @content
- else
.float_panel_left= @left_panel
.float_panel_right= @right_panel
#innerwrapper_3column
.content= @content
%br{'style' => 'clear:both'}
#site
%div
- if @right_panel.nil?
.float_panel_left= @left_panel
#innerwrapper_2column
.content= @content
- else
.float_panel_left= @left_panel
.float_panel_right= @right_panel
#innerwrapper_3column
.content= @content
%br{'style' => 'clear:both'}
#footer
%p
%b Wiki
UFC
%p
Powered by Ruby on Rails, PostgreSQL & Linux
Desenvolvido em Ruby on Rails
%p
Distribuido livremente sob a
%a{href: 'https://www.gnu.org/licenses/agpl-3.0.en.html'}

View File

@@ -1,15 +1,16 @@
- @title = "#{App.title} - #{h(@course.full_name)}"
- @location = capture do
- @location = capture do
= link_to(App.title, index_url, :accesskey => 'z') + ""
= link_to("Disciplinas", courses_url) + ""
= link_to(h(@course.full_name), course_url(@course)) + ""
= link_to("Arquivos", course_attachments_url(@course))
- if @attachment.id
= "" + link_to(truncate(h(@attachment.file_name)), course_attachment_url)
= ""
=link_to(truncate(h(@attachment.file_name)), course_attachment_url)
- @title = @title + " - #{truncate(h(@attachment.file_name))}"
- @left_panel = render 'courses/left_panel'
- @right_panel = render 'courses/right_panel'
- @content = yield
= render 'layouts/base'
= render 'layouts/base'

View File

@@ -3,7 +3,8 @@
= link_to(App.title, index_url, :accesskey => 'z') + "";
= link_to("Disciplinas", courses_url)
- if @course and @course.id
= " " + link_to(h(@course.full_name), course_url)
= " "
=link_to(h(@course.full_name), course_url)
- @title = @title + " - #{h(@course.full_name)}"
- else
- @title = @title + " - Disciplinas"

View File

@@ -3,7 +3,8 @@
= link_to(App.title, index_url, :accesskey => 'z') + "";
= link_to("Usuários", users_path)
- if @user and @user.id
= " " + link_to(h(@user.name), user_url(@user))
= " "
=link_to(h(@user.name), user_url(@user))
- @title = @title + " - #{h(@user.display_name)}"
- @left_panel = render('widgets/menu_navigation') + render('widgets/menu_user')

View File

@@ -1,14 +1,15 @@
- @title = "#{App.title} - #{h(@course.full_name)}"
- @location = capture do
- @location = capture do
= link_to(App.title, index_url, :accesskey => 'z') + ""
= link_to("Disciplinas", courses_url) + ""
= link_to(h(@course.full_name), course_url(@course)) + ""
= link_to("Wiki", course_wiki_url(@course))
- if @wiki_page.title?
= "" + link_to(h(@wiki_page.title), course_wiki_instance_url(@course.to_param, @wiki_page))
= ""
=link_to(h(@wiki_page.title), course_wiki_instance_url(@course.to_param, @wiki_page))
- @title = @title + " - #{h(@wiki_page.title)}"
- @left_panel = render 'courses/left_panel'
- @content = yield
= render 'layouts/base'
= render 'layouts/base'