Skip to content

Commit

Permalink
Revamp the views to new chameleon version
Browse files Browse the repository at this point in the history
  • Loading branch information
hellcp committed Mar 25, 2022
1 parent dec5003 commit d44c51b
Show file tree
Hide file tree
Showing 13 changed files with 105 additions and 370 deletions.
39 changes: 0 additions & 39 deletions app/views/layouts/_flash.html.erb

This file was deleted.

18 changes: 18 additions & 0 deletions app/views/layouts/_flash.html.haml
@@ -0,0 +1,18 @@
- unless flash.blank?
#flash-messages.container
- %w(success error warn note notice info).each do |flash_type|
- if (flash[flash_type] && !flash[flash_type].empty?)
- flash_header = case flash_type.to_sym
- when :error then 'alert alert-danger'
- when :warn then 'alert alert-warning'
- when :success then 'alert alert-success'
- when :note then 'alert alert-light'
- when :info then 'alert alert-info'
- when :notice then 'alert alert-primary'

- body = flash[flash_type].gsub(/\n/, '<br/>')
- body = sanitize body, :tags => %w(a b p ul li br u), :attributes => %w(href title)

%div{ class: flash_header }
%p
= body
75 changes: 0 additions & 75 deletions app/views/layouts/_footer.html.erb

This file was deleted.

10 changes: 10 additions & 0 deletions app/views/layouts/_footer.html.haml
@@ -0,0 +1,10 @@
%footer.footer
.container
.d-flex.justify-content-between
.footer-copyright
&copy; 2011&ndash;
= Time.new.year
= _("openSUSE contributors")
.list-inline
= link_to _("Source Code"), "https://github.com/openSUSE/news-o-o", class: "list-inline-item"
= link_to _("License"), "https://github.com/openSUSE/news-o-o/blob/master/LICENSE", class: "list-inline-item"
30 changes: 0 additions & 30 deletions app/views/layouts/_navbar.html.erb

This file was deleted.

35 changes: 35 additions & 0 deletions app/views/layouts/_navbar.html.haml
@@ -0,0 +1,35 @@
%nav.navbar.noprint.navbar-expand-md.sticky-top
- homepage = build_service == true ? "https://build.opensuse.org" : "/"
= link_to homepage, class: "navbar-brand" do
= image_tag "chameleon/logo/favicon.svg", class: "d-inline-block align-top", alt: "openSUSE", title: "openSUSE", width: "30", height: "30"
.navbar-title
- if build_service == true
= _("Build Service")
- else
= _("Software")

%button.navbar-toggler{ type: "button", data: { toggle: "collapse", target: "#navbar-collapse" } }
= icon "navbar_toggle"
.collapse.navbar-collapse#navbar-collapse
%ul.nav.navbar-nav.mr-auto.flex-md-shrink-0
- if build_service == true
%li.nav-item
= link_to "Embed instructions", { controller: "download", action: "doc" }, class: "nav-link"
- else
%li.nav-item
= link_to "https://github.com/openSUSE/news-o-o#how-to-submit-a-new-post", class: "nav-link" do
New Post
%li.nav-item.dropdown
= link_to "#", class: "nav-link dropdown-toggle", id: "locale-menu-link", role: "button", "data-toggle": "dropdown", "aria": { "haspopup": "true", "expanded": "false" } do
= icon "navbar_locale"
%span.selected-language= LANGUAGE_NAMES[@lang]
%span.caret
.dropdown-menu.dropdown-menu-right
- LANGUAGES.sort.each do |lang|
= link_to LANGUAGE_NAMES[lang], params.permit.merge(locale: lang), class: "dropdown-item"

%button.navbar-toggler.megamenu-toggler{ type: "button", data: { toggle: "collapse", target: "#megamenu" } }
= icon "megamenu_toggle"

#megamenu.megamenu.collapse
20 changes: 0 additions & 20 deletions app/views/layouts/_piwik.html.erb

This file was deleted.

93 changes: 0 additions & 93 deletions app/views/layouts/application.html.erb

This file was deleted.

30 changes: 30 additions & 0 deletions app/views/layouts/application.html.haml
@@ -0,0 +1,30 @@
!!! 5
%html
%head{ lang: @lang }
%meta{ charset: "utf-8" }
%meta{ "http-equiv": "X-UA-Compatible", content: "IE=edge" }
%meta{ name: "viewport", content: "width=device-width, initial-scale=1" }
%title= @page_title || _('openSUSE Software')
%meta{ "http-equiv": "Content-Type", content: "text/html; charset=utf-8" }
%meta{ "http-equiv": "Content-Script-Type", content: "text/javascript" }
%meta{ "http-equiv": "Content-Style-Type", content: "text/css" }
%link{ rel: "search", type: "application/opensearchdescription+xml", title: "openSUSE Software", href: "/search_software.xml" }
%link{ href: "https://software.opensuse.org/favicon.ico", rel: "shortcut icon" }
= stylesheet_link_tag "application"
= javascript_include_tag "application"
%body
= render partial: "layouts/navbar", locals: { hidesearchbox: @hide_search_box, build_service: @build_service }
- unless flash.blank?
= render(partial: "layouts/flash", object: flash)
%main#content.page-content.flex-fill
- unless @hide_search_box
= render partial: 'search/find_form', locals: { baseproject: @baseproject }
#search_result_container
= yield
= render partial: "layouts/footer"
8 changes: 8 additions & 0 deletions app/views/layouts/application.iframe.haml
@@ -0,0 +1,8 @@
!!! 5
%html
%head
= stylesheet_link_tag "application"
= javascript_include_tag "application"

%body
= yield

0 comments on commit d44c51b

Please sign in to comment.