---
src/app/stylesheets/aggregator.scss | 20 ++++++++---
src/app/views/users/_form.haml | 64 +++++++++++++++++-----------------
src/app/views/users/edit.haml | 24 ++++++------
src/app/views/users/show.haml | 50 +++++++++++++++------------
4 files changed, 86 insertions(+), 72 deletions(-)
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index 95d4464..af5f8fe 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -105,6 +105,14 @@ input[type='submit'],button,.button {
margin-left: 3px;
margin: 40px 4px 4px;
}
+ &.formbutton {
+ display: inline-block;
+ margin-left: 3px;
+ margin: 40px 4px 4px;
+ }
+ &.actionlink {
+ margin: 40px 0 0;
+ }
&.disabled {
cursor: default;
background: transparent;
@@ -581,7 +589,7 @@ li.operation>ul, li.administration>ul, li.build>ul,
li.runtime>ul {
.modalbox {
margin: 150px auto;
@include box-shadow(0,1px,5px,rgba(0, 0, 0, 0.6));
- width: 500px;
+ width: 550px;
overflow: hidden;
h2 {
background-color: $formheadbg;
@@ -608,11 +616,15 @@ li.operation>ul, li.administration>ul, li.build>ul,
li.runtime>ul {
}
/* FORMS */
-
/* generic */
label {
- /* padding: 4px 10px 4px 0; so that it aligns to the padding of the
inputboxes */
+ text-align: right;
+ font-weight: bold;
+ &.la {
+ text-align: left;
+ }
&.big {
+ text-align: left;
text-transform: uppercase;
font-family: $headlinefont;
font-size: 110%;
@@ -662,8 +674,6 @@ label {
}
}
-
-
/* WIZARD TILES */
ul.tiles {
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml
index b629d5e..dea0584 100644
--- a/src/app/views/users/_form.haml
+++ b/src/app/views/users/_form.haml
@@ -1,37 +1,37 @@
+%fieldset.clear
+ = form.label :login, "Choose a username:", :class => "grid_3 alpha"
+ = form.text_field :login, :class => "grid_5"
+%fieldset.clear
+ = form.label :password, form.object.new_record? ? "Choose a password:" :
"Change password:", :class => "grid_3 alpha"
+ = form.password_field :password, :class => "grid_5"
%fieldset
- = form.label :login, "Choose a username:"
- = form.text_field :login
-%fieldset
- = form.label :password, form.object.new_record? ? "Choose a password:" :
"Change password:"
- = form.password_field :password
-%fieldset
- = form.label :password_confirmation, "Confirm password:"
- = form.password_field :password_confirmation
+ = form.label :password_confirmation, "Confirm password:", :class => "grid_3
alpha"
+ = form.password_field :password_confirmation, :class => "grid_5"
-if has_user_modify?
- %fieldset
- = form.label :user_status
- = radio_button_tag "user_status","Active",true
- = label_tag "user_status", "Active"
- = radio_button_tag "user_status","Inactive"
- = label_tag "user_status", "Inactive"
-%fieldset
- = form.label :first_name
- = form.text_field :first_name
-%fieldset
- = form.label :last_name
- = form.text_field :last_name
-%fieldset
- = form.label :email
- = form.text_field :email
+ %fieldset.clear
+ = form.label :user_status, "User Status:", :class => "alpha grid_3"
+ .grid_5
+ = radio_button_tag "user_status","Active",true
+ = label_tag "user_status_active", "Active"
+ = radio_button_tag "user_status","Inactive"
+ = label_tag "user_status_inactive", "Inactive"
+%fieldset.clear
+ = form.label :first_name, "First Name:", :class => "alpha grid_3"
+ = form.text_field :first_name, :class => "grid_5"
+%fieldset.clear
+ = form.label :last_name, "Last Name:", :class => "alpha grid_3"
+ = form.text_field :last_name, :class => "grid_5"
+%fieldset.clear
+ = form.label :email, "E-Mail:", :class => "alpha grid_3"
+ = form.text_field :email, :class => "grid_5"
-if has_user_modify?
- %h3 USER TREATMENT
- = label_tag 'apply_treatment', "Apply User Treatment:"
- = select_tag 'user_treatment', options_for_select(["Choose Treatment"])
- = submit_tag 'Apply', :disabled => true
- %br/
- %hr
+ %h3.grid_16 User Treatment
+ = label_tag 'apply_treatment', "Apply User Treatment:", :class => "alpha
grid_3"
+ = select_tag 'user_treatment', options_for_select(["Choose Treatment"]),
:class => "grid_5"
+ = submit_tag 'Apply', :disabled => true, :class => "grid_1"
+
- form.fields_for :quota do |quota_form|
- %fieldset
- = quota_form.label :maximum_running_instances
- = quota_form.text_field :maximum_running_instances
+ %fieldset.clear
+ = quota_form.label :maximum_running_instances, "Maximum Runnig
Instances: ", :class => "alpha grid_3"
+ = quota_form.text_field :maximum_running_instances, :class => "grid_5"
(instances)
diff --git a/src/app/views/users/edit.haml b/src/app/views/users/edit.haml
index fd333b9..54b9c26 100644
--- a/src/app/views/users/edit.haml
+++ b/src/app/views/users/edit.haml
@@ -1,20 +1,20 @@
.formwindow
- if has_user_modify?
- %h2
- EDITING USER:
+ %h2.grid_16
+ Editing User:
= @user.first_name + " " + @user.last_name
- %h3 BASIC USER INFORMATION
+ %h3.grid_16 Basic User Information
- else
- %h2 Edit an Account
+ %h2.grid_16 Edit an Account
- form_for @user, :url => { :action => 'update' } do |f|
= f.error_messages
= hidden_field :user, :id, :value => @user.id
= render :partial => "form", :object => f
- - if has_user_modify?
- = f.submit "Back", :class => "formbutton", :name => "back"
- = f.submit "Reset", :class => "formbutton", :name => "reset"
- = f.submit "Save", :class => "formbutton", :name => "save"
- - else
- = f.submit "Make Changes", :class => "formbutton", :name => "make_changes"
- %br/
- = link_to "Cancel", account_path, :class => "formbuton"
+ %fieldset.clear
+ = link_to "Cancel", account_path, :class => "formbutton button clear"
+ - if has_user_modify?
+ = f.submit "Back", :class => "formbutton button", :name => "back"
+ = f.submit "Reset", :class => "formbutton button", :name => "reset"
+ = f.submit "Save", :class => "formbutton button", :name => "save"
+ - else
+ = f.submit "Make Changes", :class => "formbutton button", :name =>
"make_changes"
diff --git a/src/app/views/users/show.haml b/src/app/views/users/show.haml
index 6afa2cd..fd7254f 100644
--- a/src/app/views/users/show.haml
+++ b/src/app/views/users/show.haml
@@ -1,25 +1,29 @@
-.dcloud_form
+.dcloud_form.grid_16
%h2
User Profile for #{h @user.login}
- %p
- %b Username:
- = h @user.login
- %p
- %b Login count:
- = h @user.login_count
- %p
- %b Last request at:
- = h @user.last_request_at
- %p
- %b Last login at:
- = h @user.last_login_at
- %p
- %b Current login at:
- = h @user.current_login_at
- %p
- %b Last login ip:
- = h @user.last_login_ip
- %p
- %b Current login ip:
- = h @user.current_login_ip
- = link_to 'Edit', edit_account_path, :class => 'actionlink'
+ %ul.block
+ %li.block.grid_3.alpha
+ %label Username:
+ %li.block.grid_5
+ = h @user.login
+ %li.block.grid_3
+ %label Login Count:
+ %li.block.grid_5.omega
+ = h @user.login_count
+ %li.block.grid_3.alpha.clear
+ %label Last Request at:
+ %li.block.grid_5
+ = h @user.last_request_at
+ %li.block.grid_3
+ %label Current Login at:
+ %li.block.grid_5.omega
+ = h @user.current_login_at
+ %li.block.grid_3.alpha.clear
+ %label Last Login IP:
+ %li.block.grid_5
+ = h @user.last_login_ip
+ %li.block.grid_3
+ %label Current Login IP:
+ %li.block.grid_5.omega
+ = h @user.current_login_ip
+ = link_to 'Edit', edit_account_path, :class => 'actionlink button'
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
