Merge branch 'develop' of github.com:LYK-Ruby-On-Rails/les-etoiles in…

…to develop

Conflicts:
	db/schema.rb

.gitignore

@@ -6,13 +6,13 @@
 
 # Ignore bundler config.
 /.bundle
-
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal
-
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
 /.idea
 .idea/
+/output_file
+/report.html

app/views/home/admin.html.haml

@@ -27,5 +27,3 @@
           = link_to 'Destroy', profile.user, :method => :delete, :data => { :confirm => 'Are you sure?' }
 
 %br
-
-= link_to 'New User', new_user_path

app/views/layouts/admin.html.erb

@@ -8,7 +8,7 @@
       <li class="active"><%= link_to "Admin Anasayfa", root_path %> </li>
       <li><%= link_to('Logout', destroy_admin_session_path, :method => :delete, class: "btn btn-danger") %></li>
     </ul>
-    <h3 class="text-muted"><%= link_to 'Les etoiles', root_path %></h3>
+    <h3 class="text-muted"> <%= image_tag("star_red.png") %> <%= link_to('Les etoiles', root_path) %></h3>
   </div>
   <%= render "layouts/notification" %>
   <%= yield %>

app/views/layouts/application.html.erb

@@ -10,7 +10,7 @@
       <li>  <%= link_to('Teacher Login', new_teacher_session_path) %></li>
       <li>  <%= link_to('Student Login', new_user_session_path) %> </li>
     </ul>
-    <h3 class="text-muted"> <%= link_to('Les etoiles', root_path) %></h3>
+    <h3 class="text-muted"> <%= image_tag("star_red.png") %> <%= link_to('Les etoiles', root_path) %></h3>
   </div>
   <%= render "layouts/notification" %>
   <%= yield %>

app/views/layouts/teacher.html.erb

@@ -8,7 +8,7 @@
       <li class="active"><%= link_to "Öğretmen Anasayfa", root_path %> </li>
         <li><%= link_to('Logout', destroy_teacher_session_path, :method => :delete, class: "btn btn-danger") %></li>
     </ul>
-    <h3 class="text-muted"> <%= link_to('Les etoiles', root_path) %></h3>
+    <h3 class="text-muted"> <%= image_tag("star_red.png") %> <%= link_to('Les etoiles', root_path) %></h3>
   </div>
   <%= render "layouts/notification" %>
   <%= yield %>

app/views/layouts/user.html.erb

@@ -9,7 +9,7 @@
       <li class="active"><%= link_to "Kullanıcı Anasayfa", root_path %> </li>
           <li><%= link_to('Logout', destroy_user_session_path, :method => :delete, class: "btn btn-danger") %></li>
     </ul>
-    <h3 class="text-muted"> <%= link_to('Les etoiles', root_path) %></h3>
+    <h3 class="text-muted"> <%= image_tag("star_red.png") %> <%= link_to('Les etoiles', root_path) %></h3>
   </div>
   <%= render "layouts/notification" %>
   <%= yield %>

app/views/users/index.html.erb

@@ -19,7 +19,3 @@
     <% end %>
   </tbody>
 </table>
-
-<br>
-
-<%= link_to 'New User', new_user_path %>

app/views/users/show.html.erb

@@ -2,8 +2,8 @@
   <h1>
     <%= "User Show" %>
     <div class="pull-right">
-      <%= link_to 'Edit', edit_user_path(@user) %>
-      <%= link_to 'Back', users_path %>
+      <%= link_to 'Edit', edit_user_path(@user), class: "btn btn-primary" %>
+      <%= link_to 'Back', users_path, class: "btn btn-primary" %>
     </div>
   </h1>
 </div>

config/database.yml

@@ -19,7 +19,10 @@ test:
   timeout: 5000
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
+  adapter: postgresql
+  encoding: unicode
+  database: les_etoiles_production
   pool: 5
-  timeout: 5000
+  username: user
+  password: 12345678
+  host: localhost