From c48dc91278dc00d1348ae4f5fd146112a2330901 Mon Sep 17 00:00:00 2001 From: "Haas, Christoph" Date: Tue, 20 Aug 2013 15:49:20 +0200 Subject: [PATCH 01/12] New logo invented --- mockups/logo.png | Bin 0 -> 7347 bytes mockups/logo.svg | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 mockups/logo.png create mode 100644 mockups/logo.svg diff --git a/mockups/logo.png b/mockups/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0bd3c4faeee9bec65201b9ae498943d852a6aa17 GIT binary patch literal 7347 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 literal 0 HcmV?d00001 diff --git a/mockups/logo.svg b/mockups/logo.svg new file mode 100644 index 0000000..5b77948 --- /dev/null +++ b/mockups/logo.svg @@ -0,0 +1,17 @@ + + + + + + + image/svg+xml + + + + + + + + + + From bf166a75c861f792aa9d5bcbb8a4553df62d72f8 Mon Sep 17 00:00:00 2001 From: "Haas, Christoph" Date: Tue, 20 Aug 2013 16:03:28 +0200 Subject: [PATCH 02/12] Color of logo slightly changed --- mockups/logo.svg | 85 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 14 deletions(-) diff --git a/mockups/logo.svg b/mockups/logo.svg index 5b77948..b4e41f2 100644 --- a/mockups/logo.svg +++ b/mockups/logo.svg @@ -1,17 +1,74 @@ - - - - - image/svg+xml - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + From 7ed2ae0ba084d5e953faf1a1a56dca0be97c08a3 Mon Sep 17 00:00:00 2001 From: "Haas, Christoph" Date: Wed, 21 Aug 2013 14:29:08 +0200 Subject: [PATCH 03/12] Added script to get database dump and screenshot files from old debshots1 live server --- bin/get-data-from-old-live-server.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 bin/get-data-from-old-live-server.sh diff --git a/bin/get-data-from-old-live-server.sh b/bin/get-data-from-old-live-server.sh new file mode 100755 index 0000000..445119e --- /dev/null +++ b/bin/get-data-from-old-live-server.sh @@ -0,0 +1,12 @@ +#!/bin/sh -xe + +rsync -v root@screenshots.debian.net:/home/debshots/debshots-screenshots.tar /tmp/ +rsync -v root@screenshots.debian.net:/home/debshots/debshots.sql /tmp + +set +e +psql postgres debshots -c 'drop database debshots' +set -e + +psql postgres debshots -c 'create database debshots owner debshots' +psql debshots debshots < /tmp/debshots.sql + From 7d7fe366ec0feec8f0101d5a3097a82b5127a3a7 Mon Sep 17 00:00:00 2001 From: "Haas, Christoph" Date: Wed, 21 Aug 2013 14:34:31 +0200 Subject: [PATCH 04/12] Unpacking screenshot tarball in script --- bin/get-data-from-old-live-server.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bin/get-data-from-old-live-server.sh b/bin/get-data-from-old-live-server.sh index 445119e..30b4d32 100755 --- a/bin/get-data-from-old-live-server.sh +++ b/bin/get-data-from-old-live-server.sh @@ -1,12 +1,25 @@ -#!/bin/sh -xe +#!/bin/sh -e +echo Getting screenshot files rsync -v root@screenshots.debian.net:/home/debshots/debshots-screenshots.tar /tmp/ + +echo Getting PostgreSQL dump rsync -v root@screenshots.debian.net:/home/debshots/debshots.sql /tmp +echo Dropping existing database set +e psql postgres debshots -c 'drop database debshots' set -e +echo Creating new database psql postgres debshots -c 'create database debshots owner debshots' + +echo Restoring PostgreSQL dump psql debshots debshots < /tmp/debshots.sql +echo Unpacking screenshots tarball +cd ../public +tar xf /tmp/debshots-screenshots.tar +mv public/live/screenshots/approved public/screenshots +rm -r public/live + From 0d4d55d4742be4c2e454ac9a683098cc8252b034 Mon Sep 17 00:00:00 2001 From: "Haas, Christoph" Date: Wed, 21 Aug 2013 14:35:33 +0200 Subject: [PATCH 05/12] Removing accidentally created file --- hello, rails | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 hello, rails diff --git a/hello, rails b/hello, rails deleted file mode 100644 index e69de29..0000000 From d79b3a9986c284b1b7ed4bc455673fe8876f1d48 Mon Sep 17 00:00:00 2001 From: "Haas, Christoph" Date: Wed, 21 Aug 2013 14:44:52 +0200 Subject: [PATCH 06/12] Added therubyracer dependency Unclear why this is needed. After all we are not using LESS. --- Gemfile | 2 +- Gemfile.lock | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 81c3482..ba3cc56 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.0.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby +gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 68548cb..90c73a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,6 +62,7 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + libv8 (3.11.8.17) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -95,6 +96,7 @@ GEM rake (10.1.0) rdoc (3.12.2) json (~> 1.4) + ref (1.0.5) sass (3.2.9) sass-rails (4.0.0) railties (>= 4.0.0.beta, < 5.0) @@ -113,6 +115,9 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.7) + therubyracer (0.11.4) + libv8 (~> 3.11.8.12) + ref thor (0.18.1) thread_safe (0.1.2) atomic @@ -145,5 +150,6 @@ DEPENDENCIES sass-rails (~> 4.0.0) sdoc sqlite3 + therubyracer turbolinks uglifier (>= 1.3.0) From 6ecda590d7fb6a0fc4419bda4f13ccd6e5ce24ba Mon Sep 17 00:00:00 2001 From: "Haas, Christoph" Date: Wed, 21 Aug 2013 18:11:00 +0200 Subject: [PATCH 07/12] Trying to use Bootstrap 3 Unfortunately it's not working yet. Error: File to import not found or unreadable: twitter/bootstrap --- Gemfile | 3 +- Gemfile.lock | 32 ++++++++++----------- app/assets/javascripts/application.js | 1 + app/assets/stylesheets/application.css | 16 ----------- app/assets/stylesheets/application.css.scss | 18 ++++++++++-- app/views/packages/index.html.erb | 29 +++++++++++++------ debshots.komodoproject | 4 +++ 7 files changed, 60 insertions(+), 43 deletions(-) delete mode 100644 app/assets/stylesheets/application.css create mode 100644 debshots.komodoproject diff --git a/Gemfile b/Gemfile index ba3cc56..d6f8ff8 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,8 @@ group :development do end # Twitter Bootstrap template -gem 'bootstrap-sass' +#gem 'bootstrap-sass' +gem 'anjlab-bootstrap-rails', '>= 3.0.0.0' # Pagination # Hint: rails generate kaminari:views bootstrap diff --git a/Gemfile.lock b/Gemfile.lock index 90c73a7..3a5914c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,15 +25,16 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) + anjlab-bootstrap-rails (3.0.0.1) + railties (>= 3.0) + sass (>= 3.2) arel (4.0.0) - atomic (1.1.10) + atomic (1.1.13) better_errors (0.9.0) coderay (>= 1.0.0) erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (2.3.2.1) - sass (~> 3.2) builder (3.1.4) callsite (0.0.11) coderay (1.0.9) @@ -46,13 +47,12 @@ GEM coffee-script-source (1.6.3) debug_inspector (0.0.2) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.0.0) fancybox2-rails (0.2.4) railties (>= 3.1.0) hike (1.2.3) - i18n (0.6.4) - jbuilder (1.4.2) + i18n (0.6.5) + jbuilder (1.5.0) activesupport (>= 3.0.0) multi_json (>= 1.2.0) jquery-rails (3.0.4) @@ -62,7 +62,7 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - libv8 (3.11.8.17) + libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -70,9 +70,9 @@ GEM callsite rack-contrib railties - mime-types (1.23) + mime-types (1.24) minitest (4.7.5) - multi_json (1.7.7) + multi_json (1.7.9) pg (0.16.0) polyglot (0.3.3) rack (1.5.2) @@ -97,7 +97,7 @@ GEM rdoc (3.12.2) json (~> 1.4) ref (1.0.5) - sass (3.2.9) + sass (3.2.10) sass-rails (4.0.0) railties (>= 4.0.0.beta, < 5.0) sass (>= 3.1.10) @@ -114,15 +114,15 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.7) - therubyracer (0.11.4) - libv8 (~> 3.11.8.12) + sqlite3 (1.3.8) + therubyracer (0.12.0) + libv8 (~> 3.16.14.0) ref thor (0.18.1) thread_safe (0.1.2) atomic tilt (1.4.1) - treetop (1.4.14) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) turbolinks (1.3.0) @@ -136,9 +136,9 @@ PLATFORMS ruby DEPENDENCIES + anjlab-bootstrap-rails (>= 3.0.0.0) better_errors binding_of_caller - bootstrap-sass coffee-rails (~> 4.0.0) fancybox2-rails (~> 0.2.4) jbuilder (~> 1.2) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 828d085..d5d0bc3 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,4 +14,5 @@ //= require jquery_ujs //= require fancybox //= require turbolinks +//= require twitter/bootstrap //= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index 16f277e..0000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * 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_self - *= require_tree . - *= require fancybox - */ - -//= require bootstrap diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index c4b7e51..78200e6 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,2 +1,16 @@ -@import 'bootstrap'; -@import 'bootstrap-responsive'; +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. + * + * 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_self + *= require_tree . + *= require fancybox + */ + +@import "twitter/bootstrap"; diff --git a/app/views/packages/index.html.erb b/app/views/packages/index.html.erb index 18130de..1e224c0 100644 --- a/app/views/packages/index.html.erb +++ b/app/views/packages/index.html.erb @@ -17,15 +17,28 @@ foo Show only packages with screenshots +
+
+ + + + +
+
+ +
+ + + +
+ <% end %> -
-
- - - - -
-
<%= render "packages_search_results", object: @packages %> diff --git a/debshots.komodoproject b/debshots.komodoproject new file mode 100644 index 0000000..d795922 --- /dev/null +++ b/debshots.komodoproject @@ -0,0 +1,4 @@ + + + + From 517557711fbe92955f18f021114e28ff8612d1dd Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 21 Aug 2013 19:23:52 +0200 Subject: [PATCH 08/12] Experimenting with search form --- app/views/packages/index.html.erb | 37 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/app/views/packages/index.html.erb b/app/views/packages/index.html.erb index 18130de..ebfa9d3 100644 --- a/app/views/packages/index.html.erb +++ b/app/views/packages/index.html.erb @@ -5,27 +5,26 @@ foo

Search for a package/description:

- <%= form_tag(url_for, method: "get", class: "form-search") do %> -
- <%= text_field_tag :search, params[:search], autofocus: true, placeholder: 'What are you looking for...', class: "search-query" %> - +
+ <%= form_tag(url_for, method: "get", class: "form-search") do %> +
+ <%= text_field_tag :search, params[:search], autofocus: true, placeholder: 'What are you looking for...', class: "search-query" %> + +
+ +
+ + + + +
+ + + + +
- - - - <% end %> -
-
- - - - -
-
<%= render "packages_search_results", object: @packages %>
From d6c5508fdd8355d5e50d17e5073fa13f1ad4c8e0 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 21 Aug 2013 22:56:22 +0200 Subject: [PATCH 09/12] Fixed use of default scope for Rails 4.x --- app/models/package.rb | 2 +- app/models/screenshot.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/package.rb b/app/models/package.rb index d1ac5fc..9aa97cc 100644 --- a/app/models/package.rb +++ b/app/models/package.rb @@ -16,7 +16,7 @@ class Package < ActiveRecord::Base to_tsvector('english', packages.description) @@ plainto_tsquery(:q) ", q: query).order("#{rank} desc") else - scoped + all end end end diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index 79ffb5f..a0618d3 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -1,6 +1,8 @@ class Screenshot < ActiveRecord::Base belongs_to :package, :inverse_of=>:screenshots - default_scope order('uploaddatetime DESC') + default_scope { + order('uploaddatetime DESC') + } def image_url(size) "/screenshots/#{self.package.name[0]}/#{self.package.name}/#{self.id}_#{size}.png" From 660e494a204fd9547f65d5b2a69fce7fb7c51e47 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 21 Aug 2013 22:56:36 +0200 Subject: [PATCH 10/12] Fixed navbar using Bootstrap 3.x style --- app/views/packages/index.html.erb | 53 +++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/app/views/packages/index.html.erb b/app/views/packages/index.html.erb index 0c2da4c..133c86a 100644 --- a/app/views/packages/index.html.erb +++ b/app/views/packages/index.html.erb @@ -1,6 +1,53 @@ - +
+ + + + + + +

