Merge pull request #8327 from saraycp/remove_layout

Replace bento layout by Bootstrap one

dist/obs-server.spec

@@ -361,9 +361,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/obs/cloudupload/.aws
 install -m 644 $RPM_BUILD_DIR/open-build-service-%version/dist/aws_credentials.example $RPM_BUILD_ROOT/etc/obs/cloudupload/.aws/credentials
 
 # Link the assets without hash to make them accessible for third party tools like the pattern library
-pushd $RPM_BUILD_ROOT/srv/www/obs/api/public/assets/webui2/
+pushd $RPM_BUILD_ROOT/srv/www/obs/api/public/assets/webui/
 ln -sf application-*.js application.js
-ln -sf webui2-*.css webui2.css
+ln -sf application-*.css application.css
 popd
 
 %check

src/api/.jshintignore

@@ -1,6 +1,6 @@
 app/assets/javascripts/webui/application/bento
 app/assets/javascripts/webui/application/cm2
-app/assets/javascripts/webui2/cm2
-app/assets/javascripts/webui2/*.min.js
-app/assets/javascripts/webui2/monitor.js
+app/assets/javascripts/webui/cm2
+app/assets/javascripts/webui/*.min.js
+app/assets/javascripts/webui/monitor.js
 app/assets/javascripts/webui/obs_factory

src/api/app/assets/javascripts/webui/application.js

@@ -0,0 +1,56 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery3
+//= require jquery_ujs
+//= require peek
+//= require popper
+//= require bootstrap
+//= require cocoon
+//= require jquery.flot
+//= require jquery.flot.resize
+//= require jquery.flot.time
+//= require jquery.flot.stack.js
+//= require tokenfield.js
+//= require webui/plotbusyworkers.js
+//= require webui/datatables.js
+//= require webui/flash.js
+//= require webui/tabs.js
+//= require webui/requests_table.js
+//= require webui/attributes.js
+//= require webui/packages.js
+//= require webui/live_build_log.js
+//= require webui/forms.js
+//= require webui/users_groups.js
+//= require webui/popover.js
+//= require webui/repositories.js
+//= require webui/users.js
+// FIXME refactor these files
+//= require webui/autocomplete.js
+//= require webui/comment.js
+//= require webui/request.js
+//= require webui/buildresult.js
+//= require webui/job_history.js
+// FIXME remove jquery-ui file when we upgrade jquery-ui gem
+//= require webui/jquery-ui.min.js
+//= require webui/cm2/use-codemirror.js
+//= require webui/package-view_file.js
+//= require webui/staging_workflow.js
+//= require webui/project.js
+//= require webui/project_monitor.js
+//= require webui/collapsible_text
+//= require webui/patchinfo.js
+//= require webui/image_templates.js
+//= require rails-timeago
+//= require webui/kiwi_editor.js
+//= require webui/monitor.js
+//= require webui/airbrake-js

src/api/app/assets/javascripts/webui2/cm2/default.js → src/api/app/assets/javascripts/webui/cm2/default.js

@@ -11,9 +11,9 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require codemirror
-//= require webui2/cm2/toolbars
-//= require webui2/cm2/mode/baselibsconf
-//= require webui2/cm2/mode/prjconf
+//= require webui/cm2/toolbars
+//= require webui/cm2/mode/baselibsconf
+//= require webui/cm2/mode/prjconf
 //= require codemirror/modes/clike.js
 //= require codemirror/modes/clojure.js
 //= require codemirror/modes/coffeescript.js
@@ -61,6 +61,6 @@
 //= require codemirror/modes/xquery.js
 //= require codemirror/modes/yaml.js
 //= require codemirror/modes/yaml.js
-//= require webui2/cm2/use-codemirror
-//= require webui2/cm2/mode/simple.js
-//= require webui2/cm2/mode/dockerfile.js
+//= require webui/cm2/use-codemirror
+//= require webui/cm2/mode/simple.js
+//= require webui/cm2/mode/dockerfile.js

src/api/app/assets/javascripts/webui2/cm2/index-diff.js → src/api/app/assets/javascripts/webui/cm2/index-diff.js

@@ -11,6 +11,6 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require codemirror
-//= require webui2/cm2/toolbars
+//= require webui/cm2/toolbars
 //= require codemirror/modes/diff.js
-//= require webui2/cm2/use-codemirror
+//= require webui/cm2/use-codemirror

src/api/app/assets/javascripts/webui2/cm2/index-prjconf.js → src/api/app/assets/javascripts/webui/cm2/index-prjconf.js

@@ -11,6 +11,6 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require codemirror
-//= require webui2/cm2/toolbars
-//= require webui2/cm2/mode/prjconf
-//= require webui2/cm2/use-codemirror
+//= require webui/cm2/toolbars
+//= require webui/cm2/mode/prjconf
+//= require webui/cm2/use-codemirror

src/api/app/assets/javascripts/webui2/cm2/index-xml.js → src/api/app/assets/javascripts/webui/cm2/index-xml.js

@@ -11,6 +11,6 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require codemirror
-//= require webui2/cm2/toolbars
+//= require webui/cm2/toolbars
 //= require codemirror/modes/xml.js
-//= require webui2/cm2/use-codemirror
+//= require webui/cm2/use-codemirror

src/api/app/assets/javascripts/webui2/cm2/show-prjconf.js → src/api/app/assets/javascripts/webui/cm2/show-prjconf.js

@@ -11,6 +11,6 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require codemirror
-//= require webui2/cm2/toolbars
-//= require webui2/cm2/mode/prjconf
-//= require webui2/cm2/use-codemirror
+//= require webui/cm2/toolbars
+//= require webui/cm2/mode/prjconf
+//= require webui/cm2/use-codemirror

src/api/app/assets/stylesheets/webui2/webui2.css.scss → src/api/app/assets/stylesheets/webui/application.scss

@@ -8,10 +8,10 @@
  * 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 codemirror
- *= require peek
 */
 
