Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Settings dummy preview

  • Loading branch information...
commit 24420eef10ac3ca3ee77b743240ffd187f5dc490 1 parent cfb89e4
Eduardo Casanova Roendal authored
5 app/assets/stylesheets/base.css
@@ -100,7 +100,7 @@ textarea.new_contact_text_area{ width:100%; height: 100px; color: #2A3890;}
100 100 padding-left: 10px; display: block; height:20px; font-weight:bold;}
101 101 .block .header_icon{ margin-top: 2px; width:14px; height:14px; }
102 102 .block .header_icon_right { float: right; padding-right: 5px; padding-top: 3px;}
103   -.block .header_text { margin-bottom: 3px; display: inline-block;}
  103 +.block .header_text { margin-top: 3px; display: inline-block;}
104 104 .block .logo{ display: inline-block; vertical-align:top;}
105 105 .block .right{padding-right:20px; float:right;}
106 106 .block .row { display: block;}
@@ -129,7 +129,8 @@ textarea.new_contact_text_area{ width:100%; height: 100px; color: #2A3890;}
129 129 .block .form_tag_long{border-color: #0656a4; color: #2A3890; padding: 5px 5px 5px 5px; border:1px solid #BDC7D8; width:91%;}
130 130 .block .form_label{display:inline-block; width:25%; font-weight:bold; vertical-align:top; padding-top:3px;}
131 131 .block .form_field{ display:inline-block; padding: 0px; width:73%;}
132   -.block .form_row { display: block; padding:5px; padding-left:20px; }
  132 +.block .form_row {display: block; padding:5px; padding-left:20px;}
  133 +.block .form_sub_row {display: block; padding:5px; padding-left:30px;}
133 134 .block .label{ display:inline-block; width:49%; }
134 135 .block .two_columns_container { margin-top: 5px; }
135 136 .block .form_column_left { display: block; padding:5px; padding-left:20px; float: left; width:60%; text-align: center;}
4 app/assets/stylesheets/messages.css
@@ -45,6 +45,10 @@
45 45 .message .date {
46 46 color: #6C6D6F;
47 47 }
  48 +.message ul {
  49 + margin: 0px 5px
  50 + ;padding-left:40px;
  51 +}
48 52 .conversation_full .messages .unread .header{
49 53 background-color: #E0E0FF;
50 54 }
5 app/assets/stylesheets/settings.css
... ... @@ -0,0 +1,5 @@
  1 +/******************** Common ***********************/
  2 +.settings_block {
  3 + display:block;
  4 + padding-left:10px;
  5 +}
40 app/views/settings/_index.html.erb
... ... @@ -1,4 +1,40 @@
1 1 <%= location(link_to(image_tag("btn/btn_config.png", :class => "btn_config")+t('account.one')+": "+t('account.settings')))%>
2 2 <br class="clearfloat" />
3   -<div class="space_center"></div>
4   -<div class="space_center"></div>
  3 +<div class="space_center">
  4 +</div>
  5 +<h2><%= t('account.settings')%></h2>
  6 +<div class="space_center">
  7 +</div>
  8 +<div class="block" id="notifications_settings">
  9 + <div class="header">
  10 + <div class="header_text">
  11 + <%= t('settings.notifications.name')%>
  12 + </div>
  13 + <div class="header_icon_right">
  14 + <%= link_to (image_tag('btn/edit.png')), "javascript:showNotificationsSettings();" %>
  15 + </div>
  16 + </div>
  17 + <div class="content" id="notifications_settings_briefing">
  18 + <div class="form_row">
  19 + <%= t('settings.notifications.briefing')%>
  20 + </div>
  21 + </div>
  22 + <div class="content" id="notifications_settings_content" style="display:none;">
  23 + <%= form_tag settings_path, :method => :post do %>
  24 + <ul>
  25 + <div class="settings_block">
  26 + <div class="form_row">
  27 + <li><%= t('settings.notifications.by_email.name')%></li>
  28 + </div>
  29 + <div class="form_sub_row">
  30 + <%= radio_button_tag 'notify_by_email', 'always', current_subject.notify_by_email %> <%= t('settings.notifications.by_email.always') %>
  31 + <%= radio_button_tag 'notify_by_email', 'never', !current_subject.notify_by_email %> <%= t('settings.notifications.by_email.never') %>
  32 + </div>
  33 + <div class="actions center">
  34 + <%= submit_tag "Update Settings", :name => :send_message, :class => "button" %>
  35 + </div>
  36 + </div>
  37 + </ul>
  38 + <% end %>
  39 + </div>
  40 +</div>
13 app/views/settings/index.html.erb
@@ -9,9 +9,22 @@
9 9 <% toolbar %>
10 10
11 11 <% content_for :headers do %>
  12 + <%= stylesheet_link_tag "settings.css", :media => "screen, projection" %>
12 13 <% end %>
13 14
14 15 <% content_for :javascript do %>
  16 + var notifications_open = false;
  17 + showNotificationsSettings = function(){
  18 + if (notifications_open){
  19 + $("#notifications_settings_content").hide("slow");
  20 + $("#notifications_settings_briefing").show("slow");
  21 + notifications_open = false;
  22 + }else{
  23 + $("#notifications_settings_content").show("slow");
  24 + $("#notifications_settings_briefing").hide("slow");
  25 + notifications_open = true;
  26 + }
  27 + }
15 28 <% end %>
16 29
17 30 <%= render :partial => 'index' %>
54 config/locales/en.yml
@@ -6,7 +6,6 @@ en:
6 6 accept: "Accept"
7 7 account:
8 8 edit: "Edit user"
9   - notifications: "Notifications"
10 9 one: "Account"
11 10 privacy: "Privacy"
12 11 settings: "Settings"
@@ -21,28 +20,27 @@ en:
21 20 to_comment: "Comment"
22 21 unlike: "I do not like anymore"
23 22 verb:
24   - follow:
25   - User:
26   - title: "%{subject} added %{contact} as contact."
27   - message: "%{name} added you as contact."
28   - Group:
29   - title: "%{subject} added %{contact} as contact."
30   - message: "%{name} added you as contact."
31   - like:
32   - User:
33   - title: "%{subject} is a fan of %{contact}."
34   - message: "%{name} is now your fan."
35   - Group:
36   - title: "%{subject} is a fan of %{contact}."
37   - message: "%{name} is now your fan."
38   - make-friend:
39   - User:
40   - title: "%{subject} and %{contact} are now connected."
41   - message: "%{name} also added you as contact."
42   - Group:
43   - title: "%{subject} added %{contact} as contact."
44   - message: "%{name} added you as contact."
45   -
  23 + follow:
  24 + User:
  25 + title: "%{subject} added %{contact} as contact."
  26 + message: "%{name} added you as contact."
  27 + Group:
  28 + title: "%{subject} added %{contact} as contact."
  29 + message: "%{name} added you as contact."
  30 + like:
  31 + User:
  32 + title: "%{subject} is a fan of %{contact}."
  33 + message: "%{name} is now your fan."
  34 + Group:
  35 + title: "%{subject} is a fan of %{contact}."
  36 + message: "%{name} is now your fan."
  37 + make-friend:
  38 + User:
  39 + title: "%{subject} and %{contact} are now connected."
  40 + message: "%{name} also added you as contact."
  41 + Group:
  42 + title: "%{subject} added %{contact} as contact."
  43 + message: "%{name} added you as contact."
46 44 avatar:
47 45 crop_image: "Crop the uploaded image"
48 46 crop_submit: "Crop image"
@@ -298,7 +296,15 @@ en:
298 296 choose: "2. Levels in <strong>%{name}</strong> sphere"
299 297 new: "+ New level"
300 298 relation_public:
301   - name: "Public"
  299 + name: "Public"
  300 + settings:
  301 + notifications:
  302 + briefing: "Settings about notifications behaviour and mail alerts"
  303 + name: "Notifications"
  304 + by_email:
  305 + name: "Send me an email when I receive a notification"
  306 + always: "Always"
  307 + never: "Never"
302 308 share: "Share"
303 309 sign_in: "Sign in"
304 310 sign_out: "Sign out"

0 comments on commit 24420ee

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