Commit 0888c32d authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merge branch 'master' into files-blockconfig

parents d8415dde 74165d9d
......@@ -46,6 +46,8 @@ $enc_cannotdeleteblogpost = json_encode(get_string('cannotdeleteblogpost', 'arte
$enc_publish_help = json_encode(get_help_icon('artefact', 'blog', null, null, null, 'publish'));
$limit = ArtefactTypeBlog::pagination;
return <<<EOJAVASCRIPT
var postlist = new TableRenderer(
......@@ -53,7 +55,7 @@ var postlist = new TableRenderer(
'index.json.php',
[undefined, undefined, undefined]
);
postlist.limit = 10;
postlist.limit = $limit;
postlist.rowfunction = function(d, n, gd) {
......
......@@ -26,6 +26,7 @@ function TableRenderer(target, source, columns, options) {
this.rowfunction = function(rowdata, rownumber, data) { return TR({'class': 'r' + (rownumber % 2)}); }
this.updatecallback = function () {};
this.updateOnLoadFlag = false;
this.lastArgs = {};
this.init = function() {
self.table = getElement(target);
......@@ -116,9 +117,8 @@ function TableRenderer(target, source, columns, options) {
}
this.pageChange = function(n) {
self.doupdate({
'offset': ( n - 1 ) * self.limit
});
self.lastArgs.offset = ( n - 1 ) * self.limit;
self.doupdate(self.lastArgs);
}
this.onFirstPage = function () {
......@@ -175,6 +175,7 @@ function TableRenderer(target, source, columns, options) {
if (!request_args) {
request_args = {};
}
self.lastArgs = request_args;
forEach(self.statevars, function(key) {
if (typeof(request_args[key]) == 'undefined' && typeof(self[key]) != 'undefined') {
......@@ -230,16 +231,19 @@ function TableRenderer(target, source, columns, options) {
};
this.goFirstPage = function() {
self.doupdate({'offset': 0});
self.lastArgs.offset = 0;
self.doupdate(self.lastArgs);
};
this.goPrevPage = function() {
if ( self.offset > 0 ) {
if ( self.offset - self.limit < 0 ) {
self.doupdate({'offset': 0});
self.lastArgs.offset = 0;
self.doupdate(self.lastArgs);
}
else {
self.doupdate({'offset': self.offset - self.limit});
self.lastArgs.offset = self.offset - self.limit;
self.doupdate(self.lastArgs);
}
}
else {
......@@ -249,7 +253,8 @@ function TableRenderer(target, source, columns, options) {
this.goNextPage = function() {
if ( self.offset + self.limit < self.count ) {
self.doupdate({'offset': self.offset + self.limit});
self.lastArgs.offset = self.offset + self.limit;
self.doupdate(self.lastArgs);
}
else {
logWarning('Already on the last page (' + self.offset + ', ' + self.limit + ', ' + self.count + ')');
......@@ -257,7 +262,8 @@ function TableRenderer(target, source, columns, options) {
};
this.goLastPage = function() {
self.doupdate({'offset': Math.floor( ( self.count - 1 ) / self.limit) * self.limit});
self.lastArgs.offset = Math.floor( ( self.count - 1 ) / self.limit) * self.limit;
self.doupdate(self.lastArgs);
};
this.updateOnLoad = function() {
......
......@@ -157,6 +157,12 @@ function pieform_element_bytes_i18n() {/*{{{*/
'megabytes' => 'MB',
'invalidvalue' => 'Vrednost mora biti število',
),
'nl.utf8' => array(
'bytes' => 'Bytes',
'kilobytes' => 'Kilobytes',
'megabytes' => 'Megabytes',
'invalidvalue' => 'Waarde moet een getal zijn',
),
);
}/*}}}*/
......
......@@ -170,6 +170,9 @@ function pieform_element_calendar_i18n() {/*{{{*/
'sl.utf8' => array(
'invalidvalue' => 'Datum/čas ni določen pravilno'
),
'nl.utf8' => array(
'invalidvalue' => 'Ongeldige tijd/datum opgegeven'
),
);
}/*}}}*/
......
......@@ -153,6 +153,10 @@ function pieform_element_date_i18n() {/*{{{*/
'or' => 'ali',
'notspecified' => 'Ni določeno'
),
'nl.utf8' => array(
'or' => 'or',
'notspecified' => 'Niet gespecifiëerd'
),
);
}/*}}}*/
......
......@@ -166,6 +166,13 @@ function pieform_element_expiry_i18n() {/*{{{*/
'years' => 'let',
'noenddate' => 'ni zaključnega datuma'
),
'nl.utf8' => array(
'days' => 'Dagen',
'weeks' => 'Weken',
'months' => 'Maanden',
'years' => 'Jaren',
'noenddate' => 'Geen einddatum'
),
);
}/*}}}*/
......
......@@ -57,12 +57,15 @@ function pieform_rule_before_i18n() {/*{{{*/
'ja.utf8' => array(
'before' => 'フィールド「 %s 」の後に設定することはできません'
),
'es.utf8' => array(
'es.utf8' => array(
'before' => 'No puede ser posterior al campo "%s"'
),
'sl.utf8' => array(
'before' => 'To ne sme biti za poljem "%s"'
),
'nl.utf8' => array(
'before' => 'Dit kan niet na het veld "%s" zijn'
),
);
}/*}}}*/
......
......@@ -62,6 +62,9 @@ function pieform_rule_email_i18n() {/*{{{*/
'sl.utf8' => array(
'email' => 'Epoštni naslov je neveljaven'
),
'nl.utf8' => array(
'email' => 'E-mailadres is ongeldig'
),
);
}/*}}}*/
......
......@@ -59,6 +59,9 @@ function pieform_rule_integer_i18n() {/*{{{*/
'sl.utf8' => array(
'integer' => 'Vrednost polja mora biti število'
),
'nl.utf8' => array(
'integer' => 'Dit veld moet een geheel getal (integer) zijn'
),
);
}/*}}}*/
......
......@@ -59,6 +59,9 @@ function pieform_rule_maxlength_i18n() {/*{{{*/
'sl.utf8' => array(
'maxlength' => 'To polje mora biti dolgo največ %d znakov'
),
'nl.utf8' => array(
'maxlength' => 'Dit veld moet minstens %d tekens lang zijn'
),
);
}/*}}}*/
......
......@@ -59,6 +59,9 @@ function pieform_rule_maxvalue_i18n() {/*{{{*/
'sl.utf8' => array(
'maxvalue' => 'Ta vrednost ne sme biti večja od %d'
),
'nl.utf8' => array(
'maxvalue' => 'Deze waarde kan niet groter zijn dan %d'
),
);
}/*}}}*/
......
......@@ -56,6 +56,9 @@ function pieform_rule_minlength_i18n() {/*{{{*/
'sl.utf8' => array(
'minlength' => 'To polje mora biti dolgo vsaj %d znakov',
),
'nl.utf8' => array(
'minlength' => 'Dit veld moet minstens %d tekens lang zijn',
),
);
}/*}}}*/
......
......@@ -59,6 +59,9 @@ function pieform_rule_minvalue_i18n() {/*{{{*/
'sl.utf8' => array(
'minvalue' => 'Ta vrednost ne sme biti manjša od %d'
),
'nl.utf8' => array(
'minvalue' => 'Deze waarde kan niet kleiner zijn dan %d'
),
);
}/*}}}*/
......
......@@ -60,6 +60,9 @@ function pieform_rule_regex_i18n() {/*{{{*/
'sl.utf8' => array(
'regex' => 'To polje ni v veljavni obliki'
),
'nl.utf8' => array(
'regex' => 'Dit veld is niet in een geldige vorm'
),
);
}/*}}}*/
......
......@@ -59,6 +59,9 @@ function pieform_rule_required_i18n() {/*{{{*/
'sl.utf8' => array(
'required' => 'To polje je zahtevano'
),
'nl.utf8' => array(
'required' => 'Dit veld is vereist'
),
);
}/*}}}*/
......
......@@ -67,6 +67,9 @@ function pieform_rule_validateoptions_i18n() {/*{{{*/
'sl.utf8' => array(
'validateoptions' => 'Možnost "%s" je neveljavna'
),
'nl.utf8' => array(
'validateoptions' => 'De optie "%s" is niet geldig'
),
);
}/*}}}*/
......
......@@ -7,20 +7,17 @@
<div style="margin: 0 auto 1em; width: 30em;">
<h4 class="center">GNU General Public License</h4>
<p>This program is free software; you can redistribute it and/or modify
under the terms of the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
as published by the Free Software Foundation; either version 2 of the
under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3 of the
License, or (at your option) any later version.</p>
<p>This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public
License</a> for more details.</p>
GNU General Public License for more details.</p>
<p>You should have received a copy of the
<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p>
<p>You should have received a copy of the GNU General Public License
along with this program. If not, see <a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/</a>.
</div>
<form action="{$WWWROOT}admin/upgrade.php" method="post" class="center"><input type="submit" class="submit" value="{str tag=agreelicense section=admin}" style="font-weight: bold;"></form>
......
Markdown is supported
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