Merge branch 'draft' into 'master'

Draft See merge request !10

Merge branch 'draft' into 'master'
Draft See merge request !10
b2ee8943 · Axel Dürkop · d3f0aad1 · e31011d4 · b2ee8943 · b2ee8943
Commit b2ee8943 authored Feb 07, 2017 by Axel Dürkop
12 changed files
--- a/SUMMARY.md
+++ b/SUMMARY.md
 # Summary

+## Einleitung
+
 * [Über den Workshop](README.md)

 ## Trends
+
 * [Einleitung](./trends/einleitung.md)
 * [Open Source](./trends/opensource.md)
 * [Open Access](./trends/openaccess.md)
@@ -20,6 +23,9 @@
 * [Open Science Framework](./tools/osf.md)
 * [Hypothes.is](./tools/hypothesis.md)

+## Anhang
+* [Techniken](./anhang/techniken.md)
+* [Beitragen](./anhang/beitragen.md)
+
 ## Meta
-* [Beitragen](./meta/beitragen.md)
 * [Kontakt](./meta/kontakt.md)
--- a/_layouts/layout.html
+++ b/_layouts/layout.html
+<!DOCTYPE HTML>
+<html lang="{{ config.language }}" {% if page.dir == "rtl" %}dir="rtl"{% endif %}>
+    <head>
+        <meta charset="UTF-8">
+        <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+        <title>{% block title %}{{ config.title|d("GitBook", true) }}{% endblock %}</title>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta name="description" content="{% block description %}{% endblock %}">
+        <meta name="generator" content="GitBook {{ gitbook.version }}">
+        {% if config.author %}<meta name="author" content="{{ config.author }}">{% endif %}
+        {% if config.isbn %}<meta name="identifier" content="{{ config.isbn }}" scheme="ISBN">{% endif %}
+        {% block style %}
+            {% for resource in plugins.resources.css %}
+                {% if resource.url %}
+                <link rel="stylesheet" href="{{ resource.url }}">
+                {% else %}
+                <link rel="stylesheet" href="{{ resource.path|resolveAsset }}">
+                {% endif %}
+            {% endfor %}
+        {% endblock %}
+        {% block head %}{% endblock %}
+    </head>
+    <body>
+        {% block body %}{% endblock %}
+        {% block javascript %}{% endblock %}
+    </body>
+</html>
--- a/_layouts/website/header.html
+++ b/_layouts/website/header.html
+{% block book_header %}
+<div class="book-header" role="navigation">
+    {% if glossary.path %}
+    <a href="{{ ('/' + glossary.path)|resolveFile }}" class="btn pull-left" aria-label="{{ "GLOSSARY_OPEN"|t }}"><i class="fa fa-sort-alpha-asc"></i></a>
+    {% endif %}
+
+    <!-- Title -->
+    <h1>
+        <i class="fa fa-circle-o-notch fa-spin"></i>
+        <a href="{{ "/"|resolveFile }}" >{{ page.title }}</a>
+    </h1>
+</div>
+{% endblock %}
--- a/_layouts/website/languages.html
+++ b/_layouts/website/languages.html
+{% extends "./layout.html" %}
+
+{% block title %}{{ "LANGS_CHOOSE"|t }} · {{ super() }}{% endblock %}
+
+{% block body %}
+<div class="book-langs-index" role="navigation">
+    <div class="inner">
+        <h3>{{ "LANGS_CHOOSE"|t }}</h3>
+
+        <ul class="languages">
+        {%  for lang in languages.list %}
+            <li>
+                <a href="{{ (lang.id + "/README.md")|contentURL }}">{{ lang.title }}</a>
+            </li>
+        {% endfor %}
+        </ul>
+    </div>
+</div>
+{% endblock %}
--- a/_layouts/website/layout.html
+++ b/_layouts/website/layout.html
+{% extends "layout.html" %}
+
+{% block head %}
+    {{ super() }}
+    <meta name="HandheldFriendly" content="true"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ "images/apple-touch-icon-precomposed-152.png"|resolveAsset }}">
+    <link rel="shortcut icon" href="{{ "images/favicon.ico"|resolveAsset }}" type="image/x-icon">
+{% endblock %}
+
+{% block style %}
+    {### Include theme css before plugins css ###}
+    <link rel="stylesheet" href="{{ "style.css"|resolveAsset }}">
+
+    {{ super() }}
+
+    {### Custom stylesheets for the book ###}
+
+    {% for type, style in config.styles %}
+        {% if fileExists(style) and type == "website" %}
+        <link rel="stylesheet" href="{{ style|resolveFile }}">
+        {% endif %}
+    {% endfor %}
+{% endblock %}
+
+{% block body %}{% endblock %}
--- a/_layouts/website/page.html
+++ b/_layouts/website/page.html
+{% extends "./layout.html" %}
+
+{% block title %}{{ page.title }} · {{ super() }}{% endblock %}
+
+{% block description %}{{ page.description }}{% endblock %}
+
+{% block head %}
+    {{ super() }}
+    {% if page.next and page.next.path %}
+    <link rel="next" href="{{ page.next.path|resolveFile }}" />
+    {% endif %}
+    {% if page.previous and page.previous.path %}
+    <link rel="prev" href="{{ page.previous.path|resolveFile }}" />
+    {% endif %}
+{% endblock %}
+
+{% block javascript %}
+    <script src="{{ "gitbook.js"|resolveAsset }}"></script>
+    <script src="{{ "theme.js"|resolveAsset }}"></script>
+    {% for resource in plugins.resources.js %}
+        {% if resource.url %}
+        <script src="{{ resource.url }}"></script>
+        {% else %}
+        <script src="{{ resource.path|resolveAsset }}"></script>
+        {% endif %}
+    {% endfor %}
+{% endblock %}
+
+{% block body %}
+<div class="book">
+    <div class="book-summary">
+        {% block book_sidebar %}
+            {% block search_input %}{% endblock %}
+            {% block book_summary %}
+                <nav role="navigation">
+                {% include "website/summary.html" %}
+                </nav>
+            {% endblock %}
+        {% endblock %}
+    </div>
+
+    <div class="book-body">
+        {% block book_body %}
+            <div class="body-inner">
+                {% block book_inner %}
+                    {% include "website/header.html" %}
+
+                    <div class="page-wrapper" tabindex="-1" role="main">
+                        <div class="page-inner">
+                            {% block search_results %}
+                                <section class="normal markdown-section">
+                                {% block page %}
+                                {{ page.content|safe }}
+                                {% endblock %}
+                                </section>
+                            {% endblock %}
+                        </div>
+                    </div>
+                {% endblock %}
+            </div>
+
+            {% block book_navigation %}
+                {% if page.previous and page.previous.path %}
+                <a href="{{ page.previous.path|resolveFile }}{{ page.previous.anchor }}" class="navigation navigation-prev {% if not (page.next and page.next.path) %}navigation-unique{% endif %}" aria-label="Previous page: {{ page.previous.title }}">
+                    <i class="fa fa-angle-left"></i>
+                </a>
+                {% endif %}
+                {% if page.next and page.next.path %}
+                <a href="{{ page.next.path|resolveFile }}{{ page.next.anchor }}" class="navigation navigation-next {% if not (page.previous and page.previous.path) %}navigation-unique{% endif %}" aria-label="Next page: {{ page.next.title }}">
+                    <i class="fa fa-angle-right"></i>
+                </a>
+                {% endif %}
+            {% endblock %}
+        {% endblock %}
+    </div>
+
+    <script>
+        var gitbook = gitbook || [];
+        gitbook.push(function() {
+            gitbook.page.hasChanged({{ template.getJSContext()|dump|safe }});
+        });
+    </script>
+</div>
+{% endblock %}
--- a/_layouts/website/summary.html
+++ b/_layouts/website/summary.html
+{% macro articles(_articles) %}
+    {% for article in _articles %}
+        <li class="chapter {% if article.path == file.path and not article.anchor %}active{% endif %}" data-level="{{ article.level }}" {% if article.path %}data-path="{{ article.path|resolveFile }}"{% endif %}>
+            {% if article.path and getPageByPath(article.path) %}
+                <a href="{{ article.path|resolveFile }}{{ article.anchor }}">
+            {% elif article.url %}
+                <a target="_blank" href="{{ article.url }}">
+            {% else %}
+                <span>
+            {% endif %}
+                    {% if article.level != "0" and config.pluginsConfig['theme-default'].showLevel %}
+                        <b>{{ article.level }}.</b>
+                    {% endif %}
+                    {{ article.title }}
+            {% if article.path  or article.url %}
+                </a>
+            {% else %}
+                </span>
+            {% endif %}
+
+            {% if article.articles.length > 0 %}
+            <ul class="articles">
+                {{ articles(article.articles, file, config) }}
+            </ul>
+            {% endif %}
+        </li>
+    {% endfor %}
+{% endmacro %}
+
+<ul class="summary">
+    {% set _divider = false %}
+    {% if config.links.sidebar  %}
+    {% for linkTitle, link in config.links.sidebar  %}
+        {% set _divider = true %}
+        <li>
+            <a href="{{ link }}" target="_blank" class="custom-link">{{ linkTitle }}</a>
+        </li>
+    {% endfor %}
+    {% endif %}
+
+    {% if _divider %}
+    <li class="divider"></li>
+    {% endif %}
+
+    {% for part in summary.parts %}
+        {% if part.title %}
+        <li class="header">{{ part.title }}</li>
+        {% elif not loop.first %}
+        <li class="divider"></li>
+        {% endif %}
+        {{ articles(part.articles, file, config) }}
+    {% endfor %}
+
+    <li class="divider"></li>
+
+    <li>
+        <a href="https://github.com/GitbookIO/gitbook" target="blank" class="gitbook-link">
+            {{ "GITBOOK_LINK"|t }}
+        </a>
+    </li>
+</ul>
--- a/meta/beitragen.md
+++ b/meta/beitragen.md
--- a/anhang/techniken.md
+++ b/anhang/techniken.md
+# Einleitung
+
+Der Anhang fordert alle Interessierten, die weitere Tools und Techniken kennen, zur Mitarbeit auf. Links, Buchempfehlungen und Erfahrungen bitte in den folgenden Abschnitten ergänzen.
+
+---
+
+## Recherchieren
+
+* [Kataloge der TUB](https://www.tub.tuhh.de/finden/)
+* [Fachdatenbanken der TUB](https://www.tub.tuhh.de/finden/datenbanken/)
+
+### Spezielle Datenbanken
+
+* [Normen finden](https://www.tub.tuhh.de/finden/normen/)
+* [Patente finden](https://www.tub.tuhh.de/finden/patente/)
+
+### Leitfaden zum Recherchieren
+
+* [Herausforderungen rund ums Finden von Information](https://www.tub.tuhh.de/wp-content/uploads/2017/01/Fachinformation-Collect-Write-Publish-2017.pdf)
+
+### Zoterogruppe
+
+Gemeinsam recherchierte Literatur in einer Literaturverwaltung pflegen:
+
+* Gruppen-Bibliotheken bei Zotero: [OpenAccessTUHHOpenAccessTUHH](https://www.zotero.org/groups/openaccesstuhh)
+
+---
+
+## Bibliographieren
+
+---
+
+## Daten sammeln
+
+---
+
+## Daten auswerten
+
+---
+
+## Programmieren
+
+---
+
+## Schreiben
--- a/book.json
+++ b/book.json
@@ -7,7 +7,7 @@
        "align": "left",
        "caption": "Abbildung: _PAGE_LEVEL_._PAGE_IMAGE_NUMBER_ - _CAPTION_",
        "images": {
-          "1.1.2": {
+          "1.1.1": {
            "skip": true
          }
        }

--- a/book.pdf
+++ b/book.pdf
--- a/styles/website.css
+++ b/styles/website.css
@@ -8,7 +8,7 @@ h1, h2, h3, h4 {
 }

 .book-summary ul.summary li a {
-  padding: 3px 15px;
+  padding: 6px 15px;
 }

 .markdown-section h2 {