Merge pull request #96 from farend/support-redmine6

Support redmine6

README.ja.md

@@ -50,12 +50,12 @@ $ git clone -b redmine4.2 https://github.com/farend/redmine_theme_farend_bleucla
 
 - Redmine5.0.n、Redmine5.1.nの場合
 ```bash
-$ git clone https://github.com/farend/redmine_theme_farend_bleuclair.git public/themes/bleuclair
+$ git clone -b redmine5.1 https://github.com/farend/redmine_theme_farend_bleuclair.git public/themes/bleuclair
 ```
 
-- RedMica 3.0、Redmine trunkの場合 ※ インストールディレクトリが変わります
+- Redmine6以降、Redmine trunkの場合 ※ インストールディレクトリが変わります
 ```bash
-$ git clone -b support-propshaft https://github.com/farend/redmine_theme_farend_bleuclair.git themes/bleuclair
+$ git clone https://github.com/farend/redmine_theme_farend_bleuclair.git themes/bleuclair
 ```
 
 **Gitが利用できない環境の場合:**

README.md

@@ -51,12 +51,12 @@ $ git clone -b redmine4.2 https://github.com/farend/redmine_theme_farend_bleucla
 
 - For Redmine 5.0, Redmine 5.1
 ```bash
-$ git clone https://github.com/farend/redmine_theme_farend_bleuclair.git public/themes/bleuclair
+$ git clone -b redmine5.1 https://github.com/farend/redmine_theme_farend_bleuclair.git public/themes/bleuclair
 ```
 
-- For RedMica 3.0, Redmine trunk
+- For RedMica 6.0, Redmine trunk
 ```bash
-$ git clone -b support-propshaft https://github.com/farend/redmine_theme_farend_bleuclair.git themes/bleuclair
+$ git clone https://github.com/farend/redmine_theme_farend_bleuclair.git themes/bleuclair
 ```
 
 **In an environment where Git is not available:**

src/scripts/bleuclair.js

@@ -38,91 +38,3 @@ $(function(){
     });
   });
 });
-
-// Function based on https://www.redmine.org/issues/21808#note-27 patch.
-// collapsible sidebar jQuery plugin
-(function($) {
-  // main container this is applied to
-  var main;
-  // triggers show/hide
-  var button;
-  // the key to use in local storage
-  // this will later be expanded using the current controller and action to
-  // allow for different sidebar states for different pages
-  var localStorageKey;
-  // true if local storage is available
-  var canUseLocalStorage = function(){
-    try {
-      if('localStorage' in window){
-        localStorage.setItem('redmine.test.storage', 'ok');
-        var item = localStorage.getItem('redmine.test.storage');
-        localStorage.removeItem('redmine.test.storage');
-        if(item === 'ok') return true;
-      }
-    } catch (err) {}
-    return false;
-  }();
-  // function to set current sidebar state
-  var setState = function(state){
-    if(canUseLocalStorage){
-      localStorage.setItem(localStorageKey, state);
-    }
-  };
-  var applyState = function(){
-    if(main.hasClass('visible-sidebar')){
-      setState('visible');
-    } else {
-      setState('hidden');
-    }
-  };
-  var setupToggleButton = function(){
-    button = $('#sidebar-switch-button');
-    button.click(function(e){
-      main.addClass("animate");
-      main.toggleClass('visible-sidebar');
-      applyState();
-      e.preventDefault();
-      return false;
-    });
-    applyState();
-  };
-  $.fn.collapsibleSidebar = function() {
-    main = this;
-    // determine previously stored sidebar state for this page
-    if(canUseLocalStorage) {
-      // determine current controller/action pair and use them as storage key
-      var bodyClass = $('body').attr('class');
-      if(bodyClass){
-        try {
-          localStorageKey = 'redmine-sidebar-state-' + bodyClass.split(/\s+/).filter(function(s){
-            return s.match(/(action|controller)-.*/);
-          }).sort().join('-');
-        } catch(e) {
-          // in case of error (probably IE8), continue with the default key.
-          localStorageKey = 'redmine-sidebar-state';
-        }
-      }
-      var storedState = localStorage.getItem(localStorageKey);
-      main.toggleClass('visible-sidebar', (storedState === 'visible' || !storedState));
-    } else {
-      main.toggleClass('visible-sidebar', true);
-    }
-    // draw the toggle button once the DOM is complete
-    $(document).ready(setupToggleButton);
-  };
-}(jQuery));
-
-window.addEventListener('DOMContentLoaded', function () {
-  if (!$('#main').hasClass('nosidebar')) {
-    if ($('#sidebar-switch-panel').length == 0) {
-      $('#content').prepend('<div id="sidebar-switch-panel"><a id="sidebar-switch-button" href="#"></a></div>');
-    }
-    try {
-      $('#main').collapsibleSidebar();
-    } catch(e) {
-      $('#main').toggleClass('visible-sidebar', true);
-      $('div#sidebar-switch-panel').remove();
-      console.error(e);
-    }
-  }
-});

src/styles/bleuclair.scss

@@ -1,4 +1,3 @@
-@import 'foundation/mixins';
 @import 'foundation/variables';
 
 @import 'components/scaffolding';
@@ -19,6 +18,3 @@
 @import 'components/documents';
 @import 'components/repositories';
 @import 'components/activities';
-@import 'components/gantts';
-@import 'components/icon';
-@import 'components/jstoolbar';