Browse Source

Merge branch 'private-me-form-new-password' into develop

Martin Edenhofer 8 years ago
parent
commit
e9104157f8

+ 4 - 1
app/assets/javascripts/app/controllers/_application_controller_form.coffee

@@ -226,7 +226,10 @@ class App.ControllerForm extends App.Controller
 
     # set autocomplete option
     if attribute.autocomplete is undefined
-      attribute.autocomplete = ''
+      if attribute.type is 'hidden'
+        attribute.autocomplete = ''
+      else
+        attribute.autocomplete = 'autocomplete="new-password"'
     else
       attribute.autocomplete = 'autocomplete="' + attribute.autocomplete + '"'
 

+ 5 - 5
app/assets/javascripts/app/controllers/_channel/email.coffee

@@ -533,8 +533,8 @@ class App.ChannelEmailAccountWizard extends App.WizardModal
 
     # base
     configureAttributesBase = [
-      { name: 'realname', display: 'Organization & Department Name', tag: 'input',  type: 'text', limit: 160, null: false, placeholder: 'Organization Support', autocomplete: 'off' },
-      { name: 'email',    display: 'Email',    tag: 'input',  type: 'email', limit: 120, null: false, placeholder: 'support@example.com', autocapitalize: false, autocomplete: 'off' },
+      { name: 'realname', display: 'Organization & Department Name', tag: 'input',  type: 'text', limit: 160, null: false, placeholder: 'Organization Support', autocomplete: 'new-password' },
+      { name: 'email',    display: 'Email',    tag: 'input',  type: 'email', limit: 120, null: false, placeholder: 'support@example.com', autocapitalize: false, autocomplete: 'new-password' },
       { name: 'password', display: 'Password', tag: 'input',  type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true },
       { name: 'group_id', display: 'Destination Group', tag: 'select', null: false, relation: 'Group', nulloption: true },
     ]
