From ae9b9907f234c6578b26ecf466756453f3115b2c Mon Sep 17 00:00:00 2001 From: Max Magorsch Date: Fri, 3 Jan 2020 06:27:13 +0100 Subject: Update to Bootstrap 4 Update the project to Bootstrap 4, which is a major rewrite of the entire project. So far, a Tyrian version that is based on Bootstrap 4 is included for that reason. However, in future, it may be retrieved from the CDN or installed as node module. Webpacker is bundeling all of the javascript code and stylesheets. Signed-off-by: Max Magorsch --- app/helpers/application_helper.rb | 2 +- app/helpers/packages_helper.rb | 4 +- app/views/about/feedback.html.erb | 48 +- app/views/about/feeds.html.erb | 6 +- app/views/about/help.html.erb | 6 +- app/views/about/index.html.erb | 4 +- app/views/about/queries.html.erb | 239 +- app/views/arches/index.html.erb | 12 +- app/views/arches/keyworded.html.erb | 6 +- app/views/arches/stable.html.erb | 6 +- app/views/categories/_category_header.html.erb | 6 +- app/views/categories/index.html.erb | 27 +- app/views/categories/show.html.erb | 16 +- app/views/index/index.html.erb | 101 +- app/views/layouts/application.html.erb | 97 +- app/views/packages/_changed_package.html.erb | 36 +- app/views/packages/_changelog.html.erb | 6 +- app/views/packages/_changelog_entry.html.erb | 6 +- app/views/packages/_metadata.html.erb | 6 +- app/views/packages/_package_header.html.erb | 10 +- app/views/packages/_resources.html.erb | 18 +- app/views/packages/_version_card.html.erb | 2 +- app/views/packages/_versions.html.erb | 10 +- app/views/packages/added.html.erb | 6 +- app/views/packages/keyworded.html.erb | 6 +- app/views/packages/stable.html.erb | 6 +- app/views/packages/updated.html.erb | 6 +- app/views/useflags/_useflag_header.html.erb | 6 +- app/views/useflags/_useflag_result_row.html.erb | 2 +- app/views/useflags/index.html.erb | 10 +- app/views/useflags/search.html.erb | 10 +- app/views/useflags/show.html.erb | 18 +- app/webpack/packs/application.js | 18 +- .../src/javascript/index/query_generator.js | 20 +- app/webpack/src/stylesheets/application.scss | 2 + app/webpack/src/stylesheets/keywords.scss | 21 +- app/webpack/src/stylesheets/packages.scss | 20 + app/webpack/src/vendor/tyrian/Bitter-Regular.woff | Bin 0 -> 32460 bytes app/webpack/src/vendor/tyrian/FontAwesome.otf | Bin 0 -> 134808 bytes app/webpack/src/vendor/tyrian/OpenSans-Bold.woff | Bin 0 -> 25516 bytes .../src/vendor/tyrian/OpenSans-BoldItalic.woff | Bin 0 -> 26196 bytes app/webpack/src/vendor/tyrian/OpenSans-Italic.woff | Bin 0 -> 26640 bytes .../src/vendor/tyrian/OpenSans-Regular.woff | Bin 0 -> 25680 bytes app/webpack/src/vendor/tyrian/ad1.png | Bin 0 -> 4828 bytes app/webpack/src/vendor/tyrian/ad2.png | Bin 0 -> 26120 bytes app/webpack/src/vendor/tyrian/ad3.png | Bin 0 -> 8939 bytes app/webpack/src/vendor/tyrian/black-thing.png | Bin 0 -> 1069 bytes app/webpack/src/vendor/tyrian/black-thing.svg | 62 + app/webpack/src/vendor/tyrian/black-thing@2x.png | Bin 0 -> 2877 bytes .../src/vendor/tyrian/fontawesome-webfont.eot | Bin 0 -> 165742 bytes .../src/vendor/tyrian/fontawesome-webfont.svg | 2671 +++++ .../src/vendor/tyrian/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes .../src/vendor/tyrian/fontawesome-webfont.woff | Bin 0 -> 98024 bytes .../src/vendor/tyrian/fontawesome-webfont.woff2 | Bin 0 -> 77160 bytes .../vendor/tyrian/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../vendor/tyrian/glyphicons-halflings-regular.svg | 288 + .../vendor/tyrian/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../tyrian/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../tyrian/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes app/webpack/src/vendor/tyrian/site-logo-green.png | Bin 0 -> 12306 bytes app/webpack/src/vendor/tyrian/site-logo.png | Bin 0 -> 14200 bytes app/webpack/src/vendor/tyrian/site-logo.svg | 555 + app/webpack/src/vendor/tyrian/site-logo@2x.png | Bin 0 -> 48003 bytes app/webpack/src/vendor/tyrian/tyrian.css | 11370 +++++++++++++++++++ app/webpack/src/vendor/tyrian/tyrian.min.css | 10 + app/webpack/src/vendor/tyrian/znurt.png | Bin 0 -> 3606 bytes app/webpack/src/vendor/tyrian/znurt.svg | 93 + app/webpack/src/vendor/tyrian/znurt@2x.png | Bin 0 -> 7983 bytes bin/first-run | 2 +- config/webpack/environment.js | 10 +- docker-compose.override.yml | 8 + package.json | 3 + yarn.lock | 192 +- 73 files changed, 15678 insertions(+), 411 deletions(-) create mode 100644 app/webpack/src/vendor/tyrian/Bitter-Regular.woff create mode 100755 app/webpack/src/vendor/tyrian/FontAwesome.otf create mode 100644 app/webpack/src/vendor/tyrian/OpenSans-Bold.woff create mode 100644 app/webpack/src/vendor/tyrian/OpenSans-BoldItalic.woff create mode 100644 app/webpack/src/vendor/tyrian/OpenSans-Italic.woff create mode 100644 app/webpack/src/vendor/tyrian/OpenSans-Regular.woff create mode 100644 app/webpack/src/vendor/tyrian/ad1.png create mode 100644 app/webpack/src/vendor/tyrian/ad2.png create mode 100644 app/webpack/src/vendor/tyrian/ad3.png create mode 100644 app/webpack/src/vendor/tyrian/black-thing.png create mode 100644 app/webpack/src/vendor/tyrian/black-thing.svg create mode 100644 app/webpack/src/vendor/tyrian/black-thing@2x.png create mode 100755 app/webpack/src/vendor/tyrian/fontawesome-webfont.eot create mode 100755 app/webpack/src/vendor/tyrian/fontawesome-webfont.svg create mode 100755 app/webpack/src/vendor/tyrian/fontawesome-webfont.ttf create mode 100755 app/webpack/src/vendor/tyrian/fontawesome-webfont.woff create mode 100755 app/webpack/src/vendor/tyrian/fontawesome-webfont.woff2 create mode 100644 app/webpack/src/vendor/tyrian/glyphicons-halflings-regular.eot create mode 100644 app/webpack/src/vendor/tyrian/glyphicons-halflings-regular.svg create mode 100644 app/webpack/src/vendor/tyrian/glyphicons-halflings-regular.ttf create mode 100644 app/webpack/src/vendor/tyrian/glyphicons-halflings-regular.woff create mode 100644 app/webpack/src/vendor/tyrian/glyphicons-halflings-regular.woff2 create mode 100644 app/webpack/src/vendor/tyrian/site-logo-green.png create mode 100644 app/webpack/src/vendor/tyrian/site-logo.png create mode 100644 app/webpack/src/vendor/tyrian/site-logo.svg create mode 100644 app/webpack/src/vendor/tyrian/site-logo@2x.png create mode 100644 app/webpack/src/vendor/tyrian/tyrian.css create mode 100644 app/webpack/src/vendor/tyrian/tyrian.min.css create mode 100644 app/webpack/src/vendor/tyrian/znurt.png create mode 100644 app/webpack/src/vendor/tyrian/znurt.svg create mode 100644 app/webpack/src/vendor/tyrian/znurt@2x.png diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 273fd50..b3f1605 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -28,7 +28,7 @@ module ApplicationHelper content_tag :span, letters.join(', '), - class: 'label %s' % css_class, + class: 'badge %s' % css_class, title: t(message_id, list: items.join(' ')) end diff --git a/app/helpers/packages_helper.rb b/app/helpers/packages_helper.rb index 97626b7..7187f7d 100644 --- a/app/helpers/packages_helper.rb +++ b/app/helpers/packages_helper.rb @@ -4,13 +4,13 @@ require 'open-uri' module PackagesHelper def restrict_label(version) abbreviated_label version.restrict, - 'label-danger kk-restrict-label', + 'badge-danger kk-restrict-label', :restrict_tooltip end def properties_label(version) abbreviated_label version.properties, - 'label-info kk-properties-label', + 'badge-info kk-properties-label', :properties_tooltip end diff --git a/app/views/about/feedback.html.erb b/app/views/about/feedback.html.erb index 4a1f1f3..e46e0a0 100644 --- a/app/views/about/feedback.html.erb +++ b/app/views/about/feedback.html.erb @@ -1,7 +1,7 @@