+@import 'codemirror';
+@import 'peek';
 @import 'bootstrap_variables/breakpoints';
 @import 'bootstrap_variables/colors';
 @import 'bootstrap_variables/spacers';

src/api/app/controllers/webui/package_controller.rb

@@ -738,7 +738,7 @@ def save_file
 
     switch_to_webui2
     status ||= 200
-    render layout: false, status: status, partial: "layouts/#{ui_namespace}/flash", object: flash
+    render layout: false, status: status, partial: 'layouts/webui/flash', object: flash
   end
 
   def remove_file
@@ -1039,7 +1039,7 @@ def save_meta
       status = 400
     end
     switch_to_webui2
-    render layout: false, status: status, partial: "layouts/#{ui_namespace}/flash", object: flash
+    render layout: false, status: status, partial: 'layouts/webui/flash', object: flash
   end
 
   def edit; end
@@ -1070,7 +1070,7 @@ def validate_xml
     @meta_xml = Xmlhash.parse(params[:meta])
   rescue Suse::ValidationError => e
     flash.now[:error] = "Error while saving the Meta file: #{e}."
-    render layout: false, status: 400, partial: "layouts/#{ui_namespace}/flash", object: flash
+    render layout: false, status: 400, partial: 'layouts/webui/flash', object: flash
   end
 
   def package_files(rev = nil, expand = nil)

src/api/app/controllers/webui/projects/meta_controller.rb

@@ -22,7 +22,7 @@ def update
                    400
                  end
         switch_to_webui2
-        render layout: false, status: status, partial: "layouts/#{ui_namespace}/flash", object: flash
+        render layout: false, status: status, partial: 'layouts/webui/flash', object: flash
       end
 
       private
@@ -32,7 +32,7 @@ def validate_meta
         meta_validator.call
         if meta_validator.errors?
           flash.now[:error] = meta_validator.errors
