diff --git a/Gemfile b/Gemfile index f653a62..56e0ed6 100755 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,6 @@ gem "cancan" # Fileupload gem 'paperclip' ,'~>3.4.0' -gem 'blueimp-gallery' gem 'git' gem 'haml' @@ -117,3 +116,6 @@ gem 'sitemap_generator' gem 'whenever' gem 'yaml_db' gem 'etherpad-lite' + +# Image gallery +gem 'blueimp-gallery' diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e2b42f1..856bf31 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -23,11 +23,10 @@ //= require bootstrap //= require bootstrap/colorpicker //= require bootstrap/datepicker -//= require bootstrap/load-image.min -//= require bootstrap/image-gallery.min //= require jquery-fileupload // require jquery.remotipart //= require jquery.datetimepicker +//= require blueimp-gallery-all function insertAttachment(url,name) { var ext = url.split('.').pop().toLowerCase(); diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 65e39bf..34fa42c 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,22 +1,21 @@ /* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - *= require_self - * require_tree . - *= require 'calendars' - *= require jquery.fileupload-ui - * require 'bootstrap' - *= require 'tinymce' - - */ +* This is a manifest file that'll be compiled into application.css, which will include all the files +* listed below. +* +* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, +* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. +* +* You're free to add application-wide styles to this file and they'll appear at the top of the +* compiled file, but it's generally better to create a new file per style scope. +*= require_self +* require_tree . +*= require 'calendars' +*= require jquery.fileupload-ui +* require 'bootstrap' +*= require 'tinymce' + +*/ // Colorshema #0A64A4 $color_prim: #0A64A4; $color_prim_light: #0B65A5; @@ -45,34 +44,34 @@ $sansFontFamily: Helvetica, Arial; @import 'font-awesome'; h1 { - font-size: 23px +font-size: 23px } h2 { - font-size: 19px +font-size: 19px } body,html { - padding:0; - margin:0; +padding:0; +margin:0; } a:hover { - text-decoration:none; +text-decoration:none; } div.header { - display: block; - // background: url('/header1.png') no-repeat; - background-color: #FFF; - background-position: right; - border-bottom:1px solid black; - height:41px; - color:#000; - padding-left:87px; - padding-top:0px; - overflow:hidden; - margin-bottom: 20px +display: block; +// background: url('/header1.png') no-repeat; +background-color: #FFF; +background-position: right; +border-bottom:1px solid black; +height:41px; +color:#000; +padding-left:87px; +padding-top:0px; +overflow:hidden; +margin-bottom: 20px } div.header h1 { padding:0; @@ -81,40 +80,40 @@ font-size:20px; line-height:32px; } #menudiv { - width:100%; +width:100%; } - + .navbar .nav li { - min-width:100%; +min-width:100%; } .navbar .nav .divider { - border-style: solid; - border-width: 1px 0px 0px 0px; - border-color: grey; - min-width: 100%; +border-style: solid; +border-width: 1px 0px 0px 0px; +border-color: grey; +min-width: 100%; } .navbar .navbar-inner { - border:none; - box-shadow:none; +border:none; +box-shadow:none; } #contentdiv { - background: #FFFFFF +background: #FFFFFF } #contentdiv .container-fluid { - padding:0; +padding:0; } a.linkbox, div.contentbox { - display:block; - padding:5px; - border-radius: 10px; - border: lightgray solid 1px; +display:block; +padding:5px; +border-radius: 10px; +border: lightgray solid 1px; } @@ -132,16 +131,18 @@ margin-bottom:10px; } ul.linkbox-list { - max-width:70em; +max-width:70em; } div.contentbox { - margin: 5px; +margin: 5px; } .navbar .nav li { min-width:100%; background:44F; -} \ No newline at end of file +} + +@import 'galleries'; \ No newline at end of file diff --git a/app/assets/stylesheets/galleries.css.scss b/app/assets/stylesheets/galleries.css.scss index 27e63bf..0689e8e 100644 --- a/app/assets/stylesheets/galleries.css.scss +++ b/app/assets/stylesheets/galleries.css.scss @@ -2,39 +2,6 @@ // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -//.modal.fade { -// top: -25%; -// transition: opacity 0.3s linear 0s, top 0.3s ease-out 0s; -//} -//.modal-gallery { -// max-height: none; -// outline: medium none; -// width: auto; -//} -//.modal { -// color: #333333; -//} -//.hide { -// display: none; -//} -//.modal { -//background-clip: padding-box; -// background-color: #FFFFFF; -// border: 1px solid rgba(0, 0, 0, 0.3); -//border-radius: 6px 6px 6px 6px; -// box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -// left: 50%; -// margin-left: -280px; -// outline: medium none; -// position: fixed; -// top: 10%;; -// z-index: 1050; -//} -//.fade { -// opacity: 0; -// transition: opacity 0.15s linear 0s; -//} - div.gallery-block { padding: 10px; diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index 34fc843..f23f112 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -1,3 +1,6 @@ + +@import 'blueimp-gallery-all'; + h1 { font-size: 23px } diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss index 53484fe..70e9a96 100755 --- a/app/assets/stylesheets/themes/blue1/application.css.scss +++ b/app/assets/stylesheets/themes/blue1/application.css.scss @@ -15,7 +15,6 @@ *= require jquery.datetimepicker *= require jquery.ui.dialog * require 'bootstrap' - * require 'neuigkeiten' */ diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 6d65392..9c4bf77 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -40,15 +40,40 @@
-