@@ -564,7 +564,7 @@ class App.ChannelEmailAccountWizard extends App.WizardModal
     configureAttributesInbound = [
       { name: 'adapter',            display: 'Type',     tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound },
       { name: 'options::host',      display: 'Host',     tag: 'input',  type: 'text', limit: 120, null: false, autocapitalize: false },
-      { name: 'options::user',      display: 'User',     tag: 'input',  type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off', },
+      { name: 'options::user',      display: 'User',     tag: 'input',  type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', },
       { name: 'options::password',  display: 'Password', tag: 'input',  type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true },
       { name: 'options::ssl',       display: 'SSL',      tag: 'boolean', null: true, options: { true: 'yes', false: 'no'  }, default: true, translate: true, item_class: 'formGroup--halfSize' },
       { name: 'options::port',      display: 'Port',     tag: 'input',  type: 'text', limit: 6,   null: true, autocapitalize: false,  default: '993', item_class: 'formGroup--halfSize' },
@@ -618,7 +618,7 @@ class App.ChannelEmailAccountWizard extends App.WizardModal
     if adapter is 'smtp'
       configureAttributesOutbound = [
         { name: 'options::host',     display: 'Host',     tag: 'input', type: 'text',     limit: 120, null: false, autocapitalize: false, autofocus: true },
-        { name: 'options::user',     display: 'User',     tag: 'input', type: 'text',     limit: 120, null: true, autocapitalize: false, autocomplete: 'off', },
+        { name: 'options::user',     display: 'User',     tag: 'input', type: 'text',     limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', },
         { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true },
         { name: 'options::port',     display: 'Port',     tag: 'input', type: 'text',     limit: 6,   null: true, autocapitalize: false },
       ]
@@ -932,7 +932,7 @@ class App.ChannelEmailNotificationWizard extends App.WizardModal
     if adapter is 'smtp'
       configureAttributesOutbound = [
         { name: 'options::host',     display: 'Host',     tag: 'input', type: 'text',     limit: 120, null: false, autocapitalize: false, autofocus: true },
-        { name: 'options::user',     display: 'User',     tag: 'input', type: 'text',     limit: 120, null: true, autocapitalize: false, autocomplete: 'off' },
+        { name: 'options::user',     display: 'User',     tag: 'input', type: 'text',     limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password' },
         { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true },
         { name: 'options::port',     display: 'Port',     tag: 'input', type: 'text',     limit: 6,   null: true, autocapitalize: false },
       ]

+ 3 - 3
app/assets/javascripts/app/controllers/getting_started.coffee

@@ -450,7 +450,7 @@ class EmailNotification extends App.WizardFullScreen
     if adapter is 'smtp'
       configureAttributesOutbound = [
         { name: 'options::host',     display: 'Host',     tag: 'input', type: 'text',     limit: 120, null: false, autocapitalize: false, autofocus: true },
-        { name: 'options::user',     display: 'User',     tag: 'input', type: 'text',     limit: 120, null: true, autocapitalize: false, autocomplete: 'off' },
+        { name: 'options::user',     display: 'User',     tag: 'input', type: 'text',     limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password' },
         { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true },
         { name: 'options::port',     display: 'Port',     tag: 'input', type: 'text',     limit: 6,   null: true, autocapitalize: false },
       ]
@@ -673,7 +673,7 @@ class ChannelEmail extends App.WizardFullScreen
     configureAttributesInbound = [
       { name: 'adapter',            display: 'Type',     tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound },
       { name: 'options::host',      display: 'Host',     tag: 'input',  type: 'text', limit: 120, null: false, autocapitalize: false },
-      { name: 'options::user',      display: 'User',     tag: 'input',  type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off', },
+      { name: 'options::user',      display: 'User',     tag: 'input',  type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', },
       { name: 'options::password',  display: 'Password', tag: 'input',  type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true },
       { name: 'options::ssl',       display: 'SSL',      tag: 'boolean', null: true, options: { true: 'yes', false: 'no'  }, default: true, translate: true, item_class: 'formGroup--halfSize' },
       { name: 'options::port',      display: 'Port',     tag: 'input',  type: 'text', limit: 6,   null: true, autocapitalize: false,  default: '993', item_class: 'formGroup--halfSize' },
@@ -725,7 +725,7 @@ class ChannelEmail extends App.WizardFullScreen
     if adapter is 'smtp'
       configureAttributesOutbound = [
         { name: 'options::host',     display: 'Host',     tag: 'input', type: 'text',     limit: 120, null: false, autocapitalize: false, autofocus: true },
-        { name: 'options::user',     display: 'User',     tag: 'input', type: 'text',     limit: 120, null: true, autocapitalize: false, autocomplete: 'off', },
+        { name: 'options::user',     display: 'User',     tag: 'input', type: 'text',     limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', },
         { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true },
         { name: 'options::port',     display: 'Port',     tag: 'input', type: 'text',     limit: 6,   null: true, autocapitalize: false },
       ]

+ 1 - 1
app/assets/javascripts/app/models/user.coffee

@@ -10,7 +10,7 @@ class App.User extends App.Model
     { name: 'lastname',         display: 'Lastname',      tag: 'input',    type: 'text',     limit: 100, null: false, signup: true, info: true, invite_agent: true, invite_customer: true },
     { name: 'email',            display: 'Email',         tag: 'input',    type: 'email',    limit: 100, null: false, signup: true, info: true, invite_agent: true, invite_customer: true },
     { name: 'organization_id',  display: 'Organization',  tag: 'select',   multiple: false, nulloption: true, null: true, relation: 'Organization', signup: false, info: true, invite_customer: true },
-    { name: 'password',         display: 'Password',      tag: 'input',    type: 'password', limit: 50,  null: true, autocomplete: 'off', signup: true, },
+    { name: 'password',         display: 'Password',      tag: 'input',    type: 'password', limit: 50,  null: true, autocomplete: 'new-password', signup: true, },
     { name: 'note',             display: 'Note',          tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true, info: true, invite_customer: true },
     { name: 'role_ids',         display: 'Permissions',   tag: 'user_permission', null: false, invite_agent: true, invite_customer: true, item_class: 'checkbox' },
     { name: 'active',           display: 'Active',        tag: 'active',   default: true },

+ 1 - 1
app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco

@@ -1,6 +1,6 @@
 <div class="page-header">
   <div class="page-header-title">
-    <h2><%- @T( @overview.name ) %></h2>
+    <h2><%- @T(@overview.name) %></h2>
   </div>
   <div class="page-header-meta">
     <% if @edit: %>

+ 7 - 19
app/assets/javascripts/app/views/channel/email_account_wizard.jst.eco

@@ -1,10 +1,6 @@
 <div class="modal-dialog wizard">
 
-  <form  autocomplete="off" class="modal-content setup wizard js-intro" autocomplete="off">
-    <!-- dummy to prevent chrome to ask for password save -->
-    <input style="display:none">
-    <input type="password" style="display:none">
-    <!-- /dummy to prevent chrome to ask for password save -->
+  <form class="modal-content setup wizard js-intro">
     <div class="modal-header">
       <div class="modal-close js-close">
         <%- @Icon('diagonal-cross') %>
@@ -27,7 +23,7 @@
     </div>
   </form>
 
-  <form  autocomplete="off" class="modal-content setup wizard hide js-probe">
+  <form class="modal-content setup wizard hide js-probe">
     <div class="modal-header">
       <div class="modal-close js-close">
         <%- @Icon('diagonal-cross') %>
@@ -44,7 +40,7 @@
     <div class="modal-footer"></div>
   </form>
 
-  <form  autocomplete="off" class="modal-content setup wizard hide js-test">
+  <form class="modal-content setup wizard hide js-test">
     <div class="modal-header">
       <div class="modal-close js-close">
         <%- @Icon('diagonal-cross') %>
@@ -61,7 +57,7 @@
     <div class="modal-footer"></div>
   </form>
 
-  <form  autocomplete="off" class="modal-content setup wizard hide js-verify">
+  <form class="modal-content setup wizard hide js-verify">
     <div class="modal-header">
       <div class="modal-close js-close">
         <%- @Icon('diagonal-cross') %>
@@ -79,11 +75,7 @@
     <div class="modal-footer"></div>
   </form>
 
-  <form  autocomplete="off" class="modal-content setup wizard hide js-inbound" autocomplete="off">
-    <!-- dummy to prevent chrome to ask for password save -->
-    <input style="display:none">
-    <input type="password" style="display:none">
-    <!-- /dummy to prevent chrome to ask for password save -->
+  <form class="modal-content setup wizard hide js-inbound">
     <div class="modal-header">
       <div class="modal-close js-close">
         <%- @Icon('diagonal-cross') %>
@@ -106,7 +98,7 @@
     </div>
   </form>
 
-  <form  autocomplete="off" class="modal-content setup wizard hide js-inbound-acknowledge">
+  <form class="modal-content setup wizard hide js-inbound-acknowledge">
     <div class="modal-header">
       <div class="modal-close js-close">
         <%- @Icon('diagonal-cross') %>
@@ -129,11 +121,7 @@
     </div>
   </form>
 
-  <form  autocomplete="off" class="modal-content setup wizard hide js-outbound" autocomplete="off">
-    <!-- dummy to prevent chrome to ask for password save -->
-    <input style="display:none">
-    <input type="password" style="display:none">
-    <!-- /dummy to prevent chrome to ask for password save -->
+  <form class="modal-content setup wizard hide js-outbound">
     <div class="modal-header">
         <div class="modal-close js-close">
           <%- @Icon('diagonal-cross') %>

+ 1 - 6
app/assets/javascripts/app/views/channel/email_notification_wizard.jst.eco

@@ -34,12 +34,7 @@
     <div class="modal-footer"></div>
   </form>
 
-  <form class="modal-content setup wizard js-outbound" autocomplete="off">
-    <!-- dummy to prevent chrome to ask for password save -->
-    <input style="display:none">
-    <input type="password" style="display:none">
-    <!-- /dummy to prevent chrome to ask for password save -->
-    <div class="modal-header">
+  <form class="modal-content setup wizard js-outbound">
       <div class="modal-close js-close">
         <%- @Icon('diagonal-cross') %>
       </div>

+ 2 - 2
app/assets/javascripts/app/views/facebook/app_config.jst.eco

@@ -9,7 +9,7 @@
       <label for="application_id">Facebook APP ID <span>*</span></label>
     </div>
     <div class="controls">
-      <input id="application_id" type="text" name="application_id" value="<% if @external_credential && @external_credential.credentials: %><%= @external_credential.credentials.application_id %><% end %>" class="form-control" required autocomplete="off" >
+      <input id="application_id" type="text" name="application_id" value="<% if @external_credential && @external_credential.credentials: %><%= @external_credential.credentials.application_id %><% end %>" class="form-control" required autocomplete="new-password">
     </div>
   </div>
   <div class="input form-group">
@@ -17,7 +17,7 @@
       <label for="application_secret">Facebook App Secret <span>*</span></label>
     </div>
     <div class="controls">
-      <input id="application_secret" type="text" name="application_secret" value="<% if @external_credential && @external_credential.credentials: %><%= @external_credential.credentials.application_secret %><% end %>" class="form-control" required autocomplete="off" >
+      <input id="application_secret" type="text" name="application_secret" value="<% if @external_credential && @external_credential.credentials: %><%= @external_credential.credentials.application_secret %><% end %>" class="form-control" required autocomplete="new-password">
     </div>
   </div>
   <h2><%- @T('Your callback URL') %></h2>

+ 2 - 2
app/assets/javascripts/app/views/generic/admin/index.jst.eco

@@ -1,6 +1,6 @@
 <div class="page-header">
   <div class="page-header-title">
-    <h1><%- @T( @head ) %> <small><%- @T( 'Management' ) %></small></h1>
+    <h1><%- @T(@head) %> <small><%- @T('Management') %></small></h1>
   </div>
   <div class="page-header-meta">
     <% if @showDescription: %>
@@ -8,7 +8,7 @@
     <% end %>
     <% if @buttons: %>
       <% for button in @buttons: %>
-        <a data-type="<%= button['data-type'] %>" class="btn <%= button['class'] %>"><%- @T( button.name ) %></a>
+        <a data-type="<%= button['data-type'] %>" class="btn <%= button.class %>" href="<%= button.href %>"><%- @T(button.name) %></a>
       <% end %>
     <% end %>
   </div>

+ 1 - 1
app/assets/javascripts/app/views/generic/autocompletion.jst.eco

@@ -1,3 +1,3 @@
 <input id="<%= @attribute.id %>" type="hidden" name="<%= @attribute.name %>" value="<%= @attribute.value %>" <%= @attribute.required %> />
-<input id="<%= @attribute.id %>_autocompletion" type="text" name="<%= @attribute.name %>_autocompletion" value="<%= @attribute.valueShown %>" class="form-control <%= @attribute.class %>" <%= @attribute.required %> <%= @attribute.autofocus %> <%- @attribute.autocapitalize %> <% if @attribute.placeholder: %>placeholder="<%- @Ti(@attribute.placeholder) %>"<% end %>/>
+<input id="<%= @attribute.id %>_autocompletion" type="text" name="<%= @attribute.name %>_autocompletion" value="<%= @attribute.valueShown %>" class="form-control <%= @attribute.class %>" <%= @attribute.required %> <%= @attribute.autofocus %> <%- @attribute.autocapitalize %> <% if @attribute.placeholder: %>placeholder="<%- @Ti(@attribute.placeholder) %>"<% end %> autocomplete="new-password"/>
 <input id="<%= @attribute.id %>_autocompletion_value_shown" type="hidden" name="<%= @attribute.name %>_autocompletion_value_shown" value="<%= @attribute.valueShown %>"/>

Some files were not shown because too many files changed in this diff