Permalink
Browse files

Merge branch 'dev' of github.com:dff-solutions/locale-js-editor into dev

  • Loading branch information...
2 parents e6d9c8f + a929bfe commit 4dca77845f0e923f698c3fcc93aa8863e470623f Stephan committed Dec 7, 2012
Showing with 17 additions and 10 deletions.
  1. +5 −1 app/modules/localeEdit/views.js
  2. +2 −2 app/templates/localeedit/overview.html
  3. +6 −3 app/templates/localeedit/upload.html
  4. +4 −4 main.html
View
6 app/modules/localeEdit/views.js
@@ -217,13 +217,17 @@ Views.EditList = Backbone.View.extend({
this.goToPage(this.currentPage -= 1);
},
nextPage: function(){
+ if( (this.currentPage + 1) > (Math.round(this.collection.length / this.pageSize) +1) )
+ {
+ return;
+ }
this.goToPage(this.currentPage += 1);
},
goToStart: function(){
this.goToPage(1);
},
goToEnd: function(){
- this.goToPage((this.collection.length / this.pageSize) +1);
+ this.goToPage(Math.round(this.collection.length / this.pageSize) +1 );
},
changeElementsPerPage:function(pageSize){
console.log('setting page size to:' + Number(pageSize));
View
4 app/templates/localeedit/overview.html
@@ -1,9 +1,9 @@
<div class="container">
<div class="page-header">
- <h1>Locale Edit File Upload</h1>
+ <h1>JS-FILE-OVERVIEW</h1>
</div>
<blockquote>
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus quis lectus metus, at posuere neque. Sed pharetra nibh eget orci convallis at posuere leo convallis. Sed blandit augue vitae augue scelerisque bibendum. Vivamus sit amet libero turpis, non venenatis urna. In blandit, odio convallis suscipit venenatis, ante ipsum cursus augue.
+ <p>This overview shows your uploaded files. You can delete and download the files.
</p>
</blockquote>
<br>
View
9 app/templates/localeedit/upload.html
@@ -2,11 +2,14 @@
<section id="main-section">
<div class="container">
<div class="page-header">
- <h1>Locale Edit File Upload</h1>
+ <h1>JS-FILE-UPLOAD</h1>
</div>
<blockquote>
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus quis lectus metus, at posuere neque. Sed pharetra nibh eget orci convallis at posuere leo convallis. Sed blandit augue vitae augue scelerisque bibendum. Vivamus sit amet libero turpis, non venenatis urna. In blandit, odio convallis suscipit venenatis, ante ipsum cursus augue.
-</p>
+ <p>Choose and upload the the javascript object files. The File will be used for editing.</p>
+
+ <p>Laden die Javascript Object Dateien an dieser Stelle hoch.Diese Dateien dienen als Grundlage für die Bearbeitung.
+ </p>
+
</blockquote>
<br>
<!-- The file upload form used as target for the file upload widget -->
View
8 main.html
@@ -1,9 +1,9 @@
<ul class="nav nav-pills">
- <li class="active"><a href="#index">Upload</a></li>
- <li><a href="#overview">Übersicht</a></li>
- <li><a href="#edit">Editieren</a></li>
- <li class="pull-right" style="margin: 0 60px 0 0;"><a href="logout" data-bypass>LogOut</a></li>
+ <li class="active"><a href="#index">UPLOAD</a></li>
+ <li><a href="#overview">OVERVIEW</a></li>
+ <li><a href="#edit">EDIT</a></li>
+ <li class="pull-right" style="margin: 0 60px 0 0;"><a href="logout" data-bypass>LOGOUT</a></li>
<!-- <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">FrontEnd<b class="caret"></b></a>
<ul class="dropdown-menu">

0 comments on commit 4dca778

Please sign in to comment.