Skip to content
GitLab
Unverified Commit a8b8e36a authored by mntmn's avatar mntmn
Browse files

wip: migrate from deprecated swig templates to ejs

parent b4f0fa16
Hide whitespace changes
Inline Side-by-side
docs/adding_languages.md
View file @ a8b8e36a
...@@ -2,23 +2,23 @@ ...@@ -2,23 +2,23 @@
To add a new language to Spacedeck Open, follow these steps: To add a new language to Spacedeck Open, follow these steps:
*The steps are ilustrated with Spanish (locale 'es') as the new language* *The steps are illustrated with Spanish (locale 'es') as the new language*
- Include the new locale ('es') at the locale list (./spacedeck.js) - Include the new locale ('es') in the locale list (./spacedeck.js):
``` ```
locales: ["en",..., "es"], locales: ["en",..., "es"],
``` ```
- Create the new translation file (/locales/**es.js** thar it's a copy of /locales/en.js). and translate the entries. - Create the new translation file (/locales/**es.js**, a copy of /locales/en.js) and translate the entries.
- Include the javascript for letting Spanish info accesible (at the end of /views/spacedeck.html) - Include the javascript for the new translation at the end of /views/spacedeck.ejs:
``` ```
... ...
window.locales.es = {}; window.locales.es = {};
... ...
window.locales.es.translation = {% include "./../locales/es.js" %}; window.locales.es.translation = <%- include "./../locales/es.js" %>;
</script> </script>
``` ```
- Include a radiobutton for users could seleect the new language (/views/partials/account.html) - Include a radio button for users to select the new language (/views/partials/account.html)
``` ```
<label class="radio" v-bind:class="{checked: user.prefs_language=='es'}" v-on:click="save_user_language('es')"> <label class="radio" v-bind:class="{checked: user.prefs_language=='es'}" v-on:click="save_user_language('es')">
<input type="radio" id="user-preferences_language" name="language" value="es"><span>Español</span> <input type="radio" id="user-preferences_language" name="language" value="es"><span>Español</span>
......
helpers/mailer.js
View file @ a8b8e36a
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
const config = require('config'); const config = require('config');
const nodemailer = require('nodemailer'); const nodemailer = require('nodemailer');
const swig = require('swig');
//var AWS = require('aws-sdk');
module.exports = { module.exports = {
sendMail: (to_email, subject, body, options) => { sendMail: (to_email, subject, body, options) => {
...@@ -24,14 +22,9 @@ module.exports = { ...@@ -24,14 +22,9 @@ module.exports = {
plaintext+="\n"+options.action.link+"\n\n"; plaintext+="\n"+options.action.link+"\n\n";
} }
const htmlText = swig.renderFile('./views/emails/action.html', {
text: body.replace(/(?:\n)/g, '<br />'),
options: options
});
if (config.get('mail_provider') === 'console') { if (config.get('mail_provider') === 'console') {
console.log("Email: to " + to_email + " in production.\nreply_to: " + reply_to + "\nsubject: " + subject + "\nbody: \n" + htmlText + "\n\n plaintext:\n" + plaintext); console.log("Email: to " + to_email + " in production.\nreply_to: " + reply_to + "\nsubject: " + subject + "\nbody: \n" + plaintext + "\n\n plaintext:\n" + plaintext);
} else if (config.get('mail_provider') === 'smtp') { } else if (config.get('mail_provider') === 'smtp') {
let transporter; let transporter;
...@@ -55,14 +48,12 @@ module.exports = { ...@@ -55,14 +48,12 @@ module.exports = {
}); });
} }
transporter.sendMail({ transporter.sendMail({
from: from, from: from,
replyTo: reply_to, replyTo: reply_to,
to: to_email, to: to_email,
subject: subject, subject: subject,
text: plaintext, text: plaintext
html: htmlText,
}, function(err, info) { }, function(err, info) {
if (err) { if (err) {
console.error("Error sending email:", err); console.error("Error sending email:", err);
......
package.json
View file @ a8b8e36a
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"cheerio": "0.22.0", "cheerio": "0.22.0",
"config": "1.25.1", "config": "1.25.1",
"cookie-parser": "~1.4.3", "cookie-parser": "~1.4.3",
"ejs": "3.1.5",
"execSync": "latest", "execSync": "latest",
"express": "^4.16.4", "express": "^4.16.4",
"file-type": "^7.6.0", "file-type": "^7.6.0",
...@@ -42,7 +43,6 @@ ...@@ -42,7 +43,6 @@
"serve-static": "^1.13.1", "serve-static": "^1.13.1",
"slug": "^1.1.0", "slug": "^1.1.0",
"sqlite3": "^4.0.0", "sqlite3": "^4.0.0",
"swig": "1.4.2",
"umzug": "^2.1.0", "umzug": "^2.1.0",
"underscore": "1.8.3", "underscore": "1.8.3",
"uuid": "^3.2.1", "uuid": "^3.2.1",
......
public/javascripts/backend.js
View file @ a8b8e36a
...@@ -59,9 +59,6 @@ function load_resource(method, path, data, on_success, on_error, on_progress) { ...@@ -59,9 +59,6 @@ function load_resource(method, path, data, on_success, on_error, on_progress) {
if (channel_id) { if (channel_id) {
req.setRequestHeader("X-Spacedeck-Channel", channel_id); req.setRequestHeader("X-Spacedeck-Channel", channel_id);
} }
if (csrf_token) {
req.setRequestHeader("X-csrf-token", csrf_token);
}
try { try {
if (data) { if (data) {
......
routes/api/users.js
View file @ a8b8e36a
...@@ -11,7 +11,6 @@ var importer = require('../../helpers/importer'); ...@@ -11,7 +11,6 @@ var importer = require('../../helpers/importer');
var bcrypt = require('bcryptjs'); var bcrypt = require('bcryptjs');
var crypto = require('crypto'); var crypto = require('crypto');
var swig = require('swig');
var async = require('async'); var async = require('async');
var _ = require('underscore'); var _ = require('underscore');
var fs = require('fs'); var fs = require('fs');
......
routes/root.js
View file @ a8b8e36a
...@@ -15,7 +15,7 @@ const Op = Sequelize.Op; ...@@ -15,7 +15,7 @@ const Op = Sequelize.Op;
const uuidv4 = require('uuid/v4'); const uuidv4 = require('uuid/v4');
router.get('/', (req, res) => { router.get('/', (req, res) => {
res.render('index', { title: 'Spaces' }); res.render('index', { config:config, user:req.user });
}); });
router.get('/ping', (req, res) => { router.get('/ping', (req, res) => {
...@@ -23,35 +23,35 @@ router.get('/ping', (req, res) => { ...@@ -23,35 +23,35 @@ router.get('/ping', (req, res) => {
}); });
router.get('/spaces', (req, res) => { router.get('/spaces', (req, res) => {
res.render('spacedeck', { title: 'Spaces' }); res.render('spacedeck', { config:config, user:req.user });
}); });
router.get('/not_found', (req, res) => { router.get('/not_found', (req, res) => {
res.render('not_found', { title: 'Spaces' }); res.render('not_found', {});
}); });
router.get('/confirm/:token', (req, res) => { router.get('/confirm/:token', (req, res) => {
res.render('spacedeck', { title: 'Space' }); res.render('spacedeck', { config:config, user:req.user });
}); });
router.get('/folders/:id', (req, res) => { router.get('/folders/:id', (req, res) => {
res.render('spacedeck', {}); res.render('spacedeck', { config:config, user:req.user });
}); });
router.get('/signup', (req, res) => { router.get('/signup', (req, res) => {
res.render('spacedeck', {}); res.render('spacedeck', { config:config, user:req.user });
}); });
router.get('/accept/:id', (req, res) => { router.get('/accept/:id', (req, res) => {
res.render('spacedeck', {}); res.render('spacedeck', { config:config, user:req.user });
}); });
router.get('/password-reset', (req, res) => { router.get('/password-reset', (req, res) => {
res.render('spacedeck', { title: 'Signup' }); res.render('spacedeck', { config:config, user:req.user });
}); });
router.get('/password-confirm/:token', (req, res) => { router.get('/password-confirm/:token', (req, res) => {
res.render('spacedeck', { title: 'Signup' }); res.render('spacedeck', { config:config, user:req.user });
}); });
router.get('/de/*', (req, res) => { router.get('/de/*', (req, res) => {
...@@ -69,6 +69,7 @@ router.get('/fr/*', (req, res) => { ...@@ -69,6 +69,7 @@ router.get('/fr/*', (req, res) => {
router.get('/fr', (req, res) => { router.get('/fr', (req, res) => {
res.redirect("/t/fr"); res.redirect("/t/fr");
}); });
router.get('/oc/*', (req, res) => { router.get('/oc/*', (req, res) => {
res.redirect("/t/oc"); res.redirect("/t/oc");
}); });
...@@ -76,6 +77,7 @@ router.get('/oc/*', (req, res) => { ...@@ -76,6 +77,7 @@ router.get('/oc/*', (req, res) => {
router.get('/oc', (req, res) => { router.get('/oc', (req, res) => {
res.redirect("/t/oc"); res.redirect("/t/oc");
}); });
router.get('/en/*', (req, res) => { router.get('/en/*', (req, res) => {
res.redirect("/t/en"); res.redirect("/t/en");
}); });
...@@ -89,27 +91,11 @@ router.get('/account', (req, res) => { ...@@ -89,27 +91,11 @@ router.get('/account', (req, res) => {
}); });
router.get('/login', (req, res) => { router.get('/login', (req, res) => {
res.render('spacedeck'); res.render('spacedeck', { config:config, user:req.user });
}); });
router.get('/logout', (req, res) => { router.get('/logout', (req, res) => {
res.render('spacedeck'); res.render('spacedeck', { config:config, user:req.user });
});
router.get('/contact', (req, res) => {
res.render('public/contact');
});
router.get('/about', (req, res) => {
res.render('public/about');
});
router.get('/terms', (req, res) => {
res.render('public/terms');
});
router.get('/privacy', (req, res) => {
res.render('public/privacy');
}); });
router.get('/t/:id', (req, res) => { router.get('/t/:id', (req, res) => {
...@@ -136,7 +122,7 @@ router.get('/s/:hash', (req, res) => { ...@@ -136,7 +122,7 @@ router.get('/s/:hash', (req, res) => {
} }
} else { } else {
if (req.accepts('text/html')) { if (req.accepts('text/html')) {
res.status(404).render('not_found', { title: 'Page Not Found.' }); res.status(404).render('not_found', {});
} else { } else {
res.status(404).json({}); res.status(404).json({});
} }
...@@ -145,7 +131,7 @@ router.get('/s/:hash', (req, res) => { ...@@ -145,7 +131,7 @@ router.get('/s/:hash', (req, res) => {
}); });
router.get('/spaces/:id', (req, res) => { router.get('/spaces/:id', (req, res) => {
res.render('spacedeck', { title: 'Space' }); res.render('spacedeck', { config:config, user:req.user });
}); });
module.exports = router; module.exports = router;
spacedeck.js
View file @ a8b8e36a
...@@ -16,7 +16,6 @@ const logger = require('morgan'); ...@@ -16,7 +16,6 @@ const logger = require('morgan');
const cookieParser = require('cookie-parser'); const cookieParser = require('cookie-parser');
const bodyParser = require('body-parser'); const bodyParser = require('body-parser');
const swig = require('swig');
const i18n = require('i18n-2'); const i18n = require('i18n-2');
const helmet = require('helmet'); const helmet = require('helmet');
...@@ -40,16 +39,7 @@ i18n.expressBind(app, { ...@@ -40,16 +39,7 @@ i18n.expressBind(app, {
devMode: (app.get('env') == 'development') devMode: (app.get('env') == 'development')
}); });
swig.setDefaults({ app.set('view engine', 'ejs');
varControls: ["[[", "]]"] // otherwise it's not compatible with vue.js
});
swig.setFilter('cdn', function(input, idx) {
return input;
});
app.engine('html', swig.renderFile);
app.set('view engine', 'html');
if (isProduction) { if (isProduction) {
app.set('views', path.join(__dirname, 'build', 'views')); app.set('views', path.join(__dirname, 'build', 'views'));
...@@ -114,7 +104,6 @@ if (config.get('storage_local_path')) { ...@@ -114,7 +104,6 @@ if (config.get('storage_local_path')) {
//app.use(require('./middlewares/404')); //app.use(require('./middlewares/404'));
if (app.get('env') == 'development') { if (app.get('env') == 'development') {
app.set('view cache', false); app.set('view cache', false);
swig.setDefaults({cache: false});
} else { } else {
app.use(require('./middlewares/500')); app.use(require('./middlewares/500'));
} }
......
views/artifact_list.html deleted 100644 → 0
View file @ b4f0fa16
<html>
<body>
<h2>[[space.name]]</h2>
<table class="table table-striped" border=1>
<tr>
<th>created</th>
<th>updated</th>
<th>filetype</th>
<th>filename</th>
<th>preview</th>
</tr>
{% for a in space.artifacts %}
<tr>
<td>[[ a.created_at | date('d.m.Y H:i') ]] by [[ a.user.email ]][[ a.editor_name ]]</td>
<td>[[ a.updated_at | date('d.m.Y H:i') ]] by [[ a.update_user.email ]][[ a.last_update_editor_name ]]</td>
<td>[[ a.mime ]]</td>
<td>{% if a.payload_uri %}<a href="[[a.payload_uri]]">[[ a.filename ]]</a>{% endif %}</td>
<td>[[ a.description ]]</td>
</tr>
{% endfor %}
</table>
</body>
</html>
views/emails/action.html deleted 100644 → 0
View file @ b4f0fa16
[[ text | safe ]]
{% if options.message %}
<p>
<i>[[options.message]]</i>
</p>
{% endif %}
{% if options.action %}<br><br>
<a href="[[options.action.link]]" target="_blank">[[options.action.name]]</a><br>
{% endif %}
views/error.ejs 0 → 100644
View file @ a8b8e36a
<%- include('layouts/outer-header') -%>
<h1><%= message %></h1>
<h2><%= error.status %></h2>
<pre><%= error.stack %></pre>
<%- include('layouts/outer-footer') -%>
views/error.html deleted 100644 → 0
View file @ b4f0fa16
<h1>[[ message ]]</h1>
<h2>[[ error.status ]]</h2>
<pre>[[ error.stack ]]</pre>
views/facebook.html deleted 100644 → 0
View file @ b4f0fa16
<!DOCTYPE html>
<html>
<head>
<title>[[space.name]]</title>
<meta charset="utf-8" />
<meta property="og:title" content="[[space.name]]" />
<meta property="og:description" content="" />
<meta property="og:updated_time" content="[[space.updated_at.getTime()]]" />
<meta property="og:type" content="website" />
<meta property="og:image" content="[[space.thumbnail_url]]" />
</head>
<body>
<h1>[[space.name]]</h1>
{% for a in space.artifacts %}
<tr>
<td>[[ a.mime ]]</td>
<td>[[ a.description | striptags ]]</td>
<td>{% if a.payload_uri %}<a href="[[ a.payload_uri ]]">download</a>{% endif %}</td>
</tr>
{% endfor %}
</body>
</html>
views/index.html → views/index.ejs
View file @ a8b8e36a
{% extends 'layouts/outer.html' %} <%- include('layouts/outer-header') %>
{% block title %}Spacedeck{% endblock %}
{% block content %}
<div id="landing"> <div id="landing">
<section> <section>
<h1>Work Together, Visually.</h1> <h1>Work Together, Visually.</h1>
...@@ -30,5 +25,4 @@ ...@@ -30,5 +25,4 @@
</p> </p>
</section> </section>
</div> </div>
<%- include('layouts/outer-footer') %>
{% endblock %}
views/layouts/outer-footer.ejs 0 → 100644
View file @ a8b8e36a
<div class="footer">
<p>
<div class="col-xs-6">
&copy; 2020 <a href="https://mntre.com">MNT Research GmbH</a>, Fehlerstr. 8, 12161 Berlin, Germany<br>
&copy; 2011–2020 Spacedeck GmbH (in liquidation)<br>
Source Code: <a href="https://github.com/mntmn/spacedeck-open">https://github.com/mntmn/spacedeck-open</a>
<br>
Font: <a href="https://rsms.me/inter/">Inter by rsms</a>
</div>
</p>
</div>
</body>
</html>
views/layouts/outer.html → views/layouts/outer-header.ejs
View file @ a8b8e36a
...@@ -2,49 +2,28 @@ ...@@ -2,49 +2,28 @@
<html class="no-js"> <html class="no-js">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Spacedeck Open – {% block title %}{% endblock %}</title> <title>Spacedeck Open</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<link href="[[ '/images/favicon.png' | cdn ]]" rel="icon" type="image/x-icon" /> <link href="/images/favicon.png" rel="icon" type="image/x-icon" />
<link rel="stylesheet" href="/stylesheets/style.css">
<link rel="stylesheet" href="[[ '/stylesheets/style.css' | cdn ]]">
<script> var csrf_token = '[[ csrf_token ]]'; </script>
<!--script src="[[ '/javascripts/jquery-2.1.4.min.js' | cdn ]]"></script-->
</head> </head>
<body> <body>
<header id="landing-header" class="header"> <header id="landing-header" class="header">
<div class="header-left"> <div class="header-left">
<a class="btn btn-transparent btn-nude" href="[[config.endpoint]]/"><img src="[[ '/images/sd6-logo-black.svg' | cdn ]]" width="190"></a> <a class="btn btn-transparent btn-nude" href="<%= config.endpoint %>/"><img src="/images/sd6-logo-black.svg" width="190"></a>
</div> </div>
<div class="header-right pull-right"> <div class="header-right pull-right">
{% if !user %} <% if (!user) { %>
<a class="btn btn-md btn-dark btn-round" href="/login">[[__("login")]]</a> <a class="btn btn-md btn-dark btn-round" href="/login"><%=__("login")%></a>
<a class="btn btn-md btn-dark btn-round" href="/signup">[[__("signup")]]</a> <a class="btn btn-md btn-dark btn-round" href="/signup"><%=__("signup")%></a>
{% else %} <% } else { %>
<a class="btn btn-md btn-dark btn-round" href="/spaces">[[__("spaces")]]</a> <a class="btn btn-md btn-dark btn-round" href="/spaces"><%=__("spaces")%></a>
<a class="btn btn-md btn-dark btn-round" href="/logout">[[__("logout")]]</a> <a class="btn btn-md btn-dark btn-round" href="/logout"><%=__("logout")%></a>
{% endif %} <% } %>
</div> </div>
</header> </header>
{% block content %}{% endblock %}
<div class="footer">
<p>
<div class="col-xs-6">
&copy; 2020 <a href="https://mntre.com">MNT Research GmbH</a>, Fehlerstr. 8, 12161 Berlin, Germany<br>
&copy; 2011–2019 Spacedeck GmbH (in liquidation)<br>
Source Code: <a href="https://github.com/mntmn/spacedeck-open">https://github.com/mntmn/spacedeck-open</a>
<br>
Font: <a href="https://rsms.me/inter/">Inter by rsms</a>
</div>
</p>
</div>
</body>
</html>
views/not_found.html → views/not_found.ejs
View file @ a8b8e36a
{% extends 'layouts/outer.html' %}
{% block title %}[[ __("not_found") ]]{% endblock %}
{% block content %}
<div id="landing" style="padding-top:200px;margin:auto;width:300px;"> <div id="landing" style="padding-top:200px;margin:auto;width:300px;">
<h1>[[__("not_found")]]</h1> <h1><%=__("not_found")%></h1>
</div> </div>
{% endblock %}
views/partials/account.html
View file @ a8b8e36a
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
<div class="dialog-freestanding dialog in" v-if="active_view == 'account' && user" v-cloak> <div class="dialog-freestanding dialog in" v-if="active_view == 'account' && user" v-cloak>
<div class="dialog-tabs" style="margin:auto"> <div class="dialog-tabs" style="margin:auto">
<div class="dialog-tab" v-bind:class="{open:account=='profile'}" v-on:click="account='profile'"><span>[[__("profile_caption")]]</span></div> <div class="dialog-tab" v-bind:class="{open:account=='profile'}" v-on:click="account='profile'"><span><%=__("profile_caption")%></span></div>
<div class="dialog-tab" v-bind:class="{open:account=='language'}" v-on:click="account='language'"><span>[[__("language_caption")]]</span></div> <div class="dialog-tab" v-bind:class="{open:account=='language'}" v-on:click="account='language'"><span><%=__("language_caption")%></span></div>
<div class="dialog-tab" v-bind:class="{open:account=='notifications'}" v-on:click="account='notifications'"><span>[[__("notifications_caption")]]</span></div> <div class="dialog-tab" v-bind:class="{open:account=='notifications'}" v-on:click="account='notifications'"><span><%=__("notifications_caption")%></span></div>
<div class="dialog-tab" v-bind:class="{open:account=='password'}" v-on:click="account='password'"><span>[[__("password_caption")]]</span></div> <div class="dialog-tab" v-bind:class="{open:account=='password'}" v-on:click="account='password'"><span><%=__("password_caption")%></span></div>
<div class="dialog-tab" v-bind:class="{open:account=='terminate'}" v-on:click="account='terminate'"><span>[[__("terminate_caption")]]</span></div> <div class="dialog-tab" v-bind:class="{open:account=='terminate'}" v-on:click="account='terminate'"><span><%=__("terminate_caption")%></span></div>
</div> </div>
<div class="dialog-section text-left"> <div class="dialog-section text-left">
...@@ -44,11 +44,11 @@ ...@@ -44,11 +44,11 @@
<div class="form-group"> <div class="form-group">
<label class="file btn btn-md btn-darken" style="margin-right: 5px;"> <label class="file btn btn-md btn-darken" style="margin-right: 5px;">
<input type="file" v-on:change="save_user_avatar_image(this)"> <input type="file" v-on:change="save_user_avatar_image(this)">
<span v-if="!uploading_avatar">[[__("upload_avatar")]]</span> <span v-if="!uploading_avatar"><%=__("upload_avatar")%></span>
<span v-if="uploading_avatar">[[__("uploading_avatar")]]</span> <span v-if="uploading_avatar"><%=__("uploading_avatar")%></span>
</label> </label>
<p class="message">[[__("avatar_dimensions")]]</p> <p class="message"><%=__("avatar_dimensions")%></p>
</div> </div>
</div> </div>
</div> </div>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="label" >[[__("profile_name")]]</label> <label class="label" ><%=__("profile_name")%></label>
<input type="text" id="user-nickname" <input type="text" id="user-nickname"
pattern=".{3,}" pattern=".{3,}"
required title="3 characters minimum" required title="3 characters minimum"
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="label">[[__("profile_email")]]</label> <label class="label"><%=__("profile_email")%></label>
<input <input
type="email" type="email"
id="new-email" id="new-email"
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<label class="checkbox" <label class="checkbox"
v-bind:class="{checked: user.prefs_email_notifications}" v-bind:class="{checked: user.prefs_email_notifications}"
v-on:click="account_save_user_notifications(!user.prefs_email_notifications);"> v-on:click="account_save_user_notifications(!user.prefs_email_notifications);">
<span>[[__('notifications_option_chat')]]</span> <span><%=__('notifications_option_chat')%></span>
</label> </label>
</div> </div>
</div> </div>
...@@ -130,15 +130,15 @@ ...@@ -130,15 +130,15 @@
<h4>Change Password</h4> <h4>Change Password</h4>
<div class="modal-section labels-inline"> <div class="modal-section labels-inline">
<div class="form-group"> <div class="form-group">
<label class="label">[[__("current_password")]]</label> <label class="label"><%=__("current_password")%></label>
<input id="current-password" class="input input-white no-b" v-model="password_change_current" type="password"> <input id="current-password" class="input input-white no-b" v-model="password_change_current" type="password">
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="label">[[__("new_password")]]</label> <label class="label"><%=__("new_password")%></label>
<input id="new-password" class="input input-white no-b" v-model="password_change_new" type="password"> <input id="new-password" class="input input-white no-b" v-model="password_change_new" type="password">
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="label">[[__("verify_password")]]</label> <label class="label"><%=__("verify_password")%></label>
<input id="new-password-confirmation" class="input input-white no-b" v-model="password_change_new_confirmation" type="password"> <input id="new-password-confirmation" class="input input-white no-b" v-model="password_change_new_confirmation" type="password">
</div> </div>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<button <button
class="btn btn-dark btn-md" class="btn btn-dark btn-md"
v-on:click="save_user_password(password_change_current, password_change_new, password_change_new_confirmation);" > v-on:click="save_user_password(password_change_current, password_change_new, password_change_new_confirmation);" >
[[__("change_password")]] <%=__("change_password")%>
</button> </button>
</div> </div>
</div> </div>
...@@ -158,14 +158,14 @@ ...@@ -158,14 +158,14 @@
<h4>Terminate Account</h4> <h4>Terminate Account</h4>
<div class="modal-section labels-inline"> <div class="modal-section labels-inline">
<div class="form-group"> <div class="form-group">
<label class="label">[[__("current_password")]]</label> <label class="label"><%=__("current_password")%></label>
<input v-model="account_remove_password" class="input input-white no-b" type="password"> <input v-model="account_remove_password" class="input input-white no-b" type="password">
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="label">[[__("terminate_reason")]]</label> <label class="label"><%=__("terminate_reason")%></label>
<textarea class="input input-white no-b" v-model="account_remove_feedback"></textarea> <textarea class="input input-white no-b" v-model="account_remove_feedback"></textarea>
<p class="message">[[__("terminate_reason_caption")]]</p> <p class="message"><%=__("terminate_reason_caption")%></p>
</div> </div>
</div> </div>
......
views/partials/folders.html
View file @ a8b8e36a
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<a class="btn btn-dark btn-md btn-round btn-icon" href="/spaces"> <a class="btn btn-dark btn-md btn-round btn-icon" href="/spaces">
<span class="icon icon-svg icon-sd6"></span> <span class="icon icon-svg icon-sd6"></span>
</a> </a>
<button v-if="logged_in && (active_space_role == 'editor' || active_space_role == 'admin')" class="btn btn-dark btn-md btn-round" v-on:click="create_space('space')">[[ __('create_space') ]]</button> <button v-if="logged_in && (active_space_role == 'editor' || active_space_role == 'admin')" class="btn btn-dark btn-md btn-round" v-on:click="create_space('space')"><%= __('create_space') %></button>
<button v-if="logged_in && (active_space_role == 'editor' || active_space_role == 'admin')" class="btn btn-stroke-darken btn-md btn-round" v-on:click="create_space('folder')"> <button v-if="logged_in && (active_space_role == 'editor' || active_space_role == 'admin')" class="btn btn-stroke-darken btn-md btn-round" v-on:click="create_space('folder')">
<span>[[ __('create_folder') ]]</span> <span><%= __('create_folder') %></span>
</button> </button>
<label class="relative compact-hidden" v-if="logged_in"> <label class="relative compact-hidden" v-if="logged_in">
...@@ -13,33 +13,33 @@ ...@@ -13,33 +13,33 @@
<input id="folder-search" <input id="folder-search"
type="search" name="search" type="search" name="search"
style="padding-left: 40px !important; margin-right: 10px;" style="padding-left: 40px !important; margin-right: 10px;"
placeholder="[[ __('search') ]]" placeholder="<%= __('search') %>"
class="input input-md input-white input-round no-b w-2" class="input input-md input-white input-round no-b w-2"
v-model="folder_spaces_search" v-on:change="search_spaces"> v-model="folder_spaces_search" v-on:change="search_spaces">
</label> </label>
<div class="dropdown top light m-r-20 compact-hidden" v-bind:class="{open : active_dropdown=='folder_sorting'}" v-if="logged_in"> <div class="dropdown top light m-r-20 compact-hidden" v-bind:class="{open : active_dropdown=='folder_sorting'}" v-if="logged_in">
<button class="btn btn-sm btn-nude" v-on:click="activate_dropdown('folder_sorting')"> <button class="btn btn-sm btn-nude" v-on:click="activate_dropdown('folder_sorting')">
<span>[[ __('sort_by') ]]</span>: <span><%= __('sort_by') %></span>:
<b v-if="folder_sorting=='updated_at'">[[ __('last_modified') ]]</b> <b v-if="folder_sorting=='updated_at'"><%= __('last_modified') %></b>
<b v-if="folder_sorting=='name'">[[ __('title') ]]</b> <b v-if="folder_sorting=='name'"><%= __('title') %></b>
<b v-if="folder_sorting=='space_type'">[[ __('type') ]]</b> <b v-if="folder_sorting=='space_type'"><%= __('type') %></b>
</button> </button>
<div class="dropdown-menu" role="menu"> <div class="dropdown-menu" role="menu">
<ul class="select-list"> <ul class="select-list">
<li v-bind:class="{checked:folder_sorting=='updated_at'}" <li v-bind:class="{checked:folder_sorting=='updated_at'}"
v-on:click="set_folder_sorting('updated_at',true)"> v-on:click="set_folder_sorting('updated_at',true)">
<span>[[ __('last_modified') ]]</span> <span><%= __('last_modified') %></span>
</li> </li>
<li v-bind:class="{checked:folder_sorting=='name'}" <li v-bind:class="{checked:folder_sorting=='name'}"
v-on:click="set_folder_sorting('name',false)"> v-on:click="set_folder_sorting('name',false)">
<span>[[ __('title') ]]</span> <span><%= __('title') %></span>
</li> </li>
<li v-bind:class="{checked:folder_sorting=='space_type'}" <li v-bind:class="{checked:folder_sorting=='space_type'}"
v-on:click="set_folder_sorting('space_type',false)"> v-on:click="set_folder_sorting('space_type',false)">
<span>[[ __('type') ]]</span> <span><%= __('type') %></span>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -60,21 +60,21 @@ ...@@ -60,21 +60,21 @@
<li v-if="user.team && is_admin(user)"> <li v-if="user.team && is_admin(user)">
<a href="/team"> <a href="/team">
<span class="icon icon-sm icon-user-group"></span> <span class="icon icon-sm icon-user-group"></span>
<span>[[ __('edit_team') ]]</span> <span><%= __('edit_team') %></span>
</a> </a>
</li> </li>
<li> <li>
<a href="/account"> <a href="/account">
<span class="icon icon-sm icon-user"></span> <span class="icon icon-sm icon-user"></span>
<span>[[ __('edit_account') ]]</span> <span><%= __('edit_account') %></span>
</a> </a>
</li> </li>
<li v-on:click="logout()"> <li v-on:click="logout()">
<span> <span>
<span class="icon icon-sm icon-logout"></span> <span class="icon icon-sm icon-logout"></span>
<span>[[ __('log_out') ]]</span> <span><%= __('log_out') %></span>
</span> </span>
</li> </li>
</ul> </ul>
...@@ -104,28 +104,28 @@ ...@@ -104,28 +104,28 @@
</button> </button>
<div class="dropdown-menu" v-if="active_folder && active_folder._id != user.home_folder_id"> <div class="dropdown-menu" v-if="active_folder && active_folder._id != user.home_folder_id">
<ul class="select-list"> <ul class="select-list">
<li><span class="tile-rename" v-on:click="rename_folder(active_folder)">[[__("rename")]]</span></li> <li><span class="tile-rename" v-on:click="rename_folder(active_folder)"><%=__("rename")%></span></li>
<li v-if="active_space_role == 'admin'"><span class="tile-share" v-on:click="activate_access()">[[__("share")]]</span></li> <li v-if="active_space_role == 'admin'"><span class="tile-share" v-on:click="activate_access()"><%=__("share")%></span></li>
</ul> </ul>
</div> </div>
</div> </div>
<div v-if="active_folder._id == user.home_folder_id"> <div v-if="active_folder._id == user.home_folder_id">
<span>[[ __('home') ]]</span> <span><%= __('home') %></span>
</div> </div>
</div> </div>
<div id="folder-empty" v-if="(active_profile_spaces.length == 0)"> <div id="folder-empty" v-if="(active_profile_spaces.length == 0)">
<div> <div>
<p>[[ __('no_spaces_yet') ]]</p> <p><%= __('no_spaces_yet') %></p>
</div> </div>
</div> </div>
<div id="folder-empty" v-if="folder_spaces_filter"> <div id="folder-empty" v-if="folder_spaces_filter">
<div v-if="active_profile_spaces | empty?"> <div v-if="active_profile_spaces | empty?">
<p><b>"{{folder_spaces_filter}}"</b> <br/>[[ __('search_no_results') ]]</p> <p><b>"{{folder_spaces_filter}}"</b> <br/><%= __('search_no_results') %></p>
<button type="button" class="btn btn-md btn-round btn-stroke-darken events" v-on:click=" folder_spaces_filter = ''">[[ __('search_clear') ]]</button> <button type="button" class="btn btn-md btn-round btn-stroke-darken events" v-on:click=" folder_spaces_filter = ''"><%= __('search_clear') %></button>
</div> </div>
</div> </div>
<div id="folder-grid"> <div id="folder-grid">
...@@ -156,8 +156,8 @@ ...@@ -156,8 +156,8 @@
<div class="dropdown-menu" role="menu"> <div class="dropdown-menu" role="menu">
<ul class="select-list"> <ul class="select-list">
<li v-on:click="rename_space(item)"><span><span class="icon icon-sm icon-tag"></span>[[ __('rename') ]]</span></li> <li v-on:click="rename_space(item)"><span><span class="icon icon-sm icon-tag"></span><%= __('rename') %></span></li>
<li v-on:click="delete_space(item)"><span><span class="icon icon-sm icon-trash"></span>[[ __('delete') ]]</span></li> <li v-on:click="delete_space(item)"><span><span class="icon icon-sm icon-trash"></span><%= __('delete') %></span></li>
</ul> </ul>
</div> </div>
</div> </div>
......
views/partials/login.html
View file @ a8b8e36a
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
</div> </div>
<div class="header-right pull-right"> <div class="header-right pull-right">
<a v-if="active_view != 'login'" class="btn btn-md btn-dark btn-round" href="/login">[[__("login")]]</a> <a v-if="active_view != 'login'" class="btn btn-md btn-dark btn-round" href="/login"><%= __("login") %></a>
<a v-if="active_view != 'signup'" class="btn btn-md btn-dark btn-round" href="/signup">[[__("signup")]]</a> <a v-if="active_view != 'signup'" class="btn btn-md btn-dark btn-round" href="/signup"><%= __("signup") %></a>
</div> </div>
</header> </header>
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
<div class="tight"> <div class="tight">
<div class="form-group"> <div class="form-group">
<input class="input" name="email" type="email" required v-model="user_forms_email" placeholder="[[__("email")]]"> <input class="input" name="email" type="email" required v-model="user_forms_email" placeholder="<%=__("email")%>">
</div> </div>
<div class="form-group"> <div class="form-group">
<input class="input" name="password" type="password" required v-model="login_password" placeholder="[[__("password")]]"> <input class="input" name="password" type="password" required v-model="login_password" placeholder="<%=__("password")%>">
</div> </div>
</div> </div>
...@@ -45,15 +45,15 @@ ...@@ -45,15 +45,15 @@
<div id="signup" v-bind:class="{active : active_view == 'signup'}"> <div id="signup" v-bind:class="{active : active_view == 'signup'}">
<div class="content"> <div class="content">
<form v-on:submit="signup_submit($event, user_forms_name, user_forms_email, signup_password, signup_password_confirmation, signup_invite_code)"> <form v-on:submit="signup_submit($event, user_forms_name, user_forms_email, signup_password, signup_password_confirmation, signup_invite_code)">
<h4>[[__("signup")]]</h4> <h4><%=__("signup")%></h4>
<div class="tight"> <div class="tight">
<div class="form-group"> <div class="form-group">
<input class="input" type="email" required id="user-email" v-model="user_forms_email" placeholder="[[__("email")]]" autofocus v-focus> <input class="input" type="email" required id="user-email" v-model="user_forms_email" placeholder="<%=__("email")%>" autofocus v-focus>
</div> </div>
<div class="form-group"> <div class="form-group">
<input class="input" id="user-password" required type="password" v-model="signup_password" placeholder="[[__("password")]]"> <input class="input" id="user-password" required type="password" v-model="signup_password" placeholder="<%=__("password")%>">
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
</div--> </div-->
<button class="btn btn-dark btn-block"> <button class="btn btn-dark btn-block">
<span v-if="!creating_user">[[__("signup")]]</span> <span v-if="!creating_user"><%=__("signup")%></span>
<span v-if="creating_user">[[__("signing_up")]]</span> <span v-if="creating_user"><%=__("signing_up")%></span>
</button> </button>
<div class="center alert alert-danger" style="width:100%;" v-if="signup_error">{{signup_error}}</div> <div class="center alert alert-danger" style="width:100%;" v-if="signup_error">{{signup_error}}</div>
...@@ -90,11 +90,11 @@ ...@@ -90,11 +90,11 @@
<h4>Password Recovery</h4> <h4>Password Recovery</h4>
<div class="tight"> <div class="tight">
<div class="form-group"> <div class="form-group">
<input class="input" type="email" id="user-email" v-model="reset_email" placeholder="[[__("email")]]"> <input class="input" type="email" id="user-email" v-model="reset_email" placeholder="<%=__("email")%>">
</div> </div>
</div> </div>
<div class="text-center alert alert-danger" v-if="password_reset_error">{{password_reset_error}}</div> <div class="text-center alert alert-danger" v-if="password_reset_error">{{password_reset_error}}</div>
<button class="btn btn-dark btn-block" v-on:click="password_reset_submit($event, reset_email)">[[__("reset_password")]]</button> <button class="btn btn-dark btn-block" v-on:click="password_reset_submit($event, reset_email)"><%=__("reset_password")%></button>
</form> </form>
</div> </div>
<div class="content" v-if="password_reset_send==true"> <div class="content" v-if="password_reset_send==true">
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</div> </div>
<div class="text-center alert alert-danger" v-if="password_reset_confirm_error">{{password_reset_confirm_error}}</div> <div class="text-center alert alert-danger" v-if="password_reset_confirm_error">{{password_reset_confirm_error}}</div>
<button class="btn btn-dark btn-block" v-on:click="password_reset_confirm($event, signup_password, signup_password_confirmation)">[[__("save")]]</button> <button class="btn btn-dark btn-block" v-on:click="password_reset_confirm($event, signup_password, signup_password_confirmation)"><%=__("save")%></button>
</form> </form>
</div> </div>
</div> </div>
......
views/partials/meta-folder.html
View file @ a8b8e36a
...@@ -9,23 +9,23 @@ ...@@ -9,23 +9,23 @@
<div style="margin-bottom: 15px; margin-top: 8px" > <div style="margin-bottom: 15px; margin-top: 8px" >
<small> <small>
[[__("created_by")]] <b>{{active_folder.creator.nickname||active_folder.creator.slug}}.</b> <%=__("created_by")%> <b>{{active_folder.creator.nickname||active_folder.creator.slug}}.</b>
<br/>[[__("last_updated")]] <b>{{active_folder.updated_at | date 'MMMM Do YYYY, HH:mm'}}.</b> <br/><%=__("last_updated")%> <b>{{active_folder.updated_at | date 'MMMM Do YYYY, HH:mm'}}.</b>
</small> </small>
</div> </div>
<div v-if="logged_in && user.home_folder_id!=active_folder._id"> <div v-if="logged_in && user.home_folder_id!=active_folder._id">
<button class="btn btn-sm btn-round btn-primary m-r-5" v-on:click="activate_access()"> <button class="btn btn-sm btn-round btn-primary m-r-5" v-on:click="activate_access()">
<span class="icon-label">[[__("share")]]</span> <span class="icon-label"><%=__("share")%></span>
</button> </button>
</div> </div>
</div> </div>
<div class="sidebar-section" v-if="is_pro(user)"> <div class="sidebar-section" v-if="is_pro(user)">
<h5>[[__("history_recently_updated")]]</h5> <h5><%=__("history_recently_updated")%></h5>
<div v-if="active_folder_history_items.length == 0"> <div v-if="active_folder_history_items.length == 0">
[[__("history_recently_empty")]] <%=__("history_recently_empty")%>
</div> </div>
<ul id="updates"> <ul id="updates">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<a v-bind:href="'/spaces/' + item.space._id">{{item.space.name}}</a> <a v-bind:href="'/spaces/' + item.space._id">{{item.space.name}}</a>
<small> <small>
[[__("by")]] <%=__("by")%>
<span v-for="u in item.users">{{u}}<span v-if="$index < (item.users.length-1)">, </span></span> <span v-for="u in item.users">{{u}}<span v-if="$index < (item.users.length-1)">, </span></span>
</small> </small>
</li> </li>
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
</div> </div>
<div class="sidebar-section" v-if="!is_pro(user)"> <div class="sidebar-section" v-if="!is_pro(user)">
<h5>[[__("history_recently_updated")]]</h5> <h5><%=__("history_recently_updated")%></h5>
<p> <p>
[[__("pro_ad_history_headline")]] <%=__("pro_ad_history_headline")%>
</p> </p>
<p> <p>
......
Supports Markdown
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal