Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 4dca77845f0e923f698c3fcc93aa8863e470623f 2 parents e6d9c8f + a929bfe
Stephan straeger authored
6 app/modules/localeEdit/views.js
@@ -217,13 +217,17 @@ Views.EditList = Backbone.View.extend({
217 217 this.goToPage(this.currentPage -= 1);
218 218 },
219 219 nextPage: function(){
  220 + if( (this.currentPage + 1) > (Math.round(this.collection.length / this.pageSize) +1) )
  221 + {
  222 + return;
  223 + }
220 224 this.goToPage(this.currentPage += 1);
221 225 },
222 226 goToStart: function(){
223 227 this.goToPage(1);
224 228 },
225 229 goToEnd: function(){
226   - this.goToPage((this.collection.length / this.pageSize) +1);
  230 + this.goToPage(Math.round(this.collection.length / this.pageSize) +1 );
227 231 },
228 232 changeElementsPerPage:function(pageSize){
229 233 console.log('setting page size to:' + Number(pageSize));
4 app/templates/localeedit/overview.html
... ... @@ -1,9 +1,9 @@
1 1 <div class="container">
2 2 <div class="page-header">
3   - <h1>Locale Edit File Upload</h1>
  3 + <h1>JS-FILE-OVERVIEW</h1>
4 4 </div>
5 5 <blockquote>
6   - <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.
  6 + <p>This overview shows your uploaded files. You can delete and download the files.
7 7 </p>
8 8 </blockquote>
9 9 <br>
9 app/templates/localeedit/upload.html
@@ -2,11 +2,14 @@
2 2 <section id="main-section">
3 3 <div class="container">
4 4 <div class="page-header">
5   - <h1>Locale Edit File Upload</h1>
  5 + <h1>JS-FILE-UPLOAD</h1>
6 6 </div>
7 7 <blockquote>
8   - <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.
9   -</p>
  8 + <p>Choose and upload the the javascript object files. The File will be used for editing.</p>
  9 +
  10 + <p>Laden die Javascript Object Dateien an dieser Stelle hoch.Diese Dateien dienen als Grundlage für die Bearbeitung.
  11 + </p>
  12 +
10 13 </blockquote>
11 14 <br>
12 15 <!-- The file upload form used as target for the file upload widget -->
8 main.html
... ... @@ -1,9 +1,9 @@
1 1
2 2 <ul class="nav nav-pills">
3   - <li class="active"><a href="#index">Upload</a></li>
4   - <li><a href="#overview">Übersicht</a></li>
5   - <li><a href="#edit">Editieren</a></li>
6   - <li class="pull-right" style="margin: 0 60px 0 0;"><a href="logout" data-bypass>LogOut</a></li>
  3 + <li class="active"><a href="#index">UPLOAD</a></li>
  4 + <li><a href="#overview">OVERVIEW</a></li>
  5 + <li><a href="#edit">EDIT</a></li>
  6 + <li class="pull-right" style="margin: 0 60px 0 0;"><a href="logout" data-bypass>LOGOUT</a></li>
7 7 <!-- <li class="dropdown">
8 8 <a class="dropdown-toggle" data-toggle="dropdown" href="#">FrontEnd<b class="caret"></b></a>
9 9 <ul class="dropdown-menu">

0 comments on commit 4dca778

Please sign in to comment.
Something went wrong with that request. Please try again.