merge conflict behoben

Gemfile.lock

@@ -35,7 +35,7 @@ GEM
       activerecord (>= 3.0.0)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-x86-mingw32)
-    bootstrap-sass (2.2.2.0)
+    bootstrap-sass (2.3.2.1)
       sass (~> 3.2)
     builder (3.0.4)
     cancan (1.6.9)
@@ -128,6 +128,7 @@ GEM
     rdoc (3.12.1)
       json (~> 1.4)
     ref (1.0.2)
+    rmagick (2.13.2)
     rolify (3.2.0)
     rspec-core (2.14.4)
     rspec-expectations (2.14.0)
@@ -145,6 +146,8 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
+    simple_calendar (0.1.9)
+      rails (>= 3.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -176,7 +179,7 @@ PLATFORMS
 DEPENDENCIES
   annotate (>= 2.5.0)
   awesome_nested_set
-  bootstrap-sass (~> 2.2.0)
+  bootstrap-sass (~> 2.3.2.1)
   cancan
   carrierwave
   coffee-rails (~> 3.2.1)
@@ -192,9 +195,11 @@ DEPENDENCIES
   paper_trail (>= 2.7.0)
   paperclip (~> 3.4.0)
   rails (= 3.2.9)
+  rmagick
   rolify
   rspec-rails
-  sass-rails (~> 3.2.3)
+  sass-rails (~> 3.2)
+  simple_calendar (~> 0.1.9)
   sqlite3
   therubyracer
   tinymce-rails (>= 3.5.8)

app/assets/stylesheets/formtastic-changes.css.scss

@@ -6,22 +6,8 @@ width:90%;
 height:20em;
 }
 
-<<<<<<< HEAD
 form.formtastic .input label.control-label {
 font-weight:bold;
 font-size:125%;
 }
-=======
 
-div.form-group {
-border-width: 1px;
-border-style: none;
-padding: 10px;
-// border-radius: 10px;
-}
-div.verwalten-block {
-border-width: 1px;
-border-style: solid;
-padding: 5px;
-}
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca

config/locales/de.yml

@@ -105,7 +105,6 @@ de:
               blank: "Geben Sie den Namen des Studiums ein"
               taken: "Der  Name ist bereits vergeben"
             typ:
-<<<<<<< HEAD
               inclusion: 'Wählen Sie "Bachelor" oder "Master" aus'
         modul:
           attributes:
@@ -124,11 +123,7 @@ de:
       keine: "Keine Fehlermeldungen oder Warnungen"
   support:
     array:
-      two_words_connector: ', '
+      two_words_connector: ', '         
-  
-=======
-              inclusion: 'Wählen Sie "Bachelor" oder "Master" aus'       
-  
   date:
     abbr_day_names:
     - So
@@ -324,4 +319,4 @@ de:
       long: ! '%A, %d. %B %Y, %H:%M Uhr'
       short: ! '%d.%m.%Y, %H:%M Uhr'
     pm: nachmittags
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
+

config/routes.rb

@@ -1,6 +1,10 @@
-<<<<<<< HEAD
  Fetsite::Application.routes.draw do
-   
+     
+  resources :calendars
+
+
+  resources :calentries
+
    devise_for :users
    resources :home, :only=>[:index]
    #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
@@ -107,116 +111,3 @@
    # Note: This route will make all actions in every controller accessible via GET requests.
    # match ':controller(/:action(/:id))(.:format)'
  end
-=======
-Fetsite::Application.routes.draw do
-  
-  resources :calendars
-
-
-  resources :calentries
-
-
-  devise_for :users
-  resources :home, :only=>[:index]
-  #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
-  scope '(:locale)/admin' do
-    resources :users
-    get 'config',:controller=>:config,:action=>:index , :as => 'config'
-    get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
-    get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
-  end
-
-  devise_for :users
-
-  resources :pages, :except => [:index] do
-    member do
-      post 'preview'
-    end
-  end
-  get 'pages', :to =>'pages#show'
-  scope '(:locale)' do
-    
-    resources :studien, :only=>[:show,:new,:edit,:update,:destroy]
-    resources :modulgruppen,:only =>[:create,:index]
-    
-    resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do 
-      resources :modulgruppen, :path => "(:locale)/modulgruppen"
-      
-    end
-    get 'studien/:id/semesteransicht', :controller=>:studien, :action=>:semesteransicht, :as=>'studium_semesteransicht'
-    resources :semesters
-    resources :moduls
-    resources :lvas
-    resources :neuigkeiten
-    get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
-    
-    resources :rubriken do
-      resources :neuigkeiten, :only=>[:new, :show]
-    end
-    put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
-    get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
-    resources :home, :only=>[:index]
-    get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
-    resources :beispiele
-
-  end
-
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-
-  root :to => 'home#index'
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
-end
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca