Commit a212fd62 authored by Curtis Adam's avatar Curtis Adam

Group 'legal Notice', 'Data protection' and 'GTC'

parent 9f47150a
......@@ -10,7 +10,7 @@
"about": "Was ist THMcards?",
"choose": "",
"impressum": "Impressum",
"backButton": "Zurück zum Login"
"backButton": "Zurück zum Start"
},
"carousel-inner": {
"carousel-header-0": "Deine digitalen Lernkarten",
......@@ -34,6 +34,9 @@
"none": "Ohne"
},
"footer": {
"info": "Info"
},
"contact": {
"impressum": "Impressum",
"datenschutz": "Datenschutz",
"agb": "AGB"
......
......@@ -10,7 +10,7 @@
"about": "About THMcards",
"choose": "Select your login:",
"impressum": "Legal Notice",
"backButton": "Back to Login"
"backButton": "Back to Start"
},
"carousel-inner": {
"carousel-header-0": " Your digital flashcards",
......@@ -34,6 +34,9 @@
"none": "None"
},
"footer": {
"info": "Info"
},
"contact": {
"impressum": "Legal Notice",
"datenschutz": "Data protection",
"agb": "GTC"
......
......@@ -22,9 +22,20 @@ Router.route('/home', {
template: 'welcome'
});
Router.route('impressum');
Router.route('agb');
Router.route('datenschutz');
Router.route('impressum', {
name: 'impressum',
template: 'contact'
});
Router.route('agb', {
name: 'agb',
template: 'contact'
});
Router.route('datenschutz', {
name: 'datenschutz',
template: 'contact'
});
Router.route('/create', {
name: 'create',
......
......@@ -27,9 +27,9 @@
<p class="muted credit pull-left">&copy; {{getYear}} THMcards</p>
<p class="muted credit pull-right"><a id="agb" href="{{pathFor route='agb'}}">{{_ "footer.agb"}}</a></p>
<p class="muted credit pull-right"><a id="datenschutz" href="{{pathFor route='datenschutz'}}">{{_
"footer.datenschutz"}}</a></p>
"contact.datenschutz"}}</a></p>
<p class="muted credit pull-right"><a id="impressum" href="{{pathFor route='impressum'}}">{{_
"footer.impressum"}}</a></p>
"contact.impressum"}}</a></p>
</div>
</div>
</template>
......
This diff is collapsed.
......@@ -4,36 +4,13 @@ import "./impressum.html";
/*
* ############################################################################
* impressum
* contact
* ############################################################################
*/
Template.impressum.events({
Template.contact.events({
'click #back-button': function () {
Router.go('home');
}
});
/*
* ############################################################################
* agb
* ############################################################################
*/
Template.agb.events({
'click #back-button': function () {
Router.go('home');
}
});
/*
* ############################################################################
* datenschutz
* ############################################################################
*/
Template.datenschutz.events({
'click #back-button': function () {
Router.go('home');
}
});
......@@ -57,7 +57,8 @@
<h4 class="list-group-item-heading">{{name}}</h4>
<p class="list-group-item-text">{{description}}</p>
{{#with getAuthor this.owner}}
<p class="list-group-item-text search-author">{{_ "cardset.info.author"}}
<p class="list-group-item-text search-author">{{_
"cardset.info.author"}}
: {{givenname}} {{birthname}}</p>
<p class="list-group-item-text">{{_ "panel-body.title"}}
: {{degree}}</p>
......@@ -168,11 +169,10 @@
<div id="footer" class="footer">
<div class="container">
<p class="muted credit">
<a id="impressum" href="{{pathFor route='impressum'}}">{{_ "footer.impressum"}}</a>
<a id="datenschutz" href="{{pathFor route='datenschutz'}}">{{_ "footer.datenschutz"}}</a>
<a id="agb" href="{{pathFor route='agb'}}">{{_ "footer.agb"}}</a>
</p>
<a id="info" class="col-xs-12 contact" href="{{pathFor route='impressum'}}">
<p class="footer-icon"><span class="glyphicon glyphicon-info-sign"></span></p>
<p class="footer-text"><span class="footerElementText">Info</span></p>
</a>
</div>
</div>
</div> <!-- Theme Wrapper -->
......
......@@ -225,6 +225,10 @@ body {
margin: 10px 0 !important;
width: 100% !important;
}
#contact .nav-tabs a {
text-align: left;
}
}
@media(min-width: 768px) {
......@@ -265,25 +269,24 @@ body {
width: 100%;
height: 60px;
background-color: $color_wild_sand_approx;
.container .credit {
margin: 20px 0;
.container {
font-size: 18px;
height: 60px;
background-color: $color_wild_sand_approx;
text-align: center;
}
> .container {
padding-right: 15px;
padding-left: 15px;
background-color: $color_wild_sand_approx;
#impressum {
padding-right: 10px;
background-color: $color_wild_sand_approx;
}
#datenschutz {
padding-right: 10px;
background-color: $color_wild_sand_approx;
}
#info {
height: 60px;
}
.footer-icon {
margin: 10px 0 0 0;
}
.footer-text {
margin: 0;
}
a:hover {
text-decoration: none;
background-color: #EEEEEE;
}
}
......@@ -531,3 +534,18 @@ button:disabled {
.badge {
padding: 3px 5px;
}
#contact .nav-tabs {
-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 {
border-radius: 0;
margin-bottom: 0;
}
#contact .nav-tabs .inactive a {
color: black !important;
background-color: #eeeeee !important;
}
......@@ -97,9 +97,9 @@ export class MailNotifier {
* @param {string} buttonColor - The rgb color of the button background
*/
sendMail (name, mail, subject, text, bold, textEnd, cardsetId, titleColor, buttonColor) {
var datenschutz = TAPi18n.__('footer.datenschutz', null, Meteor.settings.mail.language);
var agb = TAPi18n.__('footer.agb', null, Meteor.settings.mail.language);
var impressum = TAPi18n.__('footer.impressum', null, Meteor.settings.mail.language);
var datenschutz = TAPi18n.__('contact.datenschutz', null, Meteor.settings.mail.language);
var agb = TAPi18n.__('contact.agb', null, Meteor.settings.mail.language);
var impressum = TAPi18n.__('contact.impressum', null, Meteor.settings.mail.language);
var service = TAPi18n.__('mailNotification.service', null, Meteor.settings.mail.language);
var unsubscribe = TAPi18n.__('mailNotification.unsubscribe', null, Meteor.settings.mail.language);
var copyright = TAPi18n.__('mailNotification.copyright', null, Meteor.settings.mail.language);
......
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