From c2647a1d084afd0e8c6039281d013feddf87a68b Mon Sep 17 00:00:00 2001
From: Thomas Blazek
Date: Wed, 21 Aug 2013 18:27:47 +0200
Subject: [PATCH] broken gallery
---
Gemfile | 2 ++
Gemfile.lock | 3 ++
app/assets/javascripts/application.js | 5 ++-
app/assets/stylesheets/application.css.scss | 4 +++
app/views/galleries/show.html.erb | 38 +++++++++++++++++++--
app/views/layouts/application.html.erb | 7 +++-
6 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/Gemfile b/Gemfile
index 98dc781..36a96f3 100755
--- a/Gemfile
+++ b/Gemfile
@@ -78,3 +78,5 @@ end
gem "simple_calendar", "~> 0.1.9"
gem 'rmagick'
+
+gem 'bootstrap-addons-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index ff6d52b..9fba644 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,6 +35,8 @@ GEM
activerecord (>= 3.0.0)
bcrypt-ruby (3.0.1)
bcrypt-ruby (3.0.1-x86-mingw32)
+ bootstrap-addons-rails (0.1.2)
+ rails
bootstrap-sass (2.3.2.1)
sass (~> 3.2)
builder (3.0.4)
@@ -179,6 +181,7 @@ PLATFORMS
DEPENDENCIES
annotate (>= 2.5.0)
awesome_nested_set
+ bootstrap-addons-rails
bootstrap-sass (~> 2.3.2.1)
cancan
carrierwave
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 68c0b94..f880db0 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,4 +16,7 @@
//= require_tree .
//= require tinymce-jquery
//= require bootstrap
-
+//= require bootstrap/colorpicker
+//= require bootstrap/datepicker
+//= require bootstrap/load-image.min
+//= require bootstrap/image-gallery.min
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index bd9a219..b127f38 100755
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -11,10 +11,14 @@
*= require_self
*= require_tree .
* require 'bootstrap'
+
*/
$linkColor: #03006E;
@import 'bootstrap';
@import 'bootstrap-responsive';
+@import 'bootstrap/image-gallery';
+
+
h1
{font-size: 23px}
h2
diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index 392008b..a19e755 100644
--- a/app/views/galleries/show.html.erb
+++ b/app/views/galleries/show.html.erb
@@ -14,14 +14,48 @@
Datum:
<%= @gallery.datum %>
+
+
+
+
+
+
+
+
<%= link_to 'NewFoto' , new_gallery_foto_path(@gallery) %> |
<%= link_to 'Edit', edit_gallery_path(@gallery) %> |
<%= link_to 'Back', galleries_path %>
+
+
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 81c8440..774d3c9 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,9 +5,14 @@
Fetsite
<%= stylesheet_link_tag "application", :media => "all" %>
-
+
+
+
+
+
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
+