Commit 5f1bea07 authored by Curtis Adam's avatar Curtis Adam

Display all info categories instead of just an info button

parent d9110f34
......@@ -29,7 +29,8 @@
"about": "Was ist THMcards?",
"learnMore": "Learn more ...",
"impressum": "Impressum",
"backButton": "Zurück"
"backButton": "Zurück",
"backToStartButton": "Zurück zur Startseite"
},
"navbar-collapse": {
"carddecks": "Meine Kartensätze",
......
......@@ -29,7 +29,8 @@
"about": "About THMcards",
"learnMore": "Learn more...",
"impressum": "Legal Notice",
"backButton": "Back"
"backButton": "Back",
"backToStartButton": "Back to the start page"
},
"carousel-inner": {
"carousel-header-0": " Your digital flashcards",
......
<template name="contact">
<div class="col-md-8 col-md-offset-2">
<button class="btn btn-raised btn-danger" id="back-button">
<span class="pull-left">{{_ "intro.backButton"}}</span>
</button>
{{#if currentUser}}
<button class="btn btn-raised btn-danger" id="backButton">
<span class="pull-left">{{_ "intro.backButton"}}</span>
</button>
{{else}}
<button class="btn btn-raised btn-danger" id="backToStartButton">
<span class="pull-left">{{_ "intro.backToStartButton"}}</span>
</button>
{{/if}}
</div>
<div id="contact" class="col-md-8 col-md-offset-2">
<nav class="nav nav-tabs nav-justified">
<li class="sm-12 md-2 {{#unless isActiveRoute 'about'}}inactive{{/unless}}"><a id="about"
href="{{pathFor
route='about'}}">{{_
"contact.about"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'learning'}}inactive{{/unless}}"><a id="learning"
href="{{pathFor
route='learning'}}">{{_
"contact.learning"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'help'}}inactive{{/unless}}"><a id="help"
href="{{pathFor
route='help'}}">{{_
"contact.help"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'faq'}}inactive{{/unless}}"><a id="faq" href="{{pathFor
route='faq'}}">{{_ "contact.faq"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'impressum'}}inactive{{/unless}}"><a id="impressum"
href="{{pathFor
route='impressum'}}">{{_
"contact.impressum"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'agb'}}inactive{{/unless}}"><a id="datenschutz"
href="{{pathFor
route='agb'}}">{{_
"contact.agb"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'datenschutz'}}inactive{{/unless}}"><a id="agb"
href="{{pathFor
route='datenschutz'}}">{{_
"contact.datenschutz"}}</a></li>
</nav>
{{> contactNavigation}}
<br>
{{#if isActiveRoute 'about'}}
{{> about}}
......@@ -58,6 +37,37 @@
</div>
</template>
<template name="contactNavigation">
<nav id="contact-nav" class="nav nav-tabs nav-justified">
<li class="sm-12 md-2 {{#unless isActiveRoute 'about'}}inactive{{/unless}}"><a id="about"
href="{{pathFor
route='about'}}">{{_
"contact.about"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'learning'}}inactive{{/unless}}"><a id="learning"
href="{{pathFor
route='learning'}}">{{_
"contact.learning"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'help'}}inactive{{/unless}}"><a id="help"
href="{{pathFor
route='help'}}">{{_
"contact.help"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'faq'}}inactive{{/unless}}"><a id="faq" href="{{pathFor
route='faq'}}">{{_ "contact.faq"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'impressum'}}inactive{{/unless}}"><a id="impressum"
href="{{pathFor
route='impressum'}}">{{_
"contact.impressum"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'agb'}}inactive{{/unless}}"><a id="datenschutz"
href="{{pathFor
route='agb'}}">{{_
"contact.agb"}}</a></li>
<li class="sm-12 md-2 {{#unless isActiveRoute 'datenschutz'}}inactive{{/unless}}"><a id="agb"
href="{{pathFor
route='datenschutz'}}">{{_
"contact.datenschutz"}}</a></li>
</nav>
</template>
<template name="about">
<div class="panel panel-default">
<div class="panel-heading info-tab">
......@@ -439,9 +449,10 @@
{{#if isActiveLanguage 'de'}}
<h2 id="poolHelp">Themen</h2>
<a href="/img/help/de/filter_navigation.png" data-lightbox="img-1" data-title="Themen Filter">
<img src="/img/help/de/filter_navigation.png" alt="Themen Filter" class="img-responsive center-block">
<img src="/img/help/de/filter_navigation.png" alt="Themen Filter"
class="img-responsive center-block">
</a>
<h3>Filter</h3>
<h3>Filter</h3>
<ol class="thm-numbering">
<li>Thema</li>
<li>Autor/in</li>
......@@ -458,9 +469,9 @@
</ol>
</ol>
<h2 id="courseIterationsHelp">Kurse</h2>
<p>
Kurs erstellen <span class="thm-numbering-standalone">A</span>
</p>
<p>
Kurs erstellen <span class="thm-numbering-standalone">A</span>
</p>
<h2 id="createHelp">Meine Kartensätze</h2>
<h3 id="shuffleHelp">Kartensätze mischen</h3>
......
......@@ -10,8 +10,11 @@ import {Session} from "meteor/session";
*/
Template.contact.events({
'click #back-button': function () {
'click #backButton': function () {
window.history.back();
},
'click #backToStartButton': function () {
Router.go('home');
}
});
......
......@@ -181,10 +181,8 @@
{{#unless fullscreenActive}}
<div id="footer" class="footer">
<ul class="{{#unless isActiveRoute regex='newCard|editCard'}}container{{else}}col-lg-offset-1 col-lg-10{{/unless}} dropup">
<li class="col-xs-2 col-sm-1">
<a id="info" href="{{pathFor route='about'}}" aria-label="{{_ "footer.info"}}">
<p class="footer-icon"><span class="glyphicon glyphicon-info-sign"></span></p>
</a>
<li class="col-sm-10">
{{> contactNavigation}}
</li>
<li id="navbar-languagepanel" class="col-xs-2 col-sm-1"
data-toggle="collapse" data-target="#thm-top-navigation">
......
......@@ -229,7 +229,7 @@ body {
width: 100% !important;
}
#contact .nav-tabs a {
#contact-nav a {
text-align: left;
}
}
......@@ -297,9 +297,7 @@ body {
li ul li {
height: 60px;
}
li:hover {
background-color: $color_footer_hover;
}
a {
text-decoration: none;
outline: none;
......@@ -558,19 +556,24 @@ button:disabled {
padding: 3px 5px;
}
#contact .nav-tabs {
#contact-nav {
-webkit-box-shadow: -3px 1px 6px 0 rgba(0, 0, 0, 0.12), -3px 1px 6px 0 rgba(0, 0, 0, 0.12);
box-shadow: -3px 1px 6px 0 rgba(0, 0, 0, 0.12), -3px 1px 6px 0 rgba(0, 0, 0, 0.12);
}
#contact .nav-tabs a {
#footer #contact-nav {
-webkit-box-shadow: unset !important;
box-shadow: unset !important;
}
#contact-nav a {
border-radius: 0;
margin-bottom: 0;
outline: none;
padding: 10px;
}
#contact .nav-tabs .inactive a {
#contact-nav .inactive a {
color: black !important;
background-color: #eeeeee !important;
outline: none;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment