Fix clipped header text in request listing

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: handlingarse # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: handlingar # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -4,7 +4,10 @@
 /sqlitedbs
 /cache
 /old-cache
+/.vscode
 .*.swp
 *~
 *#*#
 TAGS
+*.sw[a-z]
+*DONT-CHECKIN*

Makefile

@@ -0,0 +1,34 @@
+
+
+DIFF_FILE_HSE = general/_before_body_end.html.erb
+DIFF_FILE_HSE = general/_before_head_end.html.erb
+DIFF_FILE_HSE = general/_credits.html.erb
+DIFF_FILE_HSE = general/_credits.sv.html.erb
+DIFF_FILE_HSE = general/_orglink.html.erb
+DIFF_FILE_HSE = general/_popup_banner.html.erb
+DIFF_FILE_HSE = general/exception_caught.html.erb
+DIFF_FILE_HSE = general/mycontroller.html.erb
+
+
+DIFF_FILE_HSE = help/_sidebar.html.erb
+DIFF_FILE_HSE = help/_why_they_should_reply_by_email.html.erb
+DIFF_FILE_HSE = help/about.html.erb
+DIFF_FILE_HSE = help/alaveteli.html.erb
+DIFF_FILE_HSE = help/api.html.erb
+DIFF_FILE_HSE = help/contact.html.erb
+DIFF_FILE_HSE = help/credits.html.erb
+DIFF_FILE_HSE = help/officers.html.erb
+DIFF_FILE_HSE = help/privacy.html.erb
+DIFF_FILE_HSE = help/pro.html.erb
+DIFF_FILE_HSE = help/requesting.html.erb
+DIFF_FILE_HSE = help/unhappy.html.erb
+
+
+diff-theme:
+	#git diff --no-index -w ./lib/views/$(DIFF_FILE_HSE) ../alaveteli/app/views/$(DIFF_FILE_HSE)
+	git diff --no-index ./lib/views/$(DIFF_FILE_HSE) ../alavetelitheme/lib/views/$(DIFF_FILE_HSE)
+
+
+copy-a:
+	 cp ../alaveteli/app/views/$(DIFF_FILE_HSE) ./lib/views/$(DIFF_FILE_HSE)
+

README.md

@@ -1,3 +1,23 @@
+Handlingar Theme
+==============
+
+Create pull request from [alavetelitheme master branch](https://github.com/mysociety/alavetelitheme/tree/master) to our [dev](https://github.com/handlingar/handlingar-theme/tree/dev) branch.
+
+Then do your suggested changes and pushed into [dev](https://github.com/handlingar/handlingar-theme/tree/dev) branch.
+
+Test these changes on the development server.
+
+If everything from [dev](https://github.com/handlingar/handlingar-theme/tree/dev) branch works correctly on development server we then do a Pull Request (PR) to [main](https://github.com/handlingar/handlingar-theme/tree/main) branch.
+
+Then we push [main](https://github.com/handlingar/handlingar-theme/tree/main) branch to production server.
+
+### Deploy updates on development server or production server
+Use the following instructions to deploy changes that have been made. See this [link](https://gitlab.com/handlingar/handlingar/-/wikis/Uppdatera-tema) from Handlingar Wiki.
+
+Read more about project work order at: [Handlingar Wiki](https://gitlab.com/handlingar/handlingar/-/wikis/)
+
+This theme is based on Alavetelitheme example theme. Read more below.
+
 Alavetelitheme
 ==============
 

app/assets/stylesheets/responsive/_settings.scss

@@ -11,8 +11,8 @@ $logo-height: 44px;
 
 $color_sand: #f3f1eb;
 $color_black: #333333;
-$color_orange: #f4a140;
-$color_blue: #4faded;
+$color_orange: #E6722A;
+$color_blue: #100467;
 $color_green: #62b356;
 $color_yellow: #ffd836;
 $color_red: #e04b4b;
@@ -26,10 +26,11 @@ $color_dark_grey: #6c6b68;
 
 $color_neutral_light: $color_sand;
 $color_neutral_dark: $color_black;
-$color_primary: $color_violet;
-$color_secondary: $color_orange;
+$color_primary: $color_orange;
+$color_secondary: $color_dark_grey;
 
 $body-bg: $color_neutral_light;
+$topnav_bg: #E6722A;
 
 $body-font-color: $color_neutral_dark;
 $link-color: darken($color_blue, 20%);
@@ -49,5 +50,4 @@ $notice-color: $color_green;
 $error-color: $color_red;
 $action-color: $color_orange;
 
-$banner_inner_bg: $color_primary;
-$topnav_bg: darken($color_primary, 10%);
+$banner_inner_bg: $color_orange;

app/assets/stylesheets/responsive/custom.scss

@@ -11,9 +11,9 @@
 /* General styling of nav menu items */
 %menu-item {
   text-decoration: none;
-  color: transparentize($color_white, 0.2);
+  color: transparentize($color_blue, 0.2);
   @include ie8 {
-    color: $color_white;
+    color: $color_blue;
   }
   transition: background-color 0.5s ease-out;
   &:hover,
@@ -28,8 +28,8 @@
 /* Selected menu item */
 %selected-menu-item {
   font-weight: bold;
-  color: $color_primary;
-  background-color: $color_neutral_light;
+  color: $color_primary #100467;
+  background-color: $color_neutral_light #E6722A;
   &:hover,
   &:active,
   &:focus {
@@ -535,7 +535,7 @@ p.locale-list-trigger {
       border: 0;
       padding: 0;
     }
-  } 
+  }
 
 
 #banner {
@@ -715,6 +715,13 @@ a.link_to_this {
   */
 }
 
+/* Layout for lists of requests, authorities, users */
+.request_listing,.body_listing,.user_listing {
+  .head {
+    line-height: 1.7em;
+  }
+}
+
 /* Status lines and icons */
 .icon_waiting_classification,
 .icon_waiting_response,
@@ -895,20 +902,19 @@ dt {
     background-image: image-url('homepage-background.jpg');
   }
 
-  a {
-    color: $color_secondary;
-    &:hover,
-    &:active,
-    &:focus {
+  a, a:hover, a:active, a:focus {
       color: $color_white;
-    }
   }
 
   .intro__title {
     color: $color_white;
     text-shadow: 0 1px 2px transparentize($color_black, 0.7);
   }
 
+  .intro__browse a {
+    color: $color_white;
+  }
+
   .new-request__content {
     background-color: $color_neutral_dark;
     border-radius: 5px;
@@ -929,12 +935,12 @@ dt {
   }
   .new-request__make-new-requests {
     @include button-base;
-    background-color: desaturate(darken($color_secondary, 10%), 5%);
+    background-color: desaturate(darken($color_primary, 10%), 5%);
     color: $color_white;
     &:hover,
     &:active,
     &:focus {
-      background-color: darken($color_secondary, 20%);
+      background-color: darken($color_primary, 20%);
     }
   }
 }

lib/alavetelitheme.rb

@@ -68,9 +68,11 @@ def prepend_theme_assets
 # Tell FastGettext about the theme's translations: look in the theme's
 # locale-theme directory for a translation in the first place, and if
 # it isn't found, look in the Alaveteli locale directory next:
-repos = [
-  FastGettext::TranslationRepository.build('app', :path=>File.join(File.dirname(__FILE__), '..', 'locale-theme'), :type => :po),
-  FastGettext::TranslationRepository.build('app', :path=>'locale', :type => :po)
-]
-FastGettext.add_text_domain 'app', :type=>:chain, :chain=>repos
-FastGettext.default_text_domain = 'app'
+paths = []
+paths << File.join(File.dirname(__FILE__), '..', 'locale-theme')
+paths << 'locale_alaveteli_pro' if AlaveteliConfiguration::enable_alaveteli_pro
+paths << 'locale'
+repos = paths.map do |path|
+  FastGettext::TranslationRepository.build('app', :path => path, :type => :po)
+end
+AlaveteliLocalization.set_default_text_domain('app', repos)

lib/config/custom-routes.rb

@@ -2,8 +2,8 @@
 # Here you can override or add to the pages in the core website
 
 Rails.application.routes.draw do
-  # brand new controller example
-  # get '/mycontroller' => 'general#mycontroller'
-  # Additional help page example
-  # get '/help/help_out' => 'help#help_out'
+# brand new controller for terms of use
+
+  get '/help/terms' => 'help#terms', :as => 'help_terms'
+
 end

lib/config/user_spam_scorer.rb

@@ -0,0 +1,78 @@
+# The DEFAULT_* values defined in lib/user_spam_scorer.rb will still apply
+# unless you override their key in this optional file.
+#
+# Unfortunately at this time you can't override the regular expressions defined
+# for DEFAULT_SPAM_NAME_FORMAT or DEFAULT_SPAM_ABOUT_ME_FORMAT.
+
+user_spam_scorer:
+  currency_symbols:
+    - £
+    - $
+    - €
+    - ¥
+    - ¢
+  suspicious_domains:
+    - mail.ru
+    - temp-mail.de
+    - tempmail.de
+    - shitmail.de
+    - yopmail.com
+    - yandex.com
+  spam_domains:
+    - 7x.cz
+    - allemaling.com
+    - bk.ru
+    - brmailing.com
+    - businessmailsystem.com
+    - checknowmail.com
+    - colde-mail.com
+    - consimail.com
+    - continumail.com
+    - contumail.com
+    - emailber.com
+    - grow-mail.com
+    - inbox.ru
+    - inemaling.com
+    - inmailing.com
+    - itemailing.com
+    - itmailing.com
+    - kod-emailing.com
+    - kod-maling.com
+    - kodemailing.com
+    - kodmailing.com
+    - left-mail.com
+    - list.ru
+    - mabermail.com
+    - mailphar.com
+    - out-email.com
+    - semi-mile.com
+    - sin-mailing.com
+    - sinemailing.com
+    - sinmailing.com
+    - takmailing.com
+    - themailemail.com
+    - visitinbox.com
+    - webgarden.com
+    - webgarden.cz
+    - wgz.cz
+    - wowmailing.com
+  suspicious_user_agents:
+    - curl
+  suspicious_ip_ranges:
+    - 127.0.0.0/8
+  spam_name_formats:
+    - !ruby/regexp '/\A.*bitcoin.*\z/i'
+    - !ruby/regexp '/\A.*currency.*\z/i'
+    - !ruby/regexp '/\A.*support.*\z/i'
+    - !ruby/regexp '/\A.*customer.*service.*\z/i'
+    - !ruby/regexp '/\A.*customer.*care.*\z/i'
+    - !ruby/regexp '/\A.*buy.*online.*\z/i'
+    - !ruby/regexp '/\A.*real.*estate.*\z/i'
+    - !ruby/regexp '/\A.*web.*design.*\z/i'
+    - !ruby/regexp '/\A.*Mac\sDesktop.*\z/i'
+    - !ruby/regexp '/\A.*Inc\z/'
+    - !ruby/regexp '/\A.*LLC\z/'
+    - !ruby/regexp '/\A.*spyware.*\z/i'
+    - !ruby/regexp '/\A.*malware.*\z/i'
+    - !ruby/regexp '/\A.*CRM.*\z/'
+    - !ruby/regexp '/.*(http|https):\/\/.*/i'

lib/controller_patches.rb

@@ -6,6 +6,10 @@
 # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode
 #
 Rails.configuration.to_prepare do
+  HelpController.class_eval do
+    def terms; end
+  end
+end
   # Example adding an instance variable to the frontpage controller
   # GeneralController.class_eval do
   #   def mycontroller
@@ -17,4 +21,10 @@
   #   def help_out
   #   end
   # end
-end
+  # Rails.application.routes.draw do
+  # brand new controller example
+  # get '/mycontroller' => 'general#mycontroller'
+  # Additional help page example
+  # get '/help/terms' => 'help#terms'
+  # end
+# end

lib/views/alaveteli_pro/info_requests/_new_request_advice.html.erb

@@ -0,0 +1 @@
+

lib/views/alaveteli_pro/info_requests/_new_request_advice.sv.html.erb

@@ -0,0 +1 @@
+

lib/views/alaveteli_pro/pages/_legal.html.erb

@@ -0,0 +1,11 @@
+<section id="introduction">
+  <h2>
+    Introduction
+  </h2>
+
+  <p>
+   Handlingar.se does not have terms and conditions in English at the moment. Contact the Handlingar-team for more information.
+  </p>
+
+
+</section>