Feedback

@@ -17,27 +17,27 @@
-
-
-

Send Feedback

-
-
+
+

+ Send Feedback +

+
-
- -
- -
+
+ +
+ +
-
- +
+
-
-
- +
+
+
@@ -45,16 +45,16 @@
-
-
-

Other ways to get in touch

-
+
+

+ Other ways to get in touch +

- + E-Mail: gpackages@gentoo.org - + IRC: #gentoo-www diff --git a/app/views/about/feeds.html.erb b/app/views/about/feeds.html.erb index 5a9c1cd..104d238 100644 --- a/app/views/about/feeds.html.erb +++ b/app/views/about/feeds.html.erb @@ -1,7 +1,7 @@

<%= t :update_feeds %>

diff --git a/app/views/about/help.html.erb b/app/views/about/help.html.erb index 77ddf5b..bd51c7e 100644 --- a/app/views/about/help.html.erb +++ b/app/views/about/help.html.erb @@ -1,7 +1,7 @@

<%= t :help %>

diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb index e5d6aff..aeaf3e5 100644 --- a/app/views/about/index.html.erb +++ b/app/views/about/index.html.erb @@ -1,6 +1,6 @@

About packages.gentoo.org

diff --git a/app/views/about/queries.html.erb b/app/views/about/queries.html.erb index bdba20a..f358f81 100644 --- a/app/views/about/queries.html.erb +++ b/app/views/about/queries.html.erb @@ -1,7 +1,7 @@

