undoing some more url-translations

README.md

@@ -142,10 +142,10 @@ $ npm start
 
 Now just use the reset password feature to set a password.
 
- - Go to `http://localhost:3000/logg-inn/forgot/`
+ - Go to `http://localhost:3000/login/forgot/`
  - Submit your email address and wait a second.
  - Go check your email and get the reset link.
- - `http://localhost:3000/logg-inn/reset/:email/:token/`
+ - `http://localhost:3000/login/reset/:email/:token/`
  - Set a new password.
 
 Login. Customize. Enjoy.

layouts/default.jade

@@ -29,7 +29,7 @@ html
                 i.fa.fa-user
                 |  #{user.username}
             else
-              li: a(href='/logg-inn/')
+              li: a(href='/login/')
                 i.fa.fa-user
                 |  Logg inn
 

public/views/account/verification/index.js

@@ -6,7 +6,7 @@
   app = app || {};
 
   app.Verify = Backbone.Model.extend({
-    url: '/account/verifisering/',
+    url: '/account/verification/',
     defaults: {
       success: false,
       errors: [],

public/views/login/forgot/index.js

@@ -6,7 +6,7 @@
   app = app || {};
 
   app.Forgot = Backbone.Model.extend({
-    url: '/logg-inn/forgot/',
+    url: '/login/forgot/',
     defaults: {
       success: false,
       errors: [],

public/views/login/index.js

@@ -6,7 +6,7 @@
   app = app || {};
 
   app.Login = Backbone.Model.extend({
-    url: '/logg-inn/',
+    url: '/login/',
     defaults: {
       errors: [],
       errfor: {},

public/views/login/reset/index.js

@@ -16,7 +16,7 @@
       confirm: ''
     },
     url: function() {
-      return '/logg-inn/reset/'+ this.get('email') +'/'+ this.id +'/';
+      return '/login/reset/'+ this.get('email') +'/'+ this.id +'/';
     }
   });
 

public/views/signup/index.js

@@ -6,7 +6,7 @@
   app = app || {};
 
   app.Signup = Backbone.Model.extend({
-    url: '/registrering/',
+    url: '/signup/',
     defaults: {
       errors: [],
       errfor: {},

public/views/signup/social.js

@@ -6,7 +6,7 @@
   app = app || {};
 
   app.Signup = Backbone.Model.extend({
-    url: '/registrering/sosiale-medier/',
+    url: '/signup/social/',
     defaults: {
       errors: [],
       errfor: {},

routes.js

@@ -15,7 +15,7 @@ function ensureAuthenticated(req, res, next) {
     req.app.utility.error('routes.ensureAuthenticated: No session!')
   }
 
-  res.redirect('/logg-inn/');
+  res.redirect('/login/');
 }
 
 function ensureAdmin(req, res, next) {
@@ -43,43 +43,43 @@ exports = module.exports = function(app, passport) {
   app.post('/contact/', require('./views/contact/index').sendMessage);
 
   //sign up
-  app.get('/registrering/', require('./views/signup/index').init);
-  app.post('/registrering/', require('./views/signup/index').signup);
+  app.get('/signup/', require('./views/signup/index').init);
+  app.post('/signup/', require('./views/signup/index').signup);
 
   //social sign up
-  app.post('/registrering/social/', require('./views/signup/index').signupSocial);
-  app.get('/registrering/twitter/', passport.authenticate('twitter', { callbackURL: '/registrering/twitter/callback/' }));
-  app.get('/registrering/twitter/callback/', require('./views/signup/index').signupTwitter);
-  app.get('/registrering/github/', passport.authenticate('github', { callbackURL: '/registrering/github/callback/', scope: ['user:email'] }));
-  app.get('/registrering/github/callback/', require('./views/signup/index').signupGitHub);
-  app.get('/registrering/facebook/', passport.authenticate('facebook', { callbackURL: '/registrering/facebook/callback/', scope: ['email'] }));
-  app.get('/registrering/facebook/callback/', require('./views/signup/index').signupFacebook);
-  app.get('/registrering/google/', passport.authenticate('google', { callbackURL: '/registrering/google/callback/', scope: ['profile email'] }));
-  app.get('/registrering/google/callback/', require('./views/signup/index').signupGoogle);
-  app.get('/registrering/tumblr/', passport.authenticate('tumblr', { callbackURL: '/registrering/tumblr/callback/' }));
-  app.get('/registrering/tumblr/callback/', require('./views/signup/index').signupTumblr);
-
-  //logg-inn/out
-  app.get('/logg-inn/', require('./views/login/index').init);
-  app.post('/logg-inn/', require('./views/login/index').login);
-  app.get('/logg-inn/forgot/', require('./views/login/forgot/index').init);
-  app.post('/logg-inn/forgot/', require('./views/login/forgot/index').send);
-  app.get('/logg-inn/reset/', require('./views/login/reset/index').init);
-  app.get('/logg-inn/reset/:email/:token/', require('./views/login/reset/index').init);
-  app.put('/logg-inn/reset/:email/:token/', require('./views/login/reset/index').set);
+  app.post('/signup/social/', require('./views/signup/index').signupSocial);
+  app.get('/signup/twitter/', passport.authenticate('twitter', { callbackURL: '/signup/twitter/callback/' }));
+  app.get('/signup/twitter/callback/', require('./views/signup/index').signupTwitter);
+  app.get('/signup/github/', passport.authenticate('github', { callbackURL: '/signup/github/callback/', scope: ['user:email'] }));
+  app.get('/signup/github/callback/', require('./views/signup/index').signupGitHub);
+  app.get('/signup/facebook/', passport.authenticate('facebook', { callbackURL: '/signup/facebook/callback/', scope: ['email'] }));
+  app.get('/signup/facebook/callback/', require('./views/signup/index').signupFacebook);
+  app.get('/signup/google/', passport.authenticate('google', { callbackURL: '/signup/google/callback/', scope: ['profile email'] }));
+  app.get('/signup/google/callback/', require('./views/signup/index').signupGoogle);
+  app.get('/signup/tumblr/', passport.authenticate('tumblr', { callbackURL: '/signup/tumblr/callback/' }));
+  app.get('/signup/tumblr/callback/', require('./views/signup/index').signupTumblr);
+
+  //login/out
+  app.get('/login/', require('./views/login/index').init);
+  app.post('/login/', require('./views/login/index').login);
+  app.get('/login/forgot/', require('./views/login/forgot/index').init);
+  app.post('/login/forgot/', require('./views/login/forgot/index').send);
+  app.get('/login/reset/', require('./views/login/reset/index').init);
+  app.get('/login/reset/:email/:token/', require('./views/login/reset/index').init);
+  app.put('/login/reset/:email/:token/', require('./views/login/reset/index').set);
   app.get('/logout/', require('./views/logout/index').init);
 
   //social login
-  app.get('/logg-inn/twitter/', passport.authenticate('twitter', { callbackURL: '/logg-inn/twitter/callback/' }));
-  app.get('/logg-inn/twitter/callback/', require('./views/login/index').loginTwitter);
-  app.get('/logg-inn/github/', passport.authenticate('github', { callbackURL: '/logg-inn/github/callback/' }));
-  app.get('/logg-inn/github/callback/', require('./views/login/index').loginGitHub);
-  app.get('/logg-inn/facebook/', passport.authenticate('facebook', { callbackURL: '/logg-inn/facebook/callback/' }));
-  app.get('/logg-inn/facebook/callback/', require('./views/login/index').loginFacebook);
-  app.get('/logg-inn/google/', passport.authenticate('google', { callbackURL: '/logg-inn/google/callback/', scope: ['profile email'] }));
-  app.get('/logg-inn/google/callback/', require('./views/login/index').loginGoogle);
-  app.get('/logg-inn/tumblr/', passport.authenticate('tumblr', { callbackURL: '/logg-inn/tumblr/callback/', scope: ['profile email'] }));
-  app.get('/logg-inn/tumblr/callback/', require('./views/login/index').loginTumblr);
+  app.get('/login/twitter/', passport.authenticate('twitter', { callbackURL: '/login/twitter/callback/' }));
+  app.get('/login/twitter/callback/', require('./views/login/index').loginTwitter);
+  app.get('/login/github/', passport.authenticate('github', { callbackURL: '/login/github/callback/' }));
+  app.get('/login/github/callback/', require('./views/login/index').loginGitHub);
+  app.get('/login/facebook/', passport.authenticate('facebook', { callbackURL: '/login/facebook/callback/' }));
+  app.get('/login/facebook/callback/', require('./views/login/index').loginFacebook);
+  app.get('/login/google/', passport.authenticate('google', { callbackURL: '/login/google/callback/', scope: ['profile email'] }));
+  app.get('/login/google/callback/', require('./views/login/index').loginGoogle);
+  app.get('/login/tumblr/', passport.authenticate('tumblr', { callbackURL: '/login/tumblr/callback/', scope: ['profile email'] }));
+  app.get('/login/tumblr/callback/', require('./views/login/index').loginTumblr);
 
   //admin
   app.all('/admin*', ensureAuthenticated);
@@ -151,9 +151,9 @@ exports = module.exports = function(app, passport) {
   app.get('/account/', require('./views/account/index').init);
 
   //account > verification
-  app.get('/account/verifisering/', require('./views/account/verification/index').init);
-  app.post('/account/verifisering/', require('./views/account/verification/index').resendVerification);
-  app.get('/account/verifisering/:token/', require('./views/account/verification/index').verify);
+  app.get('/account/verification/', require('./views/account/verification/index').init);
+  app.post('/account/verification/', require('./views/account/verification/index').resendVerification);
+  app.get('/account/verification/:token/', require('./views/account/verification/index').verify);
 
   //account > settings
   app.get('/account/settings/', require('./views/account/settings/index').init);

views/account/verification/index.js

@@ -8,7 +8,7 @@ var sendVerificationEmail = function(req, res, options) {
     textPath: 'account/verification/email-text',
     htmlPath: 'account/verification/email-html',
     locals: {
-      verifyURL: req.protocol +'://'+ req.headers.host +'/account/verifisering/' + options.verificationToken + '/',
+      verifyURL: req.protocol +'://'+ req.headers.host +'/account/verification/' + options.verificationToken + '/',
       projectName: req.app.config.projectName
     },
     success: function() {

views/index.jade

@@ -12,9 +12,9 @@ block body
     p.lead
       | Piratpartiets medlemsdatabase
       div
-        a.btn.btn-primary.btn-lg(href='/registrering/') Bli medlem
+        a.btn.btn-primary.btn-lg(href='/signup/') Bli medlem
         |  eller  
-        a.btn.btn-warning.btn-lg(href='/logg-inn/forgot/') Nullstill passord
+        a.btn.btn-warning.btn-lg(href='/login/forgot/') Nullstill passord
       div.clearfix
   div.row
     div.col-sm-4
@@ -28,7 +28,7 @@ block body
         div.panel-body
           h3 Bli medlem
           p At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti.
-          a.btn.btn-default.btn-block(href='/registrering/') Les mer
+          a.btn.btn-default.btn-block(href='/signup/') Les mer
     div.col-sm-4
       div.panel.panel-default
         div.panel-body

views/login/forgot/index.jade

@@ -37,4 +37,4 @@ block body
         button.btn.btn-primary.btn-forgot(type='button') Send Reset
         |<% } %>
         |&nbsp;
-        a.btn.btn-link(href='/logg-inn/') Back to Login
+        a.btn.btn-link(href='/login/') Back to Login

views/login/forgot/index.js

@@ -71,7 +71,7 @@ exports.send = function(req, res, next){
       htmlPath: 'login/forgot/email-html',
       locals: {
         username: user.username,
-        resetLink: req.protocol +'://'+ req.headers.host +'/logg-inn/reset/'+ user.email +'/'+ token +'/',
+        resetLink: req.protocol +'://'+ req.headers.host +'/login/reset/'+ user.email +'/'+ token +'/',
         projectName: req.app.config.projectName
       },
       success: function(message) {},

views/login/index.jade

@@ -21,27 +21,27 @@ block body
               button.close(type='button', data-dismiss='alert') ×
               |#{oauthMessage} 
               b
-                a(href='/registrering/') Sign Up Here
+                a(href='/signup/') Sign Up Here
         div.form-actions
           div.btn-group.btn-group-justified
             if oauthTwitter
-              a.btn.btn-info(href='/logg-inn/twitter/')
+              a.btn.btn-info(href='/login/twitter/')
                 i.fa.fa-twitter.fa-lg
                 |  Twitter
             if oauthGitHub
-              a.btn.btn-info(href='/logg-inn/github/')
+              a.btn.btn-info(href='/login/github/')
                 i.fa.fa-github.fa-lg
                 |  GitHub
             if oauthFacebook
-              a.btn.btn-info(href='/logg-inn/facebook/')
+              a.btn.btn-info(href='/login/facebook/')
                 i.fa.fa-facebook-square.fa-lg
                 |  Facebook
             if oauthGoogle
-              a.btn.btn-info(href='/logg-inn/google/')
+              a.btn.btn-info(href='/login/google/')
                 i.fa.fa-google-plus-square.fa-lg
                 |  Google
             if oauthTumblr
-              a.btn.btn-info(href='/logg-inn/tumblr/')
+              a.btn.btn-info(href='/login/tumblr/')
                 i.fa.fa-tumblr-square.fa-lg
                 |  Tumblr
 
@@ -64,4 +64,4 @@ block body
       div.form-actions
         button.btn.btn-primary.btn-login(type='button') Sign In
         | 
-        a.btn.btn-link(href='/logg-inn/forgot/') Forgot your password?
+        a.btn.btn-link(href='/login/forgot/') Forgot your password?

views/login/index.js

@@ -152,7 +152,7 @@ exports.login = function(req, res) {
 exports.loginTwitter = function(req, res, next) {
     req._passport.instance.authenticate('twitter', function(err, user, info) {
         if (!info || !info.profile) {
-            return res.redirect('/logg-inn/');
+            return res.redirect('/login/');
         }
 
         req.app.db.models.User.findOne({ where: {
@@ -187,7 +187,7 @@ exports.loginTwitter = function(req, res, next) {
 exports.loginGitHub = function(req, res, next) {
     req._passport.instance.authenticate('github', function(err, user, info) {
         if (!info || !info.profile) {
-            return res.redirect('/logg-inn/');
+            return res.redirect('/login/');
         }
 
         req.app.db.models.User.findOne({ where: {
@@ -221,10 +221,10 @@ exports.loginGitHub = function(req, res, next) {
 
 exports.loginFacebook = function(req, res, next) {
     req._passport.instance.authenticate('facebook', {
-        callbackURL: '/logg-inn/facebook/callback/'
+        callbackURL: '/login/facebook/callback/'
     }, function(err, user, info) {
         if (!info || !info.profile) {
-            return res.redirect('/logg-inn/');
+            return res.redirect('/login/');
         }
 
         req.app.db.models.User.findOne({ where: {
@@ -258,10 +258,10 @@ exports.loginFacebook = function(req, res, next) {
 
 exports.loginGoogle = function(req, res, next) {
     req._passport.instance.authenticate('google', {
-        callbackURL: '/logg-inn/google/callback/'
+        callbackURL: '/login/google/callback/'
     }, function(err, user, info) {
         if (!info || !info.profile) {
-            return res.redirect('/logg-inn/');
+            return res.redirect('/login/');
         }
 
         req.app.db.models.User.findOne({ where: {
@@ -295,10 +295,10 @@ exports.loginGoogle = function(req, res, next) {
 
 exports.loginTumblr = function(req, res, next) {
     req._passport.instance.authenticate('tumblr', {
-        callbackURL: '/logg-inn/tumblr/callback/'
+        callbackURL: '/login/tumblr/callback/'
     }, function(err, user, info) {
         if (!info || !info.profile) {
-            return res.redirect('/logg-inn/');
+            return res.redirect('/login/');
         }
 
         if (!info.profile.hasOwnProperty('id')) {

views/login/reset/index.jade

@@ -46,4 +46,4 @@ block body
         button.btn.btn-primary.btn-reset(type='button') Set Password
         |<% } %>
         |&nbsp;
-        a.btn.btn-link(href='/logg-inn/') Back to Login
+        a.btn.btn-link(href='/login/') Back to Login

views/signup/index.jade

@@ -24,26 +24,26 @@ block body
               button.close(type='button', data-dismiss='alert') ×
               |#{oauthMessage} 
               b
-                a(href='/logg-inn/') Logg inn her
+                a(href='/login/') Logg inn her
         div.btn-group.btn-group-justified
           if oauthTwitter
-            a.btn.btn-info(href='/registrering/twitter/')
+            a.btn.btn-info(href='/signup/twitter/')
               i.fa.fa-twitter.fa-lg
               |  Twitter
           if oauthGitHub
-            a.btn.btn-info(href='/registrering/github/')
+            a.btn.btn-info(href='/signup/github/')
               i.fa.fa-github.fa-lg
               |  GitHub
           if oauthFacebook
-            a.btn.btn-info(href='/registrering/facebook/')
+            a.btn.btn-info(href='/signup/facebook/')
               i.fa.fa-facebook-square.fa-lg
               |  Facebook
           if oauthGoogle
-            a.btn.btn-info(href='/registrering/google/')
+            a.btn.btn-info(href='/signup/google/')
               i.fa.fa-google-plus-square.fa-lg
               |  Google
           if oauthTumblr
-            a.btn.btn-info(href='/registrering/tumblr/')
+            a.btn.btn-info(href='/signup/tumblr/')
               i.fa.fa-tumblr-square.fa-lg
               |  Tumblr
     div.col-sm-6.marketing