Skip to content
Browse files

design tab improved. Themes added

  • Loading branch information...
1 parent ed75afb commit 00028702fc516f799296d10a1d0da960e93a0381 @randx randx committed
View
9 app/assets/stylesheets/common.scss
@@ -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;
+}
View
8 app/helpers/application_helper.rb
@@ -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
View
2 app/models/user.rb
@@ -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
View
2 app/views/layouts/application.html.haml
@@ -1,7 +1,7 @@
!!! 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
View
2 app/views/layouts/error.html.haml
@@ -1,7 +1,7 @@
!!! 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
View
2 app/views/layouts/profile.html.haml
@@ -1,7 +1,7 @@
!!! 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
View
2 app/views/layouts/project.html.haml
@@ -1,7 +1,7 @@
!!! 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
View
30 app/views/profile/design.html.haml
@@ -1,20 +1,34 @@
-%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();
+ });
+ })
View
6 db/migrate/20120301185805_add_theme_to_user.rb
@@ -0,0 +1,6 @@
+class AddThemeToUser < ActiveRecord::Migration
+ def change
+ add_column :users, :theme_id, :integer, :null => false, :default => 1
+
+ end
+end
View
22 db/schema.rb
@@ -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"

0 comments on commit 0002870

Please sign in to comment.
Something went wrong with that request. Please try again.