<%= t :queries %>

@@ -16,121 +16,125 @@ The possible fields and operators are summarized in the following tables:
-

Possible Fields

+
+

Possible Fields

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FieldDescription
atomThe unique identifier of a package
e.g. sys-kernel/gentoo-sources
categoryThe category of a package
e.g. sys-kernel
nameThe name of a package
e.g. gentoo-sources
descriptionThe description of a package
e.g. A tiling window manager
longdescriptionThe full descripiton of a package
e.g. xmonad is a tiling window manager for [...]
homepageThe homepage of a package
e.g. http://xmonad.org
licenseThe license of a package
e.g. BSD
Maintainers
maintainers.nameThe name of the maintainer
e.g. Gentoo Haskell
maintainers.descriptionThe description of the maintainers
maintainers.typeThe type of maintainter
e.g. project
maintainers.restrict
maintainers.emailThe email of the maintainer
e.g. haskell@gentoo.org
Useflag
global
useflags.global.nameThe name of the global useflag
e.g. hscolour
useflags.global.descriptionThe description of the global useflag
e.g. Include coloured haskell sources to [...]
local
useflags.local.nameThe name of the local useflag
useflags.local.descriptionThe description of the local useflag
use_expand
useflags.use_expand.nameThe name of the local use_expand
useflags.use_expand.descriptionThe description of the use_expand
useflags.use_expand.use_expand_prefixThe use_expand prefix
e.g. python_targets
metadata_hashThe hash of the metadata
e.g. 5cd76e098f966b4edcd1848866dd9099
-

Possible Operators

