Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bugfix negative authentifizierung fürt zu exception

  • Loading branch information...
commit 9b17065a179072cb1da94ecef47613d955264ed1 1 parent 5265413
Stephan authored
View
21 app/styles/bootstrap.min.css
@@ -914,3 +914,24 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
.show{display:block;}
.invisible{visibility:hidden;}
.affix{position:fixed;}
+
+.shadow_select {
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+ transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+.shadow_select:focus {
+ border-color: rgba(82, 168, 236, 0.8);
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ outline: 0;
+ outline: thin dotted \9;
+ /* IE6-9 */
+
+}
View
2  app/templates/localeedit/editItem.html
@@ -1,6 +1,6 @@
<div class="edit-wrapper-inner container ">
<div class="edit-wrapper-inner row-fluid">
- <div class="pull-left span4 key hero-unit">
+ <div class="pull-left span4 key well">
<span class="label"><%= index %></span>
<span><%= model.get("LocaleKey") %></span>
</div>
View
2  app/templates/localeedit/filter.html
@@ -12,7 +12,7 @@
<span id="prevPage" class="label">< prev</span>
<span id="nextPage" class="label">next > </span>
- <select id="SelElementsPerPage" class="dropdown">
+ <select id="SelElementsPerPage" class="input-small shadow_slect">
<option value="5">5</option>
<option value="10">10</option>
<option value="20">20</option>
View
36 localeEditFileManager.js
@@ -82,22 +82,28 @@ exports.GetUserFiles = function(req, res) {
for (var i in jsOnlyFiles) {
var file = jsOnlyFiles[i];
var statsDone = 0;
-
- fs.stat(dirName+'/' + file, function(err, stats){
-
- jsOnlyFilesWithMetaInfo.push({
- Name: file,
- mtime: stats.mtime,
- size: stats.size
- });
- statsDone +=1;
- if(statsDone === jsOnlyFiles.length){
- doResponse();
- }
- });
-
-
+
+ var stats = fs.statSync(dirName+'/' + file);
+ jsOnlyFilesWithMetaInfo.push({
+ Name: file,
+ mtime: stats.mtime,
+ size: stats.size
+ });
+
+ // fs.stat(dirName+'/' + file, function(err, stats){
+
+ // jsOnlyFilesWithMetaInfo.push({
+ // Name: file,
+ // mtime: stats.mtime,
+ // size: stats.size
+ // });
+ // statsDone +=1;
+ // if(statsDone === jsOnlyFiles.length){
+ // doResponse();
+ // }
+ // });
}
+ doResponse();
});
};
View
5 package.json
@@ -13,7 +13,8 @@
"passport-local": "*",
"ejs": "*",
"jquery-file-upload-middleware": "*",
- "node-linq": "*y",
- "mv": "*"
+ "node-linq": "*",
+ "mv": "*",
+ "connect-flash": "*"
}
}
View
15 server.js
@@ -8,11 +8,17 @@ var connect = require('connect')
, filemanager = require('./localeEditFileManager')
, passport = require('passport')
, util = require('util')
+ , flash = require('connect-flash')
, LocalStrategy = require('passport-local').Strategy;
var users = [
- { id: 1, username: 'admin', password: 'mclaren', email: 'bob@example.com' }
- , { id: 2, username: 'stephan', password: 'mclaren', email: 'joe@example.com' }
+ { id: 1, username: 'admin', password: 'mclaren', email: 'bob@example.com' },
+ { id: 2, username: 'ralf', password: 'mclaren', email: 'bob@example.com' },
+ { id: 3, username: 'felix', password: 'mclaren', email: 'bob@example.com' },
+ { id: 4, username: 'arne', password: 'mclaren', email: 'bob@example.com' },
+ { id: 5, username: 'torben', password: 'mclaren', email: 'bob@example.com' },
+ { id: 6, username: 'björn', password: 'mclaren', email: 'bob@example.com' },
+ { id: 7, username: 'stephan', password: 'mclaren', email: 'joe@example.com' }
];
function findById(id, fn) {
@@ -73,7 +79,7 @@ passport.use(new LocalStrategy(
})
});
}
-));
+));
@@ -92,6 +98,7 @@ app.configure(function(){
// persistent login sessions (recommended).
app.use(passport.initialize());
app.use(passport.session());
+ app.use(flash());
app.use(app.router);
app.use(express.static(__dirname + '/../../public'));
app.use(express.errorHandler({
@@ -233,7 +240,7 @@ function staticRequest (req, res){
app.get('/login', function(req, res){
- res.render('login', { user: req.user, message: '' });
+ res.render('login', { user: req.user, message: 'Login' });
});
app.post('/upload', uploadHandler);
View
41 views/layout.jade
@@ -1,41 +0,0 @@
-!!! 5
-//if lt IE 7
- html.no-js.ie6.oldie(lang='en')
-//if IE 7
- html.no-js.ie7.oldie(lang='en')
-//if IE 8
- html.no-js.ie8.oldie(lang='en')
-//[if gt IE 8]><!
-html.no-js(lang='en')
- //<![end if]
- head
- meta(charset='utf-8')
- meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
- title=title
- meta(name="description", content=description)
- meta(name="author", content=author)
- meta(name="viewport", content='width=device-width, initial-scale=1')
- link(rel='stylesheet', href='/css/style.css')
- //-script(src='js/libs/modernizr-2.0.6.min.js')
- body
- block header
-
- block content
-
- block footer
- footer
- script(src='//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js')
- script
- window.jQuery || document.write('<script src="js/libs/jquery-1.7.1.min.js"><\\/script>')
- //-script(defer, src='js/plugins.js')
- script(defer, src='/js/script.js')
- script(defer, src='/socket.io/socket.io.js')
- script
- var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview'],['_trackPageLoadTime']];
- (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
- g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
- s.parentNode.insertBefore(g,s)}(document,'script'));
- //if lt IE 7
- script(defer, src='//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js')
- script(defer)
- window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
Please sign in to comment.
Something went wrong with that request. Please try again.