Merge branch 'master' into tab

add favicon

app/views/layouts/application.html.erb

@@ -16,5 +16,6 @@
     <%= yield %>
     <%= javascript_include_tag 'application' %>
     <%= javascript_pack_tag 'application' %>
+
   </body>
 </html>

app/views/pages/_contact.html.erb

@@ -18,13 +18,14 @@ end
     </div>
   </div>
   <div class="call" data-user-id="<%= contact.id %>">
-    <%= link_to establish_call_path(contact.id), 'data-toggle':"modal", 'data-target':"#myModal" do  %>
+    <%= link_to establish_call_path(contact.id), remote: true, id: "modalTrigger" do  %>
       <i class="fas fa-phone"></i>
     <% end %>
   </div>
 </div>
 
 
+
 <!-- Modal -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="vertical-alignment-helper">
@@ -58,3 +59,5 @@ end
     </div>
   </div>
 </div>
+
+

app/views/shared/_navbar.html.erb

@@ -6,7 +6,7 @@
   <div class="right-align">
     <div class="links">
       <div class="active"><%= link_to "Dashboard", contacts_path %></div>
-      <div><%= link_to "Settings", "#" %></div>
+      <div><%= link_to "Settings", setting_path %></div>
     </div>
     <div class="profile">
     <% if current_user.nil? %>

app/views/users/setting.html.erb

@@ -0,0 +1,158 @@
+<div class="profile-container">
+  <%= simple_form_for(@user) do |t| %>
+    <div class="profile-form">
+      <div>
+        <div class="lign">
+
+       <div class="card"><%= t.input :language, collection:
+[
+"Afrikaans (South Africa)",
+"Amharic (Ethiopia)",
+"Armenian (Armenia)",
+"Azerbaijani (Azerbaijan)",
+"Indonesian (Indonesia)",
+"Malay (Malaysia)",
+"Bengali (Bangladesh)",
+"Bengali (India)",
+"Catalan (Spain)",
+"Czech (Czech Republic)",
+"Danish (Denmark)",
+"German (Germany)",
+"English (Australia)",
+"English (Canada)",
+"English (Ghana)",
+"English (United Kingdom)",
+"English (India)",
+"English (Ireland)",
+"English (Kenya)",
+"English (New Zealand)",
+"English (Nigeria)",
+"English (Philippines)",
+"English (South Africa)",
+"English (Tanzania)",
+"English (United States)",
+"Spanish (Argentina)",
+"Spanish (Bolivia)",
+"Spanish (Chile)",
+"Spanish (Colombia)",
+"Spanish (Costa Rica)",
+"Spanish (Ecuador)",
+"Spanish (El Salvador)",
+"Spanish (Spain)",
+"Spanish (United States)",
+"Spanish (Guatemala)",
+"Spanish (Honduras)",
+"Spanish (Mexico)",
+"Spanish (Nicaragua)",
+"Spanish (Panama)",
+"Spanish (Paraguay)",
+"Spanish (Peru)",
+"Spanish (Puerto Rico)",
+"Spanish (Dominican Republic)",
+"Spanish (Uruguay)",
+"Spanish (Venezuela)",
+"Basque (Spain)",
+"Filipino (Philippines)",
+"French (Canada)",
+"French (France)",
+"Galician (Spain)",
+"Georgian (Georgia)",
+"Gujarati (India)",
+"Croatian (Croatia)",
+"Zulu (South Africa)",
+"Icelandic (Iceland)",
+"Italian (Italy)",
+"Javanese (Indonesia)",
+"Kannada (India)",
+"Khmer (Cambodia)",
+"Lao (Laos)",
+"Latvian (Latvia)",
+"Lithuanian (Lithuania)",
+"Hungarian (Hungary)",
+"Malayalam (India)",
+"Marathi (India)",
+"Dutch (Netherlands)",
+"Nepali (Nepal)",
+"Norwegian Bokmål (Norway)",
+"Polish (Poland)",
+"Portuguese (Brazil)",
+"Portuguese (Portugal)",
+"Romanian (Romania)",
+"Sinhala (Sri Lanka)",
+"Slovak (Slovakia)",
+"Slovenian (Slovenia)",
+"Sundanese (Indonesia)",
+"Swahili (Tanzania)",
+"Swahili (Kenya)",
+"Finnish (Finland)",
+"Swedish (Sweden)",
+"Tamil (India)",
+"Tamil (Singapore)",
+"Tamil (Sri Lanka)",
+"Tamil (Malaysia)",
+"Telugu (India)",
+"Vietnamese (Vietnam)",
+"Turkish (Turkey)",
+"Urdu (Pakistan)",
+"Urdu (India)",
+"Greek (Greece)",
+"Bulgarian (Bulgaria)",
+"Russian (Russia)",
+"Serbian (Serbia)",
+"Ukrainian (Ukraine)",
+"Hebrew (Israel)",
+"Arabic (Israel)",
+"Arabic (Jordan)",
+"Arabic (United Arab Emirates)",
+"Arabic (Bahrain)",
+"Arabic (Algeria)",
+"Arabic (Saudi Arabia)",
+"Arabic (Iraq)",
+"Arabic (Kuwait)",
+"Arabic (Morocco)",
+"Arabic (Tunisia)",
+"Arabic (Oman)",
+"Arabic (Qatar)",
+"Arabic (Lebanon)",
+"Arabic (Egypt)",
+"Persian (Iran)",
+"Hindi (India)",
+"Thai (Thailand)",
+"Korean (South Korea)",
+"Chinese, Mandarin (Traditional, Taiwan)",
+"Chinese, Cantonese (Traditional, Hong Kong)",
+"Japanese (Japan)",
+"Chinese, Mandarin (Simplified, Hong Kong)",
+"Chinese, Mandarin (Simplified, China)"] %>
+
+        </div>
+        </div>
+       <div class="card"><%= t.input :caption_font %></div>
+       <div class="card"><%= t.input :caption_font_size %></div>
+       <div class="card"><%= t.input :enable_transcript %></div>
+
+        <%= link_to "Save", contacts_path, class: "btn btn-primary save-btn form-control" %>
+        <p></p>
+      </div>
+
+
+
+      <div class="profile-pic">
+        <% if @user.photo.url.nil? %>
+          <%= image_tag "https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png"%>
+        <% else %>
+          <%= cl_image_tag current_user.photo%>
+        <% end %>
+
+        <%#= t.input_field :photo, onchange: 'this.form.submit();' %>
+        <%#= t.input_field :photo, as: :hidden %>
+
+      </div>
+
+    </div>
+  <% end %>
+</div>
+
+
+
+

app/views/users/show.html.erb

@@ -22,5 +22,6 @@
             confirm: "Are you sure?"
           } %>
       </div>
-
   </div>
+ </div>
+