From 87e655857972435ab48c125c3b8a211eedccf504 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgnerf@ub.uni-leipzig.de>
Date: Fri, 16 Feb 2018 08:57:05 +0100
Subject: [PATCH] refs #12415 * rename instance structure in fid_adlr instead
of adlr_link * rename foundation artefact default.scss in compiled.scss
---
.../alpha/config/vufind/HierarchyDefault.ini | 0
{adlr_link => fid_adlr}/alpha/config/vufind/NoILS.ini | 0
{adlr_link => fid_adlr}/alpha/config/vufind/SolrAI.ini | 0
{adlr_link => fid_adlr}/alpha/config/vufind/config.ini | 2 +-
{adlr_link => fid_adlr}/alpha/config/vufind/facets.ini | 0
.../alpha/config/vufind/searches.ini | 0
.../alpha/config/vufind/searchspecs.yaml | 0
{adlr_link => fid_adlr}/alpha/languages/de.ini | 0
{adlr_link => fid_adlr}/alpha/languages/en.ini | 0
{adlr_link => fid_adlr}/config/vufind/Collection.ini | 0
.../config/vufind/HierarchyDefault.ini | 0
{adlr_link => fid_adlr}/config/vufind/NoILS.ini | 0
{adlr_link => fid_adlr}/config/vufind/README.txt | 0
{adlr_link => fid_adlr}/config/vufind/SolrAI.ini | 0
{adlr_link => fid_adlr}/config/vufind/config.ini | 2 +-
{adlr_link => fid_adlr}/config/vufind/facets.ini | 0
{adlr_link => fid_adlr}/config/vufind/searches.ini | 0
{adlr_link => fid_adlr}/config/vufind/searchspecs.yaml | 0
{adlr_link => fid_adlr}/dev/.gitignore | 0
.../dev/config/vufind/Collection.ini.sample | 0
.../dev/config/vufind/HierarchyDefault.ini.sample | 0
.../dev/config/vufind/NoILS.ini.sample | 0
.../dev/config/vufind/SolrAI.ini.sample | 0
.../dev/config/vufind/config.ini.sample | 0
.../dev/config/vufind/facets.ini.sample | 0
.../dev/config/vufind/searches.ini.sample | 0
.../dev/config/vufind/searchspecs.yaml.sample | 0
{adlr_link => fid_adlr}/dev/httpd-vufind.conf.sample | 10 +++++++++-
{adlr_link => fid_adlr}/dev/languages/de.ini | 0
{adlr_link => fid_adlr}/dev/languages/en.ini | 0
{adlr_link => fid_adlr}/languages/de.ini | 0
{adlr_link => fid_adlr}/languages/en.ini | 0
themes/adlr_link/css/.gitignore | 1 -
themes/fid_adlr/css/.gitignore | 1 +
.../scss/default.scss => fid_adlr/scss/compiled.scss} | 10 +---------
themes/{adlr_link => fid_adlr}/templates/header.phtml | 0
themes/{adlr_link => fid_adlr}/theme.config.php | 4 ++--
37 files changed, 15 insertions(+), 15 deletions(-)
rename {adlr_link => fid_adlr}/alpha/config/vufind/HierarchyDefault.ini (100%)
rename {adlr_link => fid_adlr}/alpha/config/vufind/NoILS.ini (100%)
rename {adlr_link => fid_adlr}/alpha/config/vufind/SolrAI.ini (100%)
rename {adlr_link => fid_adlr}/alpha/config/vufind/config.ini (96%)
rename {adlr_link => fid_adlr}/alpha/config/vufind/facets.ini (100%)
rename {adlr_link => fid_adlr}/alpha/config/vufind/searches.ini (100%)
rename {adlr_link => fid_adlr}/alpha/config/vufind/searchspecs.yaml (100%)
rename {adlr_link => fid_adlr}/alpha/languages/de.ini (100%)
rename {adlr_link => fid_adlr}/alpha/languages/en.ini (100%)
rename {adlr_link => fid_adlr}/config/vufind/Collection.ini (100%)
rename {adlr_link => fid_adlr}/config/vufind/HierarchyDefault.ini (100%)
rename {adlr_link => fid_adlr}/config/vufind/NoILS.ini (100%)
rename {adlr_link => fid_adlr}/config/vufind/README.txt (100%)
rename {adlr_link => fid_adlr}/config/vufind/SolrAI.ini (100%)
rename {adlr_link => fid_adlr}/config/vufind/config.ini (98%)
rename {adlr_link => fid_adlr}/config/vufind/facets.ini (100%)
rename {adlr_link => fid_adlr}/config/vufind/searches.ini (100%)
rename {adlr_link => fid_adlr}/config/vufind/searchspecs.yaml (100%)
rename {adlr_link => fid_adlr}/dev/.gitignore (100%)
rename {adlr_link => fid_adlr}/dev/config/vufind/Collection.ini.sample (100%)
rename {adlr_link => fid_adlr}/dev/config/vufind/HierarchyDefault.ini.sample (100%)
rename {adlr_link => fid_adlr}/dev/config/vufind/NoILS.ini.sample (100%)
rename {adlr_link => fid_adlr}/dev/config/vufind/SolrAI.ini.sample (100%)
rename {adlr_link => fid_adlr}/dev/config/vufind/config.ini.sample (100%)
rename {adlr_link => fid_adlr}/dev/config/vufind/facets.ini.sample (100%)
rename {adlr_link => fid_adlr}/dev/config/vufind/searches.ini.sample (100%)
rename {adlr_link => fid_adlr}/dev/config/vufind/searchspecs.yaml.sample (100%)
rename {adlr_link => fid_adlr}/dev/httpd-vufind.conf.sample (81%)
rename {adlr_link => fid_adlr}/dev/languages/de.ini (100%)
rename {adlr_link => fid_adlr}/dev/languages/en.ini (100%)
rename {adlr_link => fid_adlr}/languages/de.ini (100%)
rename {adlr_link => fid_adlr}/languages/en.ini (100%)
delete mode 100644 themes/adlr_link/css/.gitignore
create mode 100644 themes/fid_adlr/css/.gitignore
rename themes/{adlr_link/scss/default.scss => fid_adlr/scss/compiled.scss} (89%)
rename themes/{adlr_link => fid_adlr}/templates/header.phtml (100%)
rename themes/{adlr_link => fid_adlr}/theme.config.php (65%)
diff --git a/adlr_link/alpha/config/vufind/HierarchyDefault.ini b/fid_adlr/alpha/config/vufind/HierarchyDefault.ini
similarity index 100%
rename from adlr_link/alpha/config/vufind/HierarchyDefault.ini
rename to fid_adlr/alpha/config/vufind/HierarchyDefault.ini
diff --git a/adlr_link/alpha/config/vufind/NoILS.ini b/fid_adlr/alpha/config/vufind/NoILS.ini
similarity index 100%
rename from adlr_link/alpha/config/vufind/NoILS.ini
rename to fid_adlr/alpha/config/vufind/NoILS.ini
diff --git a/adlr_link/alpha/config/vufind/SolrAI.ini b/fid_adlr/alpha/config/vufind/SolrAI.ini
similarity index 100%
rename from adlr_link/alpha/config/vufind/SolrAI.ini
rename to fid_adlr/alpha/config/vufind/SolrAI.ini
diff --git a/adlr_link/alpha/config/vufind/config.ini b/fid_adlr/alpha/config/vufind/config.ini
similarity index 96%
rename from adlr_link/alpha/config/vufind/config.ini
rename to fid_adlr/alpha/config/vufind/config.ini
index 5828ec16d4e..76316a7af7e 100644
--- a/adlr_link/alpha/config/vufind/config.ini
+++ b/fid_adlr/alpha/config/vufind/config.ini
@@ -33,7 +33,7 @@ url = http://172.18.85.142:8085/solr
;url = http://139.18.19.239:8080/solr
[Site]
-url = "https://alpha.finc.info/vufind2/adlr_link"
+url = "https://alpha.finc.info/vufind2/fid_adlr"
[Authentication]
hash_passwords = "1"
diff --git a/adlr_link/alpha/config/vufind/facets.ini b/fid_adlr/alpha/config/vufind/facets.ini
similarity index 100%
rename from adlr_link/alpha/config/vufind/facets.ini
rename to fid_adlr/alpha/config/vufind/facets.ini
diff --git a/adlr_link/alpha/config/vufind/searches.ini b/fid_adlr/alpha/config/vufind/searches.ini
similarity index 100%
rename from adlr_link/alpha/config/vufind/searches.ini
rename to fid_adlr/alpha/config/vufind/searches.ini
diff --git a/adlr_link/alpha/config/vufind/searchspecs.yaml b/fid_adlr/alpha/config/vufind/searchspecs.yaml
similarity index 100%
rename from adlr_link/alpha/config/vufind/searchspecs.yaml
rename to fid_adlr/alpha/config/vufind/searchspecs.yaml
diff --git a/adlr_link/alpha/languages/de.ini b/fid_adlr/alpha/languages/de.ini
similarity index 100%
rename from adlr_link/alpha/languages/de.ini
rename to fid_adlr/alpha/languages/de.ini
diff --git a/adlr_link/alpha/languages/en.ini b/fid_adlr/alpha/languages/en.ini
similarity index 100%
rename from adlr_link/alpha/languages/en.ini
rename to fid_adlr/alpha/languages/en.ini
diff --git a/adlr_link/config/vufind/Collection.ini b/fid_adlr/config/vufind/Collection.ini
similarity index 100%
rename from adlr_link/config/vufind/Collection.ini
rename to fid_adlr/config/vufind/Collection.ini
diff --git a/adlr_link/config/vufind/HierarchyDefault.ini b/fid_adlr/config/vufind/HierarchyDefault.ini
similarity index 100%
rename from adlr_link/config/vufind/HierarchyDefault.ini
rename to fid_adlr/config/vufind/HierarchyDefault.ini
diff --git a/adlr_link/config/vufind/NoILS.ini b/fid_adlr/config/vufind/NoILS.ini
similarity index 100%
rename from adlr_link/config/vufind/NoILS.ini
rename to fid_adlr/config/vufind/NoILS.ini
diff --git a/adlr_link/config/vufind/README.txt b/fid_adlr/config/vufind/README.txt
similarity index 100%
rename from adlr_link/config/vufind/README.txt
rename to fid_adlr/config/vufind/README.txt
diff --git a/adlr_link/config/vufind/SolrAI.ini b/fid_adlr/config/vufind/SolrAI.ini
similarity index 100%
rename from adlr_link/config/vufind/SolrAI.ini
rename to fid_adlr/config/vufind/SolrAI.ini
diff --git a/adlr_link/config/vufind/config.ini b/fid_adlr/config/vufind/config.ini
similarity index 98%
rename from adlr_link/config/vufind/config.ini
rename to fid_adlr/config/vufind/config.ini
index f0f06792be6..2a99cb6eacb 100644
--- a/adlr_link/config/vufind/config.ini
+++ b/fid_adlr/config/vufind/config.ini
@@ -22,8 +22,8 @@ relative_path = ../../../local/config/vufind/config.ini
;####################################################################
[Site]
-theme = "adlr_link"
title = "adlr.link - Literatur für Kommunikations- und Medienwissenschaftler"
+theme = "fid_adlr"
[Catalog]
driver = NoILS
diff --git a/adlr_link/config/vufind/facets.ini b/fid_adlr/config/vufind/facets.ini
similarity index 100%
rename from adlr_link/config/vufind/facets.ini
rename to fid_adlr/config/vufind/facets.ini
diff --git a/adlr_link/config/vufind/searches.ini b/fid_adlr/config/vufind/searches.ini
similarity index 100%
rename from adlr_link/config/vufind/searches.ini
rename to fid_adlr/config/vufind/searches.ini
diff --git a/adlr_link/config/vufind/searchspecs.yaml b/fid_adlr/config/vufind/searchspecs.yaml
similarity index 100%
rename from adlr_link/config/vufind/searchspecs.yaml
rename to fid_adlr/config/vufind/searchspecs.yaml
diff --git a/adlr_link/dev/.gitignore b/fid_adlr/dev/.gitignore
similarity index 100%
rename from adlr_link/dev/.gitignore
rename to fid_adlr/dev/.gitignore
diff --git a/adlr_link/dev/config/vufind/Collection.ini.sample b/fid_adlr/dev/config/vufind/Collection.ini.sample
similarity index 100%
rename from adlr_link/dev/config/vufind/Collection.ini.sample
rename to fid_adlr/dev/config/vufind/Collection.ini.sample
diff --git a/adlr_link/dev/config/vufind/HierarchyDefault.ini.sample b/fid_adlr/dev/config/vufind/HierarchyDefault.ini.sample
similarity index 100%
rename from adlr_link/dev/config/vufind/HierarchyDefault.ini.sample
rename to fid_adlr/dev/config/vufind/HierarchyDefault.ini.sample
diff --git a/adlr_link/dev/config/vufind/NoILS.ini.sample b/fid_adlr/dev/config/vufind/NoILS.ini.sample
similarity index 100%
rename from adlr_link/dev/config/vufind/NoILS.ini.sample
rename to fid_adlr/dev/config/vufind/NoILS.ini.sample
diff --git a/adlr_link/dev/config/vufind/SolrAI.ini.sample b/fid_adlr/dev/config/vufind/SolrAI.ini.sample
similarity index 100%
rename from adlr_link/dev/config/vufind/SolrAI.ini.sample
rename to fid_adlr/dev/config/vufind/SolrAI.ini.sample
diff --git a/adlr_link/dev/config/vufind/config.ini.sample b/fid_adlr/dev/config/vufind/config.ini.sample
similarity index 100%
rename from adlr_link/dev/config/vufind/config.ini.sample
rename to fid_adlr/dev/config/vufind/config.ini.sample
diff --git a/adlr_link/dev/config/vufind/facets.ini.sample b/fid_adlr/dev/config/vufind/facets.ini.sample
similarity index 100%
rename from adlr_link/dev/config/vufind/facets.ini.sample
rename to fid_adlr/dev/config/vufind/facets.ini.sample
diff --git a/adlr_link/dev/config/vufind/searches.ini.sample b/fid_adlr/dev/config/vufind/searches.ini.sample
similarity index 100%
rename from adlr_link/dev/config/vufind/searches.ini.sample
rename to fid_adlr/dev/config/vufind/searches.ini.sample
diff --git a/adlr_link/dev/config/vufind/searchspecs.yaml.sample b/fid_adlr/dev/config/vufind/searchspecs.yaml.sample
similarity index 100%
rename from adlr_link/dev/config/vufind/searchspecs.yaml.sample
rename to fid_adlr/dev/config/vufind/searchspecs.yaml.sample
diff --git a/adlr_link/dev/httpd-vufind.conf.sample b/fid_adlr/dev/httpd-vufind.conf.sample
similarity index 81%
rename from adlr_link/dev/httpd-vufind.conf.sample
rename to fid_adlr/dev/httpd-vufind.conf.sample
index ab8f591cbdd..07c06e16db2 100644
--- a/adlr_link/dev/httpd-vufind.conf.sample
+++ b/fid_adlr/dev/httpd-vufind.conf.sample
@@ -51,9 +51,17 @@ Alias / /usr/local/vufind2/public/
# path. See http://vufind.org/jira/browse/VUFIND-419 for more details.
#SetEnv VUFIND_PROFILER_XHPROF http://url/to/your/xhprof/web/interface
+ # This line can be used to force caching in a specific location other than the
+ # default location inside the local settings directory.
+ # Do not share this directory between multiple instances of VuFind or you may
+ # encounter unexpected side effects -- while this directory may be outside of the
+ # local settings directory, there should be exactly one separate cache location per
+ # local settings directory.
+ SetEnv VUFIND_CACHE_DIR /home/morgner/projects/vufind4/fid_adlr/cache
+
# This line points to the local override directory where you should place your customized files
# to override VuFind core features/settings. Set to blank string ("") to disable.
- SetEnv VUFIND_LOCAL_DIR /usr/local/vufind2/adlr_link/dev
+ SetEnv VUFIND_LOCAL_DIR /usr/local/vufind2/fid_adlr/dev
# This line specifies additional Zend Framework 2 modules to load after the standard VuFind module.
# Multiple modules may be specified separated by commas. This mechanism can be used to override
diff --git a/adlr_link/dev/languages/de.ini b/fid_adlr/dev/languages/de.ini
similarity index 100%
rename from adlr_link/dev/languages/de.ini
rename to fid_adlr/dev/languages/de.ini
diff --git a/adlr_link/dev/languages/en.ini b/fid_adlr/dev/languages/en.ini
similarity index 100%
rename from adlr_link/dev/languages/en.ini
rename to fid_adlr/dev/languages/en.ini
diff --git a/adlr_link/languages/de.ini b/fid_adlr/languages/de.ini
similarity index 100%
rename from adlr_link/languages/de.ini
rename to fid_adlr/languages/de.ini
diff --git a/adlr_link/languages/en.ini b/fid_adlr/languages/en.ini
similarity index 100%
rename from adlr_link/languages/en.ini
rename to fid_adlr/languages/en.ini
diff --git a/themes/adlr_link/css/.gitignore b/themes/adlr_link/css/.gitignore
deleted file mode 100644
index 3eb503bbb32..00000000000
--- a/themes/adlr_link/css/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-default.css
\ No newline at end of file
diff --git a/themes/fid_adlr/css/.gitignore b/themes/fid_adlr/css/.gitignore
new file mode 100644
index 00000000000..ecd34d2f94d
--- /dev/null
+++ b/themes/fid_adlr/css/.gitignore
@@ -0,0 +1 @@
+compiled.css
\ No newline at end of file
diff --git a/themes/adlr_link/scss/default.scss b/themes/fid_adlr/scss/compiled.scss
similarity index 89%
rename from themes/adlr_link/scss/default.scss
rename to themes/fid_adlr/scss/compiled.scss
index 5f4e231ed88..cf99c8e4b29 100644
--- a/themes/adlr_link/scss/default.scss
+++ b/themes/fid_adlr/scss/compiled.scss
@@ -39,19 +39,11 @@ $topbar-dropdown-link-bg-hover: lighten(#999999, 5%);
// Crumbs defined AFTER import to avoid $crumb-bg: $steel;
// 3. import entire FOUNDATION-FOLDER default.scss VIA the FINC-FOLDER default.scss to have the variables and mixins above applied
-@import "../../finc/scss/default";
+@import "../../finc/scss/compiled";
// 4. Customize further
// header.fixed {left:auto;max-width: 1152px;}
.top-bar {
- @media only screen and (min-width: $small-breakpoint + em-calc(1)) {
- padding-bottom: 1.5rem;
- padding-top: 1.5rem;
- }
- // Set min-height to 192px for 1024px up
- @media only screen and (min-width: $medium-breakpoint + em-calc(1)) {
- /* min-height:12rem; */
- }
.name h1 a {color:$dk_header_font;}
.toggle-topbar.menu-icon a span:after {box-shadow: 0px 0px 0px 1px $dk_header_font, 0px 7px 0px 1px #333, 0px 14px 0px 1px $dk_header_font;}
}
diff --git a/themes/adlr_link/templates/header.phtml b/themes/fid_adlr/templates/header.phtml
similarity index 100%
rename from themes/adlr_link/templates/header.phtml
rename to themes/fid_adlr/templates/header.phtml
diff --git a/themes/adlr_link/theme.config.php b/themes/fid_adlr/theme.config.php
similarity index 65%
rename from themes/adlr_link/theme.config.php
rename to themes/fid_adlr/theme.config.php
index 96f8fafa361..8249613e6b4 100644
--- a/themes/adlr_link/theme.config.php
+++ b/themes/fid_adlr/theme.config.php
@@ -1,4 +1,4 @@
<?php
-return array(
+return [
'extends' => 'finc',
-);
\ No newline at end of file
+];
\ No newline at end of file
--
GitLab