Search for a package/description:

From 0ad7b6400ab4945b0474632f2f00c957085177d3 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 21 Aug 2013 22:56:46 +0200 Subject: [PATCH 11/12] Fixed usage of Bootstrap 3.0 --- Gemfile | 5 +++-- Gemfile.lock | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index d6f8ff8..cfd940f 100644 --- a/Gemfile +++ b/Gemfile @@ -57,8 +57,9 @@ end # Twitter Bootstrap template #gem 'bootstrap-sass' -gem 'anjlab-bootstrap-rails', '>= 3.0.0.0' - +#gem 'anjlab-bootstrap-rails', '>= 3.0.0.0' +gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails', + :github => 'anjlab/bootstrap-rails' # Pagination # Hint: rails generate kaminari:views bootstrap gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index 3a5914c..f9b189f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: git://github.com/anjlab/bootstrap-rails.git + revision: 056c63f1128a255688da1d064c5a2854ab5c8a9a + specs: + anjlab-bootstrap-rails (3.0.0.1) + railties (>= 3.0) + sass (>= 3.2) + GEM remote: https://rubygems.org/ specs: @@ -25,9 +33,6 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - anjlab-bootstrap-rails (3.0.0.1) - railties (>= 3.0) - sass (>= 3.2) arel (4.0.0) atomic (1.1.13) better_errors (0.9.0) @@ -136,7 +141,7 @@ PLATFORMS ruby DEPENDENCIES - anjlab-bootstrap-rails (>= 3.0.0.0) + anjlab-bootstrap-rails! better_errors binding_of_caller coffee-rails (~> 4.0.0) From a0ba7bdf18805c759ce9b1dc00f30d1926808e88 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 21 Aug 2013 23:02:15 +0200 Subject: [PATCH 12/12] Fixed kaminari pagination style for Bootstrap 3.0 --- app/views/kaminari/_paginator.html.erb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb index 03d508e..e06a967 100644 --- a/app/views/kaminari/_paginator.html.erb +++ b/app/views/kaminari/_paginator.html.erb @@ -1,6 +1,5 @@ <%= paginator.render do -%> - + <% end -%>