cafe-grader-web

Commit r22:b40095435f1f public

parent | child
Description:
small changes, layouts git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@46 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r22:b40095435f1f - - 3 files changed: 4 inserted, 4 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,16 +1,16
1 1 # Methods added to this helper will be available to all templates in the application.
2 2 module ApplicationHelper
3 3
4 - def user_options
4 + def user_header
5 5 options = ''
6 6 user = User.find(session[:user_id])
7 7 if user.admin?
8 8 options = options + ' ' +
9 9 (link_to_unless_current '[Problem admin]',
10 10 :controller => 'problems', :action => 'index')
11 11 options = options + ' ' +
12 12 (link_to_unless_current '[User admin]',
13 13 :controller => 'user_admin', :action => 'index')
14 14 end
15 15 options += link_to_unless_current '[Main]',
16 16 :controller => 'main', :action => 'list'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,22 +1,22
1 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2 2 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3 3
4 4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
5 5 <head>
6 6 <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
7 7 <title>Grader!</title>
8 8 <%= stylesheet_link_tag 'application' %>
9 9 <%= javascript_include_tag :defaults %>
10 10 </head>
11 11 <body>
12 12
13 - <div class="usermenu">
14 - <%= user_options %>
13 + <div class="userbar">
14 + <%= user_header %>
15 15 </div>
16 16
17 17 <p style="color: green"><%= flash[:notice] %></p>
18 18
19 19 <%= yield %>
20 20
21 21 </body>
22 22 </html>
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -5,25 +5,25
5 5 div.title {
6 6 font-size: 20px;
7 7 font-weight: bold;
8 8 background: lightgreen;
9 9 padding: 2px;
10 10 }
11 11
12 12 div.problist-each {
13 13 margin-top: 2px;
14 14 margin-bottom: 2px
15 15 }
16 16
17 - div.usermenu {
17 + div.userbar {
18 18 border-top: thin solid grey;
19 19 border-bottom: thin solid grey;
20 20 text-align: right;
21 21 font-size: 12px;
22 22 }
23 23
24 24 div.probname {
25 25 background-color: #eeeeee;
26 26 font-weight: bold;
27 27 padding: 2px;
28 28 border: 1px solid black;
29 29 }
You need to be logged in to leave comments. Login now