Merge pull request #1193 from ElixirTeSS/spaces-themes

Space-specific sources

Author: fbacall

app/assets/stylesheets/application.scss

@@ -18,7 +18,32 @@
 @import "font-awesome-sprockets";
 @import "font-awesome";
 @import "mixins/mixins";
-@import "*";
+
+// Local
+@import "about";
+@import "account";
+@import "activities";
+@import "autocomplete";
+@import "bootstrap-tweaks";
+@import "collaborations";
+@import "collection";
+@import "curators";
+@import "events";
+@import "external-resources";
+@import "footer";
+@import "forms";
+@import "headers";
+@import "helpers";
+@import "home";
+@import "icons";
+@import "learning-paths";
+@import "masonry";
+@import "nodes";
+@import "showcase";
+@import "toggle";
+@import "workflows";
+
+// Vendor
 @import "cytoscape-panzoom";
 @import "jquery.simplecolorpicker";
 @import "eonasdan-bootstrap-datetimepicker";
@@ -1049,6 +1074,24 @@ td.day .calendar-text {
   }
 }
 
+.theme-selector {
+  display: flex;
+  gap: 10px;
+}
+
+.theme-select-option {
+  flex-grow: 1;
+  label {
+    border: 5px solid;
+    padding: 10px 20px;
+    border-radius: 5px;
+    display: block;
+
+    hr {
+      border-width: 10px;
+    }
+  }
+}
 .btn-oidc-only {
   font-size: 36px;
   padding: 4px;

app/assets/stylesheets/learning-paths.scss

@@ -38,7 +38,7 @@
   }
 }
 
-.learning-path-item {
+.block-item {
   text-align: center;
   border-image-slice: 80;
   border-image-width: 80px;

app/controllers/collections_controller.rb

@@ -114,7 +114,7 @@ def destroy
     @collection.create_activity :destroy, owner: current_user
     @collection.destroy
     respond_to do |format|
-      format.html { redirect_to collections_url, notice: 'Collection was successfully destroyed.' }
+      format.html { redirect_to collections_path, notice: 'Collection was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/content_providers_controller.rb

@@ -86,7 +86,7 @@ def destroy
     @content_provider.create_activity :destroy, owner: current_user
     @content_provider.destroy
     respond_to do |format|
-      format.html { redirect_to content_providers_url, notice: 'Content Provider was successfully destroyed.' }
+      format.html { redirect_to content_providers_path, notice: 'Content Provider was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/events_controller.rb

@@ -187,7 +187,7 @@ def destroy
     @event.create_activity :destroy, owner: current_user
     @event.destroy
     respond_to do |format|
-      format.html { redirect_to events_url, notice: 'Event was successfully destroyed.' }
+      format.html { redirect_to events_path, notice: 'Event was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/learning_path_topics_controller.rb

@@ -68,7 +68,7 @@ def destroy
     @learning_path_topic.create_activity :destroy, owner: current_user
     @learning_path_topic.destroy
     respond_to do |format|
-      format.html { redirect_to learning_path_topics_url, notice: 'Topic was successfully destroyed.' }
+      format.html { redirect_to learning_path_topics_path, notice: 'Topic was successfully destroyed.' }
       # format.json { head :no_content }
     end
   end

app/controllers/learning_paths_controller.rb

@@ -85,7 +85,7 @@ def destroy
     @learning_path.create_activity :destroy, owner: current_user
     @learning_path.destroy
     respond_to do |format|
-      format.html { redirect_to learning_paths_url, notice: 'Learning path was successfully destroyed.' }
+      format.html { redirect_to learning_paths_path, notice: 'Learning path was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/materials_controller.rb

@@ -132,7 +132,7 @@ def destroy
     @material.create_activity :destroy, owner: current_user
     @material.destroy
     respond_to do |format|
-      format.html { redirect_to materials_url, notice: 'Material was successfully destroyed.' }
+      format.html { redirect_to materials_path, notice: 'Material was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/nodes_controller.rb

@@ -79,7 +79,7 @@ def destroy
     @node.create_activity :destroy, owner: current_user
     @node.destroy
     respond_to do |format|
-      format.html { redirect_to nodes_url, notice: 'Node was successfully destroyed.' }
+      format.html { redirect_to nodes_path, notice: 'Node was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/sources_controller.rb

@@ -24,7 +24,7 @@ def show
 
   # GET /sources/new
   def new
-    authorize Source
+    authorize @content_provider, :create_source?
     @source = @content_provider.sources.build
   end
 
@@ -36,9 +36,10 @@ def edit
   # POST /sources
   # POST /sources.json
   def create
-    authorize Source
+    authorize @content_provider, :create_source?
     @source = @content_provider.sources.build(source_params)
     @source.user = current_user
+    @source.space = current_space
 
     respond_to do |format|
       if @source.save
@@ -145,13 +146,12 @@ def set_source
   def set_content_provider
     @content_provider = @source.content_provider if @source
     @content_provider ||= ContentProvider.friendly.find(params[:content_provider_id])
-    authorize @content_provider, :manage?
   end
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def source_params
     permitted = [:url, :method, :token, :default_language, :enabled]
-    permitted << :approval_status if policy(Source).approve?
+    permitted << :approval_status if policy(@source || Source).approve?
     permitted << :content_provider_id if policy(Source).index?
 
     params.require(:source).permit(permitted)