-The following operators can be used to combine multiple field/value pairs: - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FieldDescription
atomThe unique identifier of a package
e.g. sys-kernel/gentoo-sources
categoryThe category of a package
e.g. sys-kernel
nameThe name of a package
e.g. gentoo-sources
descriptionThe description of a package
e.g. A tiling window manager
longdescriptionThe full descripiton of a package
e.g. xmonad is a tiling window manager for [...]
homepageThe homepage of a package
e.g. http://xmonad.org
licenseThe license of a package
e.g. BSD
Maintainers
maintainers.nameThe name of the maintainer
e.g. Gentoo Haskell
maintainers.descriptionThe description of the maintainers
maintainers.typeThe type of maintainter
e.g. project
maintainers.restrict
maintainers.emailThe email of the maintainer
e.g. haskell@gentoo.org
Useflag
global
useflags.global.nameThe name of the global useflag
e.g. hscolour
useflags.global.descriptionThe description of the global useflag
e.g. Include coloured haskell sources to [...]
local
useflags.local.nameThe name of the local useflag
useflags.local.descriptionThe description of the local useflag
use_expand
useflags.use_expand.nameThe name of the local use_expand
useflags.use_expand.descriptionThe description of the use_expand
useflags.use_expand.use_expand_prefixThe use_expand prefix
e.g. python_targets
metadata_hashThe hash of the metadata
e.g. 5cd76e098f966b4edcd1848866dd9099
+
+ +
+

Possible Operators

+ + @@ -156,6 +160,7 @@ The following operators can be used to combine multiple field/value pairs:
Operator
+

Examples

diff --git a/app/views/arches/index.html.erb b/app/views/arches/index.html.erb index 8684eb1..a2fe54e 100644 --- a/app/views/arches/index.html.erb +++ b/app/views/arches/index.html.erb @@ -1,18 +1,18 @@

<%= t :architectures %>

<%= t :arches_intro %>

-
-
-

<%= t :architectures %>

+
+
+

<%= t :architectures %>

- +
diff --git a/app/views/arches/keyworded.html.erb b/app/views/arches/keyworded.html.erb index ae1df29..6b51d2c 100644 --- a/app/views/arches/keyworded.html.erb +++ b/app/views/arches/keyworded.html.erb @@ -1,7 +1,7 @@

diff --git a/app/views/arches/stable.html.erb b/app/views/arches/stable.html.erb index eb66245..3771605 100644 --- a/app/views/arches/stable.html.erb +++ b/app/views/arches/stable.html.erb @@ -1,7 +1,7 @@

diff --git a/app/views/categories/_category_header.html.erb b/app/views/categories/_category_header.html.erb index b52cecf..9bf2a49 100644 --- a/app/views/categories/_category_header.html.erb +++ b/app/views/categories/_category_header.html.erb @@ -1,7 +1,7 @@
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb index 9c19c9c..8bca93d 100644 --- a/app/views/categories/index.html.erb +++ b/app/views/categories/index.html.erb @@ -1,17 +1,18 @@ +

<%= t :packages %>

-
-
-

<%= t :browse_categories %>

+
+
+

<%= t :browse_categories %>

-
+
    <%- prev_letter = 'z' -%> <% @categories.each do |category| %> @@ -25,24 +26,22 @@
-
-
-

<%= t :update_feeds %>

-
+
+

<%= t :update_feeds %>

- + <%= t :added_packages %> - + <%= t :updated_packages %> - + <%= t :stable_packages %> - + <%= t :keyworded_packages %> diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb index 41cceef..e524860 100644 --- a/app/views/categories/show.html.erb +++ b/app/views/categories/show.html.erb @@ -6,21 +6,21 @@

--> -
-
-

All packages

+
+
+

All packages

-

+
<%= render partial: 'package_line', collection: @packages, as: 'package' %>
-
-
-

Statistics

+
+
+

Statistics

-
+
<%= @packages.count %> <%= t :packages %>
diff --git a/app/views/index/index.html.erb b/app/views/index/index.html.erb index b173177..f8d7e46 100644 --- a/app/views/index/index.html.erb +++ b/app/views/index/index.html.erb @@ -23,15 +23,15 @@
<% cache("added-#{@new_packages.hash}") do %> -
-
-

+
+
+

- <%= link_to t(:added_packages), added_packages_path %> -

+ <%= link_to t(:added_packages), added_packages_path, class: "text-dark" %> +

- +
<%= render partial: 'package', collection: @new_packages, as: 'change' %>
@@ -39,12 +39,12 @@ <% end %> <% cache("updated-#{@version_bumps.hash}") do %> -
-
-

+
+
+

- <%= link_to t(:updated_packages), updated_packages_path %> -

+ <%= link_to t(:updated_packages), updated_packages_path, class: "text-dark" %> +

    <% @version_bumps.each do |change| @@ -55,12 +55,14 @@
<% end %> -