-          render layout: false, status: 400, partial: "layouts/#{ui_namespace}/flash", object: flash
+          render layout: false, status: 400, partial: 'layouts/webui/flash', object: flash
         else
           @request_data = meta_validator.request_data
         end

src/api/app/controllers/webui/projects/project_configuration_controller.rb

@@ -24,7 +24,7 @@ def update
                    400
                  end
         switch_to_webui2
-        render layout: false, status: status, partial: "layouts/#{ui_namespace}/flash", object: flash
+        render layout: false, status: status, partial: 'layouts/webui/flash', object: flash
       end
     end
   end

src/api/app/controllers/webui/staging/excluded_requests_controller.rb

@@ -1,8 +1,6 @@
 module Webui
   module Staging
     class ExcludedRequestsController < WebuiController
-      layout 'webui2/webui'
-
       before_action :require_login, except: [:index]
       # NOTE: remove when bootstrap migration is done (related to switch_to_webui2)
       before_action :set_webui2_views

src/api/app/controllers/webui/staging/projects_controller.rb

@@ -1,8 +1,6 @@
 module Webui
   module Staging
     class ProjectsController < WebuiController
-      layout 'webui2/webui'
-
       before_action :require_login
       before_action :set_staging_workflow
       after_action :verify_authorized, except: :show

src/api/app/controllers/webui/staging/workflows_controller.rb

@@ -1,6 +1,4 @@
 class Webui::Staging::WorkflowsController < Webui::WebuiController
-  layout 'webui2/webui'
-
   before_action :require_login, except: [:show]
   before_action :set_webui2_views
   before_action :set_project, only: [:new, :create]

src/api/app/controllers/webui/webui_controller.rb

@@ -4,7 +4,7 @@
 require_dependency 'authenticator'
 
 class Webui::WebuiController < ActionController::Base
-  layout :choose_layout
+  layout 'webui/webui'
 
   helper_method :valid_xml_id
 
@@ -310,25 +310,12 @@ def render_dialog(dialog_init = nil, locals = {})
     render partial: 'dialog', content_type: 'application/javascript'
   end
 
+  # TODO: disable bootstrap flip in production after migrating all the controllers
   def switch_to_webui2?
-    if Rails.env.test?
-      # In test environment we want to enable the
-      # bootstrap theme independent from the user
-      # The feature switch depends on the user (e.g. Admin or Staff)
-      ENV['BOOTSTRAP'].present?
-    else
-      Flipper.enabled?(:bootstrap, User.possibly_nobody)
-    end
-  end
-
-  def choose_layout
-    @switch_to_webui2 ? 'webui2/webui' : 'webui/webui'
-  end
-
-  def ui_namespace
-    switch_to_webui2? ? 'webui2' : 'webui'
+    true
   end
 
+  # TODO: remove after migrating all the controller
   def switch_to_webui2
     if switch_to_webui2?
       @switch_to_webui2 = true

src/api/app/views/layouts/webui/_announcement.html.haml

@@ -1,10 +1,12 @@
-- if @pending_announcement.present?
-  .container_16#announcements
-    .ui-widget.grid_16.alpha.omega.announcement
-      %div
-        %p
-          = @pending_announcement.title
-          = link_to('Read more', announcement_path(@pending_announcement))
-      - if User.session
-        = form_tag(user_announcements_path(@pending_announcement), remote: true, class: 'announcement-actions') do
-          = submit_tag 'Got it'
+- if pending_announcement.present?
+  .row.justify-content-center
+    .col-12
+      .alert.fade.show.alert-notice
+        .row
+          .col-md-10
+            = pending_announcement.title
+            = link_to('Read more...', announcement_path(pending_announcement), class: 'alert-link')
+          .col-md-2
+            - if User.session
+              = form_tag(user_announcements_path(pending_announcement), remote: true, class: 'text-right') do
+                = submit_tag 'Got it', class: 'btn btn-sm btn-secondary'