From bf2c4c76b90bc7f8a038d34d403f229c69715441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuzhan=20=C4=B0LHAN?= Date: Fri, 30 Aug 2013 16:11:49 +0300 Subject: [PATCH 1/6] User show style minor fix. --- app/views/users/index.html.erb | 4 ---- app/views/users/show.html.erb | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 24a2548..7ccade6 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -19,7 +19,3 @@ <% end %> - -
- -<%= link_to 'New User', new_user_path %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 4d631bd..b808cdc 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,8 +2,8 @@

<%= "User Show" %>
- <%= 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" %>

From 63195035f39f2ca4c6859ab094d4ce31e865a61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuzhan=20=C4=B0LHAN?= Date: Fri, 30 Aug 2013 16:14:15 +0300 Subject: [PATCH 2/6] Admin home new user link removed. --- app/views/home/admin.html.haml | 4 +--- db/schema.rb | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/home/admin.html.haml b/app/views/home/admin.html.haml index 6d11a72..ccf6eab 100644 --- a/app/views/home/admin.html.haml +++ b/app/views/home/admin.html.haml @@ -26,6 +26,4 @@ = link_to 'Edit', edit_user_path(profile.user) = link_to 'Destroy', profile.user, :method => :delete, :data => { :confirm => 'Are you sure?' } -%br - -= link_to 'New User', new_user_path \ No newline at end of file +%br \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 39b8183..6ceace6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -35,10 +35,10 @@ t.string "title" t.text "body" t.integer "user_id" - t.integer "teachers_id" + t.integer "teacher_id" end - add_index "comments", ["teachers_id"], name: "index_comments_on_teachers_id" + add_index "comments", ["teacher_id"], name: "index_comments_on_teacher_id" add_index "comments", ["user_id"], name: "index_comments_on_user_id" create_table "profiles", force: true do |t| From 2651f14c527418d38ad731af4939b8945d6ae0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mesut=20Beyazta=C5=9F?= Date: Fri, 30 Aug 2013 16:24:03 +0300 Subject: [PATCH 3/6] #19 Les-etoiles routes update --- app/views/layouts/admin.html.erb | 2 +- app/views/layouts/application.html.erb | 2 +- app/views/layouts/teacher.html.erb | 2 +- app/views/layouts/user.html.erb | 2 +- db/schema.rb | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 11f8fc6..c012c6a 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -8,7 +8,7 @@
  • <%= link_to "Admin Anasayfa", root_path %>
  • <%= link_to('Logout', destroy_admin_session_path, :method => :delete, class: "btn btn-danger") %>
    • -

    <%= link_to 'Les etoiles', root_path %>

    +

    <%= image_tag("star_red.png") %> <%= link_to('Les etoiles', root_path) %>

    <%= render "layouts/notification" %> <%= yield %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b03a437..f4b6885 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,7 +10,7 @@
  • <%= link_to('Teacher Login', new_teacher_session_path) %>
  • <%= link_to('Student Login', new_user_session_path) %>
    • -

    <%= link_to('Les etoiles', root_path) %>

    +

    <%= image_tag("star_red.png") %> <%= link_to('Les etoiles', root_path) %>

    <%= render "layouts/notification" %> <%= yield %> diff --git a/app/views/layouts/teacher.html.erb b/app/views/layouts/teacher.html.erb index bee8601..35d80f0 100644 --- a/app/views/layouts/teacher.html.erb +++ b/app/views/layouts/teacher.html.erb @@ -8,7 +8,7 @@
  • <%= link_to "Öğretmen Anasayfa", root_path %>
  • <%= link_to('Logout', destroy_teacher_session_path, :method => :delete, class: "btn btn-danger") %>
    • -

    <%= link_to('Les etoiles', root_path) %>

    +

    <%= image_tag("star_red.png") %> <%= link_to('Les etoiles', root_path) %>

    <%= render "layouts/notification" %> <%= yield %> diff --git a/app/views/layouts/user.html.erb b/app/views/layouts/user.html.erb index 02a41ed..ec98ff6 100644 --- a/app/views/layouts/user.html.erb +++ b/app/views/layouts/user.html.erb @@ -9,7 +9,7 @@
  • <%= link_to "Kullanıcı Anasayfa", root_path %>
  • <%= link_to('Logout', destroy_user_session_path, :method => :delete, class: "btn btn-danger") %>
    • -

    <%= link_to('Les etoiles', root_path) %>

    +

    <%= image_tag("star_red.png") %> <%= link_to('Les etoiles', root_path) %>

    <%= render "layouts/notification" %> <%= yield %> diff --git a/db/schema.rb b/db/schema.rb index 39b8183..6ceace6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -35,10 +35,10 @@ t.string "title" t.text "body" t.integer "user_id" - t.integer "teachers_id" + t.integer "teacher_id" end - add_index "comments", ["teachers_id"], name: "index_comments_on_teachers_id" + add_index "comments", ["teacher_id"], name: "index_comments_on_teacher_id" add_index "comments", ["user_id"], name: "index_comments_on_user_id" create_table "profiles", force: true do |t| From 6609101a0cee62ddf4bf07de03b8edee6725848a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mesut=20Beyazta=C5=9F?= Date: Fri, 30 Aug 2013 16:26:09 +0300 Subject: [PATCH 4/6] #25 Les-etoiles icon update --- app/assets/images/star_red.png | Bin 0 -> 1575 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/star_red.png diff --git a/app/assets/images/star_red.png b/app/assets/images/star_red.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5abe07a1516b278e0d245564122fb07578e5f2 GIT binary patch literal 1575 zcmV+?2H5$DP)PsB%pB4`4Cj1p@wlHenn=s!t} zK!Tt|h#_jCF~$&$k7xo0jfE)ws3K5A9zothz*1;STl(1UYv%Z4?w0Mc;ucbGax%Fy zbMN`iIrp47gNSfF0yLBu#-X56CxE5HUVoj+AE|Tf_`V61vb?NVfNo&gaP}~`#-Ws| zaFlv`UFB%!*3t;~mqrK~su-9xoPDkt09f%{d2#)tRkmI<~Ep#W1NVSpN-d?Y=v z>gBN&H4j&ofoVX%_9f^reRKq%T1#HT%Croq1(HBN5Y3Q;i1aF@8g7e(mn@q&7HktR z!7#v3U|ZZ$5=n128Tch{0HxIYD#!k$wjfZELcExW7xyHQ5J|>dFOh)$QMT1LCSX^u zn=+nJkubQfuiP|1`2aVSMyL)4Iny7TK3oqhUpt|yqG4<~uIm{wFcJzY2E>&j0p$ap z5HJ;WkwQ>_<@lDTJzyFX2W;w!i#XFCyH_c7J8(!uqWJ(6@92xt5U?>lkFa47PFrT0 zT7kZb==%mJ157peUcfSWWkwA}p+No7uAUvIdZMS4Qq90Fpc(i}L@o?D)FOgX>NVhv zPiNNh)c8tBxtA@=zNW#hc&@-OA?Sc@(v?hc;!;2R+Pc_%zLT9T?eXImdrrmU$v<)3 zX5f1fIhY0r1Dh&?&O<-WnZcxzVsO2o3Ugi40Ji04f>KD*MJ1AuN%;O;Z;j8(bH+vzJtB z2dS10+>UPCXbc&Mka0+ZCgZw4oMO2>Kot>*fj{CA(j9iubf%OihHI&(!H!S z9q)hxmWg-q63OE&#E+dJb*=+1y z4%MX*a4fve9tN5Y5I=AdNv5t)?B%fD(pDb^)&iS=l>cZuuuMeuSlM|gBJE14Wk)-E z8atGtx+p~a*MkiFycf4OdWCz@$}{H*hyXpnJHY!utN-W>uo~DXBJm-mIBQIN^3F-j zC>urevuz9rt@)C4^6ZyixC4?Hp3Flz7K{yW`$1B2Fi8J6Y>Lpl_O zj(NiWsJ#xX7m?I|ehu{jEC3cSj>d5GXD~C)`2YwI^rx-BS65S>s~?y%74Dk{^yWC> z22cn%8Om~<34Pzpr{BnaVQB+U;=2%6AF2YN2#5n)fP?y!dl?{J)?6>MhtrVE8V~aq zYS&x3fW&m+Xav61@vQ_t((P||4lkIOjZ=9808cLjyB6pJ+JUci@z||%T6asoor4L_ zK-GJ|T%a?{6XBu9C2xQmPXn8QAAs+GjD$U^o$#fI>{Lq4YJ<<0z_<;-0^m}Pf|S?D z$p2+op6ms_0Uig+bJUBez>yHh23;$T>ALW|zrGu&&->R*hwdfd3k_3~$FEr}u-5`v ztqW2+$csKe9GEep|Arc(8fdaWUIjS?vhe=|&=6%nqXlvUi0uRH&lS260niYoz`H;j zZ~&N_&$@pAMK>lHAhODn0000bbVXQnWMOn=I%9HWVRU5xGB7bPEif`IF)>szF*-9j zIx{jYFg7|cFz8R*-v9srC3HntbYx+4WjbwdWNBu305UKzHZ3qTEiyJ#FgZFkHaayn ZEig4YFfhFcU3vfj002ovPDHLkV1n#4v7!I~ literal 0 HcmV?d00001 From 910bf5e9d3728246d671c32167b644fac242b8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuzhan=20=C4=B0LHAN?= Date: Fri, 30 Aug 2013 16:42:33 +0300 Subject: [PATCH 5/6] .gitignore report added. --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 864e3b9..9c3c2c4 100644 --- a/.gitignore +++ b/.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 From af6be4c958ef21833ccac514fccdd2d3166371e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuzhan=20=C4=B0LHAN?= Date: Fri, 30 Aug 2013 16:46:08 +0300 Subject: [PATCH 6/6] Production db.yml added. --- config/database.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/database.yml b/config/database.yml index 51a4dd4..0669f98 100644 --- a/config/database.yml +++ b/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 \ No newline at end of file