Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Settings dummy preview

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

0 comments on commit 24420ee

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