Commit 73176c9e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #131 from randaalex/admin-panel-disign

The simple update of design admin panel
parents c359eadf 7c5e83c0
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
table.round-borders { table.round-borders {
float:left; float:left;
text-align: left;
} }
a { a {
...@@ -207,7 +208,7 @@ input.ssh_project_url { ...@@ -207,7 +208,7 @@ input.ssh_project_url {
.lite_button { .lite_button {
display:block; display:block;
float:left; float:left;
margin: 0px 5px; margin: 0px 5px 0px 0px;
padding:5px 10px; padding:5px 10px;
font-family:"Helvetica Neue", Arial, Helvetica, sans-serif; font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;
......
...@@ -11,8 +11,8 @@ html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms- ...@@ -11,8 +11,8 @@ html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-
body { margin: 0; font-size: 13px; line-height: 1.231; } body { margin: 0; font-size: 13px; line-height: 1.231; }
body, button, input, select, textarea { font-family: sans-serif; color: #222; } body, button, input, select, textarea { font-family: sans-serif; color: #222; }
::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; } ::-moz-selection { background: #79c3e0; color: #fff; text-shadow: none; }
::selection { background: #fe57a1; color: #fff; text-shadow: none; } ::selection { background: #79c3e0; color: #fff; text-shadow: none; }
a { color: #00e; } a { color: #00e; }
a:hover { color: #06e; } a:hover { color: #06e; }
...@@ -315,6 +315,19 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} ...@@ -315,6 +315,19 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
} }
/* eo Errors */ /* eo Errors */
/* Notices */
#notice{background: #dfffe1; padding: 20px; margin-bottom: 20px; border-radius: 5px; color: green; font-size: 1.3em;}
/* eo Notices */
/* InfoBlock */
#infoblock{
background: #eeeeee;
padding: 20px;
margin-bottom: 20px;
border-radius: 5px;
}
/* eo InfoBlock */
/* General */ /* General */
#container{background-color: white; overflow: hidden; } #container{background-color: white; overflow: hidden; }
body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)} body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}
...@@ -588,7 +601,7 @@ body.project-page h2.icon .project-name i.arrow{float: right; ...@@ -588,7 +601,7 @@ body.project-page h2.icon .project-name i.arrow{float: right;
} }
body.project-page h2.icon span{ background-position: -78px -68px; } body.project-page h2.icon span{ background-position: -78px -68px; }
body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; } body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;}
body.project-page .page-title{margin-bottom: 0} body.project-page .page-title{margin-bottom: 0}
body.project-page .project-sidebar {width: 220px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; } body.project-page .project-sidebar {width: 220px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; }
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
%br %br
= f.text_area :description = f.text_area :description
.clear .clear
%hr
.actions .actions
= f.submit 'Save', :class => "lbutton" = f.submit 'Save', :class => "lbutton"
......
%h2= @admin_project.name
= render 'form' = render 'form'
= link_to 'Show', [:admin, @admin_project] = link_to 'Back', admin_projects_path, :class => "right lbutton"
\| = link_to 'Show', [:admin, @admin_project], :class => "right lbutton"
= link_to 'Back', admin_projects_path \ No newline at end of file
...@@ -20,7 +20,5 @@ ...@@ -20,7 +20,5 @@
%td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}" %td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}"
%td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete %td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete
%br
= paginate @admin_projects = paginate @admin_projects
= link_to 'New Project', new_admin_project_path = link_to 'New Project', new_admin_project_path, :class => "lbutton"
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
= render 'form' = render 'form'
= link_to 'Back', admin_projects_path = link_to 'Back', admin_projects_path, :class => 'right lbutton'
\ No newline at end of file
%p#notice= notice - unless notice.nil?
%p#notice= notice
.span-8.colborder
%h2= @admin_project.name
%p %h2= @admin_project.name
%b Name:
%table.round-borders
%tr
%td
%b
Name:
%td
= @admin_project.name = @admin_project.name
%p %tr
%b Code: %td
%b
Code:
%td
= @admin_project.code = @admin_project.code
%p %tr
%b Path: %td
%b
Path:
%td
= @admin_project.path = @admin_project.path
%p %tr
%b Description: %td
%b
Description:
%td
= @admin_project.description = @admin_project.description
%tr
%td{:colspan => 2}
= link_to 'Edit', edit_admin_project_path(@admin_project), :class => "lbutton"
= link_to 'Back', admin_projects_path, :class => "right lbutton"
= link_to 'Edit', edit_admin_project_path(@admin_project)
\|
= link_to 'Back', admin_projects_path
.span-14 .span-14
%h2 Team %h2 Team
%table.round-borders %table.round-borders
%thead
%tr %tr
%th Name %th Name
%th Added %th Added
...@@ -42,4 +58,4 @@ ...@@ -42,4 +58,4 @@
%td.span-2= check_box_tag "admin", 1, @admin_project.admins.include?(tm.user), :disabled => :disabled %td.span-2= check_box_tag "admin", 1, @admin_project.admins.include?(tm.user), :disabled => :disabled
%td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete %td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
= link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}) = link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}), :class => "lbutton"
%p#notice= notice %p#notice= notice
.span-10 #infoblock
%p %p
%b Name: %b Name:
= @admin_team_member.user_name = @admin_team_member.user_name
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%b Since: %b Since:
= @admin_team_member.updated_at = @admin_team_member.updated_at
.span-10 #infoblock
.span-6 .span-6
%b Access: %b Access:
.span-8 .span-8
......
...@@ -44,6 +44,6 @@ ...@@ -44,6 +44,6 @@
%br %br
= f.text_field :twitter = f.text_field :twitter
.clear .clear
%br %hr
.actions .actions
= f.submit 'Save', :class => "lbutton" = f.submit 'Save', :class => "lbutton"
= render 'form' = render 'form'
= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
= link_to 'Back', admin_users_path, :class => "right lbutton" = link_to 'Back', admin_users_path, :class => "right lbutton"
= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
...@@ -18,8 +18,5 @@ ...@@ -18,8 +18,5 @@
%td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}" %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}"
%td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete %td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete
%br
= paginate @admin_users = paginate @admin_users
= link_to 'New User', new_admin_user_path, :class => "lbutton"
= link_to 'New User', new_admin_user_path
%p#notice= notice - unless notice.nil?
%p#notice= notice
.span-8.colborder %h2= @admin_user.name
%p
%b Name: %table.round-borders
= @admin_user.name %tr
%p %td
%b Email: %b
Email:
%td
= @admin_user.email = @admin_user.email
%p %tr
%b Admin: %td
= @admin_user.admin %b
%p Admin:
%b Projects limit: %td= check_box_tag "admin", 1, @admin_user.admin, :disabled => :disabled
%tr
%td
%b
Projects limit:
%td
= @admin_user.projects_limit = @admin_user.projects_limit
- unless @admin_user.skype.empty?
%p %tr
%b Skype: %td
%b
Skype:
%td
= @admin_user.skype = @admin_user.skype
%p - unless @admin_user.linkedin.empty?
%b LinkedIn: %tr
%td
%b
Linkedin:
%td
= @admin_user.linkedin = @admin_user.linkedin
%p - unless @admin_user.twitter.empty?
%b Twitter: %tr
%td
%b
Twitter:
%td
= @admin_user.twitter = @admin_user.twitter
%tr
.clear %td{:colspan => 2}
= link_to 'Edit', edit_admin_user_path(@admin_user) = link_to 'Edit', edit_admin_user_path(@admin_user), :class => "lbutton"
\| = link_to 'Back', admin_users_path, :class => "right lbutton"
= link_to 'Back', admin_users_path
.span-14 .span-14
%h2 Projects %h2 Projects
%table.round-borders %table.round-borders
%tr %tr
%thead
%th Name %th Name
%th Added %th Added
%th Web %th Web
...@@ -52,4 +71,4 @@ ...@@ -52,4 +71,4 @@
%td= link_to 'Edit', edit_admin_team_member_path(tm) %td= link_to 'Edit', edit_admin_team_member_path(tm)
%td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
= link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}) = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "lbutton"
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