Commit 00028702 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

design tab improved. Themes added

parent 1552eb83f829
......@@ -642,3 +642,12 @@ p.time {
}
}
}
.styled_image {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-moz-box-shadow: 0 0 5px #888;
-webkit-box-shadow: 0 0 5px#888;
box-shadow: 0 0 5px #888;
}
......@@ -113,4 +113,12 @@ def ldap_enable?
def layout
controller.send :_layout
end
def app_theme
if current_user && current_user.theme_id == 1
"ui_basic"
else
"ui_mars"
end
end
end
......@@ -6,7 +6,7 @@ class User < ActiveRecord::Base
# Setup accessible (or protected) attributes for your model
attr_accessible :email, :password, :password_confirmation, :remember_me,
:name, :projects_limit, :skype, :linkedin, :twitter, :dark_scheme
:name, :projects_limit, :skype, :linkedin, :twitter, :dark_scheme, :theme_id
has_many :users_projects, :dependent => :destroy
has_many :projects, :through => :users_projects
......
!!! 5
%html{ :lang => "en"}
= render "layouts/head"
%body.ui_basic.application
%body{:class => "#{app_theme} application"}
= render "layouts/flash"
= render "layouts/head_panel", :title => "Dashboard"
.container
......
!!! 5
%html{ :lang => "en"}
= render "layouts/head"
%body.ui_basic.application
%body{:class => "#{app_theme} application"}
= render "layouts/flash"
= render "layouts/head_panel", :title => ""
.container
......
!!! 5
%html{ :lang => "en"}
= render "layouts/head"
%body.ui_basic.profile
%body{:class => "#{app_theme} profile"}
= render "layouts/flash"
= render "layouts/head_panel", :title => "Profile"
.container
......
!!! 5
%html{ :lang => "en"}
= render "layouts/head"
%body.ui_basic.project
%body{:class => "#{app_theme} project"}
= render "layouts/flash"
= render "layouts/head_panel", :title => @project.name
.container
......
%h3 Design
%hr
= form_for @user, :url => profile_update_path, :method => :put do |f|
= form_for @user, :url => profile_update_path, :remote => true, :method => :put do |f|
%h3 Application theme
%hr
.clearfix
= label_tag do
= f.radio_button :theme_id, 1
Default
= label_tag do
= f.radio_button :theme_id, 2
Classic
%br
%h3 Code review
%hr
.row
%label.span4{:for => "user_dark_scheme_false"}
= image_tag "white.png", :width => 210
%center
%h4
= f.radio_button :dark_scheme, false
White code preview
= image_tag "white.png", :width => 210, :class => "styled_image"
%label.span4{:for => "user_dark_scheme_true"}
= image_tag "dark.png", :width => 210
%center
%h4
= f.radio_button :dark_scheme, true
Dark code preview
.clearfix
.actions
= f.submit 'Save', :class => "btn"
= image_tag "dark.png", :width => 210, :class => "styled_image"
:javascript
$(function(){
$(".edit_user input").bind("click", function() {
$(".edit_user").submit();
});
})
class AddThemeToUser < ActiveRecord::Migration
def change
add_column :users, :theme_id, :integer, :null => false, :default => 1
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20120228134252) do
ActiveRecord::Schema.define(:version => 20120301185805) do
create_table "events", :force => true do |t|
t.string "target_type"
......@@ -24,6 +24,18 @@
t.integer "action"
end
create_table "features", :force => true do |t|
t.string "name"
t.string "branch_name"
t.integer "assignee_id"
t.integer "author_id"
t.integer "project_id"
t.datetime "created_at"
t.datetime "updated_at"
t.string "version"
t.integer "status", :default => 0, :null => false
end
create_table "issues", :force => true do |t|
t.string "title"
t.integer "assignee_id"
......@@ -150,6 +162,7 @@
t.string "twitter", :default => "", :null => false
t.string "authentication_token"
t.boolean "dark_scheme", :default => false, :null => false
t.integer "theme_id", :default => 1, :null => false
end
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
......@@ -163,13 +176,6 @@
t.integer "project_access", :default => 0, :null => false
end
create_table "web_hook_urls", :force => true do |t|
t.string "url"
t.integer "project_id"
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "web_hooks", :force => true do |t|
t.string "url"
t.integer "project_id"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment