diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..907c2a1 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +sprintdoc-farm: + environment: sprintdoc-farm + tags: + - locally + only: + - live + script: + - fab deploy \ No newline at end of file diff --git a/css/area_main-content.less b/css/area_main-content.less index f690575..ee7e045 100755 --- a/css/area_main-content.less +++ b/css/area_main-content.less @@ -20,15 +20,14 @@ } } - div.section_highlight { - margin: 0; - padding: 0 0 1rem 0; - border: 1px solid #abced4; - background-color: #fff; - background-image: linear-gradient(90deg, transparent 79px, #abced4 79px, #abced4 81px, transparent 81px), - linear-gradient(#eee .1em, transparent .1em); - background-size: 100% 1.2em; - opacity: .7; + div.section_highlight{ + background: repeating-linear-gradient( + -45deg, + @ini_background_neu, + @ini_background_neu 10px, + @ini_background 10px, + @ini_background 20px, + ); } .secedit { float: right; diff --git a/css/base_design.less b/css/base_design.less index eec8d7d..2b7f88e 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -131,9 +131,6 @@ h1 { font-size: @font-size-head1; margin: 0 0 @font-size-head1; padding-top: 1em; - #dokuwiki__content > & { - padding-top: 1.5em; - } } h2 { diff --git a/css/base_fonts.less b/css/base_fonts.less index 8d867af..505c5b7 100755 --- a/css/base_fonts.less +++ b/css/base_fonts.less @@ -4,15 +4,6 @@ * @author Jana Deutschlaender */ -/* web font */ -//.setLocalFontFace('roboto',300,'Roboto Light','Roboto-Light','roboto-light'); /* roboto light */ -//.setLocalFontFace('roboto',400,'Roboto','Roboto-Regular','roboto-regular'); /* roboto regular */ -//.setLocalFontFace('roboto',500,'Roboto Medium','Roboto-Medium','roboto-medium'); /* roboto medium */ -//.setLocalFontFace('roboto',700,'Roboto Bold','Roboto-Bold','roboto-bold'); /* roboto bold */ - -//.setLocalFontFace('roboto',400,'Roboto Condensed','RobotoCondensed-Regular','roboto-condensed'); /* roboto condensed */ -//.setLocalFontFace('roboto',700,'Roboto Condensed Bold','RobotoCondensed-Bold','roboto-boldcondensed'); /* roboto condensed */ - /* icon font */ .setIconFontFace('fontello','fontello'); diff --git a/detail.php b/detail.php index 53239a1..21dda38 100755 --- a/detail.php +++ b/detail.php @@ -9,7 +9,6 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ header('X-UA-Compatible: IE=edge,chrome=1'); ?> diff --git a/fabfile.py b/fabfile.py new file mode 100644 index 0000000..b1e5fa0 --- /dev/null +++ b/fabfile.py @@ -0,0 +1,61 @@ +import os +import sys +import json +from fabric.api import run, env, cd + +config = { + 'TARGET_PORT': 6589, + 'TARGET_USER': 'www-data', +} + +try: + TARGET_CONF = json.loads(os.getenv('TARGET_CONF')) +except (SyntaxError, ValueError) as e: + print 'Could not parse configuration: %s' % e + sys.exit(1) + +BUILD_JOB_NAME = os.getenv('CI_BUILD_NAME') + +if BUILD_JOB_NAME not in TARGET_CONF: + print 'Could not find job configuration for %s' % BUILD_JOB_NAME + sys.exit(1) +else: + config.update(TARGET_CONF[BUILD_JOB_NAME]) + +BRANCH = os.getenv('CI_BUILD_REF_NAME') + +if not BRANCH: + print 'Could not get branch name from configuration: Please specify CI_BUILD_REF_NAME env var' + sys.exit(1) + +for option in ['TARGET_HOST', 'TARGET_PATH']: + if not config.get(option): + print 'Could not get %s from configuration!' % option + sys.exit(1) + +env.hosts = [config.get('TARGET_HOST')] +env.port = config.get('TARGET_PORT') +env.user = config.get('TARGET_USER') + + +def pre(): + if config.get('PRE_CMDS'): + [run(cmd) for cmd in config.get('PRE_CMDS')] + + +def git_pull(): + run('git fetch --all') + run('git checkout --force %s' % BRANCH) + run('git reset --hard origin/%s' % BRANCH) + + +def post(): + if config.get('POST_CMDS'): + [run(cmd) for cmd in config.get('POST_CMDS')] + + +def deploy(): + with cd(config.get('TARGET_PATH')): + pre() + git_pull() + post() \ No newline at end of file diff --git a/fonts/Google Android License.txt b/fonts/Google Android License.txt deleted file mode 100755 index 1a96dfd..0000000 --- a/fonts/Google Android License.txt +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (C) 2008 The Android Open Source Project - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -########## - -This directory contains the fonts for the platform. They are licensed -under the Apache 2 license. diff --git a/fonts/roboto-black.eot b/fonts/roboto-black.eot deleted file mode 100755 index 1e11f7c..0000000 Binary files a/fonts/roboto-black.eot and /dev/null differ diff --git a/fonts/roboto-black.svg b/fonts/roboto-black.svg deleted file mode 100755 index c105487..0000000 --- a/fonts/roboto-black.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-black.ttf b/fonts/roboto-black.ttf deleted file mode 100755 index a53bb35..0000000 Binary files a/fonts/roboto-black.ttf and /dev/null differ diff --git a/fonts/roboto-black.woff b/fonts/roboto-black.woff deleted file mode 100755 index e4564e1..0000000 Binary files a/fonts/roboto-black.woff and /dev/null differ diff --git a/fonts/roboto-blackItalic.eot b/fonts/roboto-blackItalic.eot deleted file mode 100755 index f568391..0000000 Binary files a/fonts/roboto-blackItalic.eot and /dev/null differ diff --git a/fonts/roboto-blackItalic.svg b/fonts/roboto-blackItalic.svg deleted file mode 100755 index 10b42de..0000000 --- a/fonts/roboto-blackItalic.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-blackItalic.ttf b/fonts/roboto-blackItalic.ttf deleted file mode 100755 index 7bab132..0000000 Binary files a/fonts/roboto-blackItalic.ttf and /dev/null differ diff --git a/fonts/roboto-blackItalic.woff b/fonts/roboto-blackItalic.woff deleted file mode 100755 index 1a59cb7..0000000 Binary files a/fonts/roboto-blackItalic.woff and /dev/null differ diff --git a/fonts/roboto-bold.eot b/fonts/roboto-bold.eot deleted file mode 100755 index 09ad044..0000000 Binary files a/fonts/roboto-bold.eot and /dev/null differ diff --git a/fonts/roboto-bold.svg b/fonts/roboto-bold.svg deleted file mode 100755 index edbed86..0000000 --- a/fonts/roboto-bold.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-bold.ttf b/fonts/roboto-bold.ttf deleted file mode 100755 index 20f2c40..0000000 Binary files a/fonts/roboto-bold.ttf and /dev/null differ diff --git a/fonts/roboto-bold.woff b/fonts/roboto-bold.woff deleted file mode 100755 index 32339df..0000000 Binary files a/fonts/roboto-bold.woff and /dev/null differ diff --git a/fonts/roboto-boldcondensed.eot b/fonts/roboto-boldcondensed.eot deleted file mode 100755 index e0f64c1..0000000 Binary files a/fonts/roboto-boldcondensed.eot and /dev/null differ diff --git a/fonts/roboto-boldcondensed.svg b/fonts/roboto-boldcondensed.svg deleted file mode 100755 index 37f1548..0000000 --- a/fonts/roboto-boldcondensed.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-boldcondensed.ttf b/fonts/roboto-boldcondensed.ttf deleted file mode 100755 index 7fad74e..0000000 Binary files a/fonts/roboto-boldcondensed.ttf and /dev/null differ diff --git a/fonts/roboto-boldcondensed.woff b/fonts/roboto-boldcondensed.woff deleted file mode 100755 index d2481fe..0000000 Binary files a/fonts/roboto-boldcondensed.woff and /dev/null differ diff --git a/fonts/roboto-boldcondenseditalic.eot b/fonts/roboto-boldcondenseditalic.eot deleted file mode 100755 index 0810aba..0000000 Binary files a/fonts/roboto-boldcondenseditalic.eot and /dev/null differ diff --git a/fonts/roboto-boldcondenseditalic.svg b/fonts/roboto-boldcondenseditalic.svg deleted file mode 100755 index d4d9143..0000000 --- a/fonts/roboto-boldcondenseditalic.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-boldcondenseditalic.ttf b/fonts/roboto-boldcondenseditalic.ttf deleted file mode 100755 index 661bf7b..0000000 Binary files a/fonts/roboto-boldcondenseditalic.ttf and /dev/null differ diff --git a/fonts/roboto-boldcondenseditalic.woff b/fonts/roboto-boldcondenseditalic.woff deleted file mode 100755 index f16585c..0000000 Binary files a/fonts/roboto-boldcondenseditalic.woff and /dev/null differ diff --git a/fonts/roboto-bolditalic.eot b/fonts/roboto-bolditalic.eot deleted file mode 100755 index d6f8950..0000000 Binary files a/fonts/roboto-bolditalic.eot and /dev/null differ diff --git a/fonts/roboto-bolditalic.svg b/fonts/roboto-bolditalic.svg deleted file mode 100755 index 27118d5..0000000 --- a/fonts/roboto-bolditalic.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-bolditalic.ttf b/fonts/roboto-bolditalic.ttf deleted file mode 100755 index abe6d34..0000000 Binary files a/fonts/roboto-bolditalic.ttf and /dev/null differ diff --git a/fonts/roboto-bolditalic.woff b/fonts/roboto-bolditalic.woff deleted file mode 100755 index ba9e2c4..0000000 Binary files a/fonts/roboto-bolditalic.woff and /dev/null differ diff --git a/fonts/roboto-condensed.eot b/fonts/roboto-condensed.eot deleted file mode 100755 index b091c6e..0000000 Binary files a/fonts/roboto-condensed.eot and /dev/null differ diff --git a/fonts/roboto-condensed.svg b/fonts/roboto-condensed.svg deleted file mode 100755 index b341a75..0000000 --- a/fonts/roboto-condensed.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-condensed.ttf b/fonts/roboto-condensed.ttf deleted file mode 100755 index 0617758..0000000 Binary files a/fonts/roboto-condensed.ttf and /dev/null differ diff --git a/fonts/roboto-condensed.woff b/fonts/roboto-condensed.woff deleted file mode 100755 index c7b6fdd..0000000 Binary files a/fonts/roboto-condensed.woff and /dev/null differ diff --git a/fonts/roboto-condenseditalic.eot b/fonts/roboto-condenseditalic.eot deleted file mode 100755 index 9a5ac01..0000000 Binary files a/fonts/roboto-condenseditalic.eot and /dev/null differ diff --git a/fonts/roboto-condenseditalic.svg b/fonts/roboto-condenseditalic.svg deleted file mode 100755 index b151f10..0000000 --- a/fonts/roboto-condenseditalic.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-condenseditalic.ttf b/fonts/roboto-condenseditalic.ttf deleted file mode 100755 index 44405d9..0000000 Binary files a/fonts/roboto-condenseditalic.ttf and /dev/null differ diff --git a/fonts/roboto-condenseditalic.woff b/fonts/roboto-condenseditalic.woff deleted file mode 100755 index 65f5f07..0000000 Binary files a/fonts/roboto-condenseditalic.woff and /dev/null differ diff --git a/fonts/roboto-italic.eot b/fonts/roboto-italic.eot deleted file mode 100755 index ae76c30..0000000 Binary files a/fonts/roboto-italic.eot and /dev/null differ diff --git a/fonts/roboto-italic.svg b/fonts/roboto-italic.svg deleted file mode 100755 index d2177f9..0000000 --- a/fonts/roboto-italic.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-italic.ttf b/fonts/roboto-italic.ttf deleted file mode 100755 index 5805eee..0000000 Binary files a/fonts/roboto-italic.ttf and /dev/null differ diff --git a/fonts/roboto-italic.woff.textClipping b/fonts/roboto-italic.woff.textClipping deleted file mode 100755 index e69de29..0000000 diff --git a/fonts/roboto-italic2.woff b/fonts/roboto-italic2.woff deleted file mode 100755 index a47b237..0000000 Binary files a/fonts/roboto-italic2.woff and /dev/null differ diff --git a/fonts/roboto-light.eot b/fonts/roboto-light.eot deleted file mode 100755 index 50a0f9a..0000000 Binary files a/fonts/roboto-light.eot and /dev/null differ diff --git a/fonts/roboto-light.svg b/fonts/roboto-light.svg deleted file mode 100755 index e315ac4..0000000 --- a/fonts/roboto-light.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-light.ttf b/fonts/roboto-light.ttf deleted file mode 100755 index 70476da..0000000 Binary files a/fonts/roboto-light.ttf and /dev/null differ diff --git a/fonts/roboto-light.woff b/fonts/roboto-light.woff deleted file mode 100755 index 876ae73..0000000 Binary files a/fonts/roboto-light.woff and /dev/null differ diff --git a/fonts/roboto-lightItalic.eot b/fonts/roboto-lightItalic.eot deleted file mode 100755 index 86d5aaa..0000000 Binary files a/fonts/roboto-lightItalic.eot and /dev/null differ diff --git a/fonts/roboto-lightItalic.svg b/fonts/roboto-lightItalic.svg deleted file mode 100755 index 9921eda..0000000 --- a/fonts/roboto-lightItalic.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-lightItalic.ttf b/fonts/roboto-lightItalic.ttf deleted file mode 100755 index 0ec43ae..0000000 Binary files a/fonts/roboto-lightItalic.ttf and /dev/null differ diff --git a/fonts/roboto-lightItalic.woff b/fonts/roboto-lightItalic.woff deleted file mode 100755 index 3afe0cf..0000000 Binary files a/fonts/roboto-lightItalic.woff and /dev/null differ diff --git a/fonts/roboto-medium.eot b/fonts/roboto-medium.eot deleted file mode 100755 index ee68d7b..0000000 Binary files a/fonts/roboto-medium.eot and /dev/null differ diff --git a/fonts/roboto-medium.svg b/fonts/roboto-medium.svg deleted file mode 100755 index 5b689ef..0000000 --- a/fonts/roboto-medium.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-medium.ttf b/fonts/roboto-medium.ttf deleted file mode 100755 index 24a0730..0000000 Binary files a/fonts/roboto-medium.ttf and /dev/null differ diff --git a/fonts/roboto-medium.woff b/fonts/roboto-medium.woff deleted file mode 100755 index 63c805c..0000000 Binary files a/fonts/roboto-medium.woff and /dev/null differ diff --git a/fonts/roboto-mediumItalic.eot b/fonts/roboto-mediumItalic.eot deleted file mode 100755 index 1ba70b8..0000000 Binary files a/fonts/roboto-mediumItalic.eot and /dev/null differ diff --git a/fonts/roboto-mediumItalic.svg b/fonts/roboto-mediumItalic.svg deleted file mode 100755 index 03d0f1a..0000000 --- a/fonts/roboto-mediumItalic.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-mediumItalic.ttf b/fonts/roboto-mediumItalic.ttf deleted file mode 100755 index 319e0a9..0000000 Binary files a/fonts/roboto-mediumItalic.ttf and /dev/null differ diff --git a/fonts/roboto-mediumItalic.woff b/fonts/roboto-mediumItalic.woff deleted file mode 100755 index 7e9e87a..0000000 Binary files a/fonts/roboto-mediumItalic.woff and /dev/null differ diff --git a/fonts/roboto-regular.eot b/fonts/roboto-regular.eot deleted file mode 100755 index 9792dc6..0000000 Binary files a/fonts/roboto-regular.eot and /dev/null differ diff --git a/fonts/roboto-regular.svg b/fonts/roboto-regular.svg deleted file mode 100755 index a208bfa..0000000 --- a/fonts/roboto-regular.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-regular.ttf b/fonts/roboto-regular.ttf deleted file mode 100755 index 32634bd..0000000 Binary files a/fonts/roboto-regular.ttf and /dev/null differ diff --git a/fonts/roboto-regular.woff b/fonts/roboto-regular.woff deleted file mode 100755 index 70519ff..0000000 Binary files a/fonts/roboto-regular.woff and /dev/null differ diff --git a/fonts/roboto-thin.eot b/fonts/roboto-thin.eot deleted file mode 100755 index 4c4911b..0000000 Binary files a/fonts/roboto-thin.eot and /dev/null differ diff --git a/fonts/roboto-thin.svg b/fonts/roboto-thin.svg deleted file mode 100755 index 282ca33..0000000 --- a/fonts/roboto-thin.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-thin.ttf b/fonts/roboto-thin.ttf deleted file mode 100755 index 766bc49..0000000 Binary files a/fonts/roboto-thin.ttf and /dev/null differ diff --git a/fonts/roboto-thin.woff b/fonts/roboto-thin.woff deleted file mode 100755 index 8358e63..0000000 Binary files a/fonts/roboto-thin.woff and /dev/null differ diff --git a/fonts/roboto-thinItalic.eot b/fonts/roboto-thinItalic.eot deleted file mode 100755 index b3e92a0..0000000 Binary files a/fonts/roboto-thinItalic.eot and /dev/null differ diff --git a/fonts/roboto-thinItalic.svg b/fonts/roboto-thinItalic.svg deleted file mode 100755 index e64f86e..0000000 --- a/fonts/roboto-thinItalic.svg +++ /dev/null @@ -1,256 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Font data copyright Google 2011 -Designer : Google -Foundry URL : Googlecom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/roboto-thinItalic.ttf b/fonts/roboto-thinItalic.ttf deleted file mode 100755 index 74be398..0000000 Binary files a/fonts/roboto-thinItalic.ttf and /dev/null differ diff --git a/fonts/roboto-thinItalic.woff b/fonts/roboto-thinItalic.woff deleted file mode 100755 index 8329ac8..0000000 Binary files a/fonts/roboto-thinItalic.woff and /dev/null differ diff --git a/main.php b/main.php index 941f24b..9aa6873 100755 --- a/main.php +++ b/main.php @@ -10,7 +10,6 @@ */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ header('X-UA-Compatible: IE=edge,chrome=1'); $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) ); diff --git a/mediamanager.php b/mediamanager.php index 3c30f4e..8c85a6d 100755 --- a/mediamanager.php +++ b/mediamanager.php @@ -8,7 +8,6 @@ */ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ header('X-UA-Compatible: IE=edge,chrome=1'); /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ diff --git a/tpl_functions.php b/tpl_functions.php deleted file mode 100755 index c0e605d..0000000 --- a/tpl_functions.php +++ /dev/null @@ -1,142 +0,0 @@ - - */ -function _tpl_discussion($discussionPage, $title, $backTitle, $link=0, $wrapper=0, $return=0) { - global $ID; - $output = ''; - - $discussPage = str_replace('@ID@', $ID, $discussionPage); - $discussPageRaw = str_replace('@ID@', '', $discussionPage); - $isDiscussPage = strpos($ID, $discussPageRaw) !== false; - $backID = ':'.str_replace($discussPageRaw, '', $ID); - - if ($wrapper) $output .= "<$wrapper>"; - - if ($isDiscussPage) { - if ($link) { - ob_start(); - tpl_pagelink($backID, $backTitle); - $output .= ob_get_contents(); - ob_end_clean(); - } else { - $output .= html_btn('back2article', $backID, '', array(), 'get', 0, $backTitle); - } - } else { - if ($link) { - ob_start(); - tpl_pagelink($discussPage, $title); - $output .= ob_get_contents(); - ob_end_clean(); - } else { - $output .= html_btn('discussion', $discussPage, '', array(), 'get', 0, $title); - } - } - - if ($wrapper) $output .= ""; - if ($return) return $output; - echo $output; -} - -/** - * Create link/button to user page - * - * @author Anika Henke - */ -function _tpl_userpage($userPage, $title, $link=0, $wrapper=0, $return=0) { - if (empty($_SERVER['REMOTE_USER'])) return; - - global $conf; - $output = ''; - $userPage = str_replace('@USER@', $_SERVER['REMOTE_USER'], $userPage); - - if ($wrapper) $output .= "<$wrapper>"; - - if ($link) { - ob_start(); - tpl_pagelink($userPage, $title); - $output .= ob_get_contents(); - ob_end_clean(); - } else { - $output .= html_btn('userpage', $userPage, '', array(), 'get', 0, $title); - } - - if ($wrapper) $output .= ""; - if ($return) return $output; - echo $output; -} - -/** - * Wrapper around custom template actions - * - * @author Anika Henke - */ -function _tpl_action($type, $link=0, $wrapper=0, $return=0) { - switch ($type) { - case 'discussion': - if (tpl_getConf('discussionPage')) { - $output = _tpl_discussion(tpl_getConf('discussionPage'), tpl_getLang('discussion'), tpl_getLang('back_to_article'), $link, $wrapper, 1); - if ($return) return $output; - echo $output; - } - break; - case 'userpage': - if (tpl_getConf('userPage')) { - $output = _tpl_userpage(tpl_getConf('userPage'), tpl_getLang('userpage'), $link, $wrapper, 1); - if ($return) return $output; - echo $output; - } - break; - } -} - -/** - * copied to core (available since Detritus) - */ -if (!function_exists('tpl_toolsevent')) { - function tpl_toolsevent($toolsname, $items, $view='main') { - $data = array( - 'view' => $view, - 'items' => $items - ); - - $hook = 'TEMPLATE_'.strtoupper($toolsname).'_DISPLAY'; - $evt = new Doku_Event($hook, $data); - if($evt->advise_before()){ - foreach($evt->data['items'] as $k => $html) echo $html; - } - $evt->advise_after(); - } -} - -/** - * copied from core (available since Binky) - */ -if (!function_exists('tpl_classes')) { - function tpl_classes() { - global $ACT, $conf, $ID, $INFO; - $classes = array( - 'dokuwiki', - 'mode_'.$ACT, - 'tpl_'.$conf['template'], - !empty($_SERVER['REMOTE_USER']) ? 'loggedIn' : '', - $INFO['exists'] ? '' : 'notFound', - ($ID == $conf['start']) ? 'home' : '', - ); - return join(' ', $classes); - } -}