Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[52074] trunk
|
From: <jon...@us...> - 2014-07-22 10:57:04
|
Revision: 52074
http://sourceforge.net/p/tikiwiki/code/52074
Author: jonnybradley
Date: 2014-07-22 10:57:00 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
[MRG] Automatic merge, branches/13.x 52058 to 52072
Modified Paths:
--------------
trunk/lib/mime/mimelib.php
trunk/lib/wiki-plugins/wikiplugin_customsearch.php
trunk/lib/wiki-plugins/wikiplugin_img.php
trunk/templates/admin/admin_navbar.tpl
trunk/templates/admin/include_ads.tpl
trunk/templates/admin/include_articles.tpl
trunk/templates/admin/include_blogs.tpl
trunk/templates/admin/include_calendar.tpl
trunk/templates/admin/include_category.tpl
trunk/templates/admin/include_comments.tpl
trunk/templates/admin/include_community.tpl
trunk/templates/admin/include_connect.tpl
trunk/templates/admin/include_copyright.tpl
trunk/templates/admin/include_directory.tpl
trunk/templates/admin/include_faqs.tpl
trunk/templates/admin/include_features.tpl
trunk/templates/admin/include_fgal.tpl
trunk/templates/admin/include_forums.tpl
trunk/templates/admin/include_freetags.tpl
trunk/templates/admin/include_general.tpl
trunk/templates/admin/include_i18n.tpl
trunk/templates/admin/include_login.tpl
trunk/templates/admin/include_look.tpl
trunk/templates/admin/include_maps.tpl
trunk/templates/admin/include_messages.tpl
trunk/templates/admin/include_metatags.tpl
trunk/templates/admin/include_module.tpl
trunk/templates/admin/include_payment.tpl
trunk/templates/admin/include_performance.tpl
trunk/templates/admin/include_polls.tpl
trunk/templates/admin/include_rating.tpl
trunk/templates/admin/include_rss.tpl
trunk/templates/admin/include_search.tpl
trunk/templates/admin/include_security.tpl
trunk/templates/admin/include_sefurl.tpl
trunk/templates/admin/include_semantic.tpl
trunk/templates/admin/include_share.tpl
trunk/templates/admin/include_socialnetworks.tpl
trunk/templates/admin/include_textarea.tpl
trunk/templates/admin/include_trackers.tpl
trunk/templates/admin/include_webmail.tpl
trunk/templates/admin/include_webservices.tpl
trunk/templates/admin/include_wiki.tpl
trunk/templates/admin/include_workspace.tpl
trunk/templates/admin/include_wysiwyg.tpl
trunk/templates/goal/edit_condition.tpl
trunk/templates/goal/edit_reward.tpl
trunk/templates/modules/mod-category_transition.tpl
trunk/templates/monitor/object.tpl
trunk/templates/tiki-admin_actionlog.tpl
trunk/templates/tiki-admin_modules.tpl
trunk/templates/tiki-object_watches.tpl
trunk/templates/tiki-user_watches.tpl
trunk/templates/trackerinput/files.tpl
trunk/templates/wiki-plugins/wikiplugin_adjustinventory.tpl
trunk/templates/wiki-plugins/wikiplugin_categorytransition.tpl
trunk/templates/wiki-plugins/wikiplugin_listexecute.tpl
trunk/templates/wiki-plugins/wikiplugin_memberlist.tpl
trunk/templates/wiki-plugins/wikiplugin_profile.tpl
trunk/tiki-login_validate.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk 2014-07-22 10:57:00 UTC (rev 52074)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
/branches/10.x:43596-44410,44444-44836,44907
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443
-/branches/13.x:51407-52058
+/branches/13.x:51407-52072
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/lib/mime/mimelib.php
===================================================================
--- trunk/lib/mime/mimelib.php 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/lib/mime/mimelib.php 2014-07-22 10:57:00 UTC (rev 52074)
@@ -65,18 +65,20 @@
{
global $prefs;
- if ($type === 'application/zip') {
- $extension = $this->get_extension($filename);
-
- if (in_array($extension, array("xlsx", "xltx", "potx", "ppsx", "pptx", "sldx", "docx", "dotx", "xlam", "xlsb"))) {
- return $this->from_file_extension($filename);
- }
+ if ($type === 'application/zip' || $type === 'application/octet-stream') {
+ return $this->from_file_extension($filename);
} else if ($type === 'text/html' && $this->get_extension($filename) == 'svg') {
$type = 'image/svg+xml';
} else if ($type === 'text/html' && $prefs['vimeo_upload'] === 'y' && is_numeric($filename)) {
if (strpos($content, 'vimeo.com') !== false) {
$type = 'video/vimeo';
}
+ } else {
+ $extension = $this->get_extension($filename);
+
+ if (in_array($extension, array("xlsx", "xltx", "potx", "ppsx", "pptx", "sldx", "docx", "dotx", "xlam", "xlsb"))) {
+ return $this->from_file_extension($filename);
+ }
}
return $type;
Modified: trunk/lib/wiki-plugins/wikiplugin_customsearch.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_customsearch.php 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/lib/wiki-plugins/wikiplugin_customsearch.php 2014-07-22 10:57:00 UTC (rev 52074)
@@ -445,6 +445,9 @@
$element = $document->createElement('input');
cs_design_setbasic($element, $fieldid, $fieldname, $arguments);
+ if (!empty($default)) {
+ $arguments['default'] = $default;
+ }
$script .= "
(function (id, config, fieldname) {
var field = $('#' + id);
Modified: trunk/lib/wiki-plugins/wikiplugin_img.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_img.php 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/lib/wiki-plugins/wikiplugin_img.php 2014-07-22 10:57:00 UTC (rev 52074)
@@ -605,14 +605,12 @@
} elseif (!empty($dbinfo['path'])) {
$imageObj = new Image($basepath . $dbinfo['path'], true);
$filename = $dbinfo['filename'];
- } else {
- $imageObj = new Image($src, true);
- $filename = $src;
}
+ // NOTE image sizing should only happen with local images, otherwise will break if remote server can't be reached
//if we need metadata
$xmpview = !empty($imgdata['metadata']) ? true : false;
- if ($imgdata['desc'] == 'idesc' || $imgdata['desc'] == 'ititle' || $xmpview) {
+ if (is_object($imageObj) && ($imgdata['desc'] == 'idesc' || $imgdata['desc'] == 'ititle' || $xmpview)) {
$dbinfoparam = isset($dbinfo) ? $dbinfo : false;
$metadata = getMetadataArray($imageObj, $dbinfoparam);
if ($imgdata['desc'] == 'idesc') {
@@ -625,7 +623,7 @@
$fwidth = '';
$fheight = '';
- if (isset(TikiLib::lib('parser')->option['indexing']) && TikiLib::lib('parser')->option['indexing']) {
+ if (!is_object($imageObj) || isset(TikiLib::lib('parser')->option['indexing']) && TikiLib::lib('parser')->option['indexing']) {
$fwidth = 1;
$fheight = 1;
} else {
Modified: trunk/templates/admin/admin_navbar.tpl
===================================================================
--- trunk/templates/admin/admin_navbar.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/admin_navbar.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -164,7 +164,7 @@
{/foreach}
</div>
<div class="panel-footer text-center">
- <input class="btn btn-primary" type="submit" value="{tr}Apply{/tr}">
+ <input class="btn btn-primary" type="submit" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
<input type="hidden" name="lm_criteria" value="{$lm_criteria|escape}">
</form>
Modified: trunk/templates/admin/include_ads.tpl
===================================================================
--- trunk/templates/admin/include_ads.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_ads.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -6,7 +6,7 @@
{glyph name="list"} {tr}Banners{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -39,7 +39,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_articles.tpl
===================================================================
--- trunk/templates/admin/include_articles.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_articles.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -21,7 +21,7 @@
{glyph name="wrench"} {tr}Article Topics{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -173,7 +173,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_blogs.tpl
===================================================================
--- trunk/templates/admin/include_blogs.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_blogs.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -7,7 +7,7 @@
{glyph name="list"} {tr}Blogs{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -88,7 +88,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_calendar.tpl
===================================================================
--- trunk/templates/admin/include_calendar.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_calendar.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
{glyph name="list"} {tr}Calendars{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="calprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="calprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -89,7 +89,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="calprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="calprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_category.tpl
===================================================================
--- trunk/templates/admin/include_category.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_category.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -19,7 +19,7 @@
{glyph name="sort"} {tr}Organize Objects{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -103,7 +103,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_comments.tpl
===================================================================
--- trunk/templates/admin/include_comments.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_comments.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
<div class="form-group col-lg-12">
<a href="tiki-list_comments.php" class="btn btn-default btn-sm" title="{tr}List{/tr}">{glyph name="list"} {tr}Comments{/tr}</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="commentssetprefs" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="commentssetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -92,7 +92,7 @@
<div class="row">
<div class="form-group col-lg-12">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="commentssetprefs" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="commentssetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_community.tpl
===================================================================
--- trunk/templates/admin/include_community.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_community.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -10,7 +10,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -270,7 +270,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_connect.tpl
===================================================================
--- trunk/templates/admin/include_connect.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_connect.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -106,7 +106,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="connectprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="connectprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -172,7 +172,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="connectprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="connectprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_copyright.tpl
===================================================================
--- trunk/templates/admin/include_copyright.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_copyright.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -6,7 +6,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -38,7 +38,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_directory.tpl
===================================================================
--- trunk/templates/admin/include_directory.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_directory.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
{glyph name="list"} {tr}Directories{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="directory" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="directory" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -29,7 +29,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="directory" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="directory" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_faqs.tpl
===================================================================
--- trunk/templates/admin/include_faqs.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_faqs.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
{glyph name="list"} {tr}FAQs{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="faqcomprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="faqcomprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -27,7 +27,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="faqcomprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="faqcomprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_features.tpl
===================================================================
--- trunk/templates/admin/include_features.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_features.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -6,8 +6,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="reset" class="btn btn-link btn-sm" name="featuresreset" value="{tr}Reset{/tr}" />
- <input type="submit" class="btn btn-primary btn-sm" name="features" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="features" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -244,7 +243,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="features" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="features" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_fgal.tpl
===================================================================
--- trunk/templates/admin/include_fgal.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_fgal.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -32,7 +32,7 @@
{glyph name="list"} {tr}Files{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="filegalhandlers" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="filegalhandlers" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -334,7 +334,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="filegalhandlers" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="filegalhandlers" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_forums.tpl
===================================================================
--- trunk/templates/admin/include_forums.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_forums.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -6,7 +6,7 @@
{glyph name="list"} {tr}Forums{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -90,7 +90,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_freetags.tpl
===================================================================
--- trunk/templates/admin/include_freetags.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_freetags.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
{glyph name="list"} {tr}Tags{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -121,7 +121,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_general.tpl
===================================================================
--- trunk/templates/admin/include_general.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_general.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -381,7 +381,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_i18n.tpl
===================================================================
--- trunk/templates/admin/include_i18n.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_i18n.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -14,7 +14,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -157,7 +157,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_login.tpl
===================================================================
--- trunk/templates/admin/include_login.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_login.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -30,7 +30,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -420,7 +420,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_look.tpl
===================================================================
--- trunk/templates/admin/include_look.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_look.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -1,11 +1,10 @@
{* $Id$ *}
-<form action="tiki-admin.php?page=look" id="look" name="look" class="form-horizontal labelColumns" onreset="return(confirm('{tr}Cancel Edit{/tr}'))" class="admin" method="post">
+<form action="tiki-admin.php?page=look" id="look" name="look" class="form-horizontal labelColumns" class="admin" method="post">
<div class="row">
<div class="form-group col-lg-12">
<div class="pull-right">
- <input type="reset" class="btn btn-link btn-sm" name="looksetupreset" title="{tr}Reset Changes{/tr}" value="{tr}Reset{/tr}" />
- <input type="submit" class="btn btn-primary btn-sm" name="looksetup" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
- </div>
+ <input type="submit" class="btn btn-primary btn-sm" name="looksetup" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
+ </div>
</div>
</div>
{tabset name="admin_look"}
@@ -360,9 +359,8 @@
<div class="row">
<div class="form-group col-lg-12">
<div class="text-center">
- <input type="reset" class="btn btn-link btn-sm" name="looksetupreset" title="{tr}Reset Changes{/tr}" value="{tr}Reset{/tr}" />
<input type="submit" class="btn btn-primary btn-sm" name="looksetup" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
- </div>
+ </div>
</div>
</div>
</form>
Modified: trunk/templates/admin/include_maps.tpl
===================================================================
--- trunk/templates/admin/include_maps.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_maps.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -3,7 +3,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="mapsset" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="mapsset" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -75,7 +75,7 @@
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
<input type="submit" class="btn btn-default btn-sm" name="mapuser" value="{tr}Generate User Map{/tr}" />
- <input type="submit" class="btn btn-primary btn-sm" name="mapsset" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="mapsset" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_messages.tpl
===================================================================
--- trunk/templates/admin/include_messages.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_messages.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-default btn-sm" name="messagesprefs" value="{tr}Change preferences{/tr}">
+ <input type="submit" class="btn btn-default btn-sm" name="messagesprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -31,7 +31,7 @@
<br>{* I cheated. *}
<div class="row">
<div class="form-group col-lg-12 text-center">
- <input type="submit" class="btn btn-default btn-sm" name="messagesprefs" value="{tr}Change preferences{/tr}">
+ <input type="submit" class="btn btn-default btn-sm" name="messagesprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</form>
Modified: trunk/templates/admin/include_metatags.tpl
===================================================================
--- trunk/templates/admin/include_metatags.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_metatags.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -7,7 +7,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="metatags" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="metatags" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -46,7 +46,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="metatags" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="metatags" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_module.tpl
===================================================================
--- trunk/templates/admin/include_module.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_module.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -12,7 +12,7 @@
{glyph name="cog"} {tr}Modules{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -57,7 +57,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div
Modified: trunk/templates/admin/include_payment.tpl
===================================================================
--- trunk/templates/admin/include_payment.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_payment.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -6,7 +6,7 @@
{glyph name="list"} {tr}Payments{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="paymentprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="paymentprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -195,7 +195,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="paymentprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="paymentprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_performance.tpl
===================================================================
--- trunk/templates/admin/include_performance.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_performance.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -6,8 +6,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="reset" class="btn btn-link btn-sm" name="performancereset" value="{tr}Reset{/tr}" />
- <input type="submit" class="btn btn-primary btn-sm" name="performance" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="performance" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -192,7 +191,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="performance" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="performance" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_polls.tpl
===================================================================
--- trunk/templates/admin/include_polls.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_polls.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -12,7 +12,7 @@
</a>
{/if}
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -62,7 +62,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_rating.tpl
===================================================================
--- trunk/templates/admin/include_rating.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_rating.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -4,8 +4,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="reset" class="btn btn-link btn-sm" value="{tr}Reset{/tr}" />
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -161,7 +160,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_rss.tpl
===================================================================
--- trunk/templates/admin/include_rss.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_rss.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -10,7 +10,7 @@
{glyph name="list"} {tr}External Feeds{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -194,7 +194,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_search.tpl
===================================================================
--- trunk/templates/admin/include_search.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_search.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -23,7 +23,7 @@
<a href="{bootstrap_modal controller=search action=rebuild}" class="btn btn-primary btn-sm">{tr}Rebuild Index{/tr}</a>
{/if}
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -191,7 +191,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_security.tpl
===================================================================
--- trunk/templates/admin/include_security.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_security.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -15,8 +15,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="reset" class="btn btn-link btn-sm" name="securityreset" value="{tr}Reset{/tr}" />
- <input type="submit" class="btn btn-primary btn-sm" name="security" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="security" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -197,7 +196,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="security" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="security" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_sefurl.tpl
===================================================================
--- trunk/templates/admin/include_sefurl.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_sefurl.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -8,7 +8,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="save" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -85,7 +85,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="save" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="save" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_semantic.tpl
===================================================================
--- trunk/templates/admin/include_semantic.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_semantic.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -2,7 +2,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="semantic" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="semantic" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_share.tpl
===================================================================
--- trunk/templates/admin/include_share.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_share.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="sharesetprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="sharesetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -37,7 +37,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="sharesetprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="sharesetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_socialnetworks.tpl
===================================================================
--- trunk/templates/admin/include_socialnetworks.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_socialnetworks.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -3,7 +3,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="socialnetworksset" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="socialnetworksset" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -69,7 +69,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="socialnetworksset" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="socialnetworksset" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_textarea.tpl
===================================================================
--- trunk/templates/admin/include_textarea.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_textarea.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -7,7 +7,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="textareasetup" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="textareasetup" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -501,7 +501,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="textareasetup" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="textareasetup" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_trackers.tpl
===================================================================
--- trunk/templates/admin/include_trackers.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_trackers.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -6,7 +6,7 @@
{glyph name="list"} {tr}Trackers{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="trkset" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="trkset" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -111,7 +111,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="trkset" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" name="trkset" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_webmail.tpl
===================================================================
--- trunk/templates/admin/include_webmail.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_webmail.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -5,7 +5,7 @@
{glyph name="inbox"} {tr}Webmail{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="webmail" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="webmail" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -24,7 +24,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="webmail" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="webmail" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_webservices.tpl
===================================================================
--- trunk/templates/admin/include_webservices.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_webservices.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -4,7 +4,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
@@ -149,7 +149,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</div>
</div>
Modified: trunk/templates/admin/include_wiki.tpl
===================================================================
--- trunk/templates/admin/include_wiki.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_wiki.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -44,7 +44,7 @@
</a>
{/if}
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="wikisetprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="wikisetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -478,7 +478,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="wikisetprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="wikisetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_workspace.tpl
===================================================================
--- trunk/templates/admin/include_workspace.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_workspace.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -8,7 +8,7 @@
</a>
{/if}
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="workspacesetprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="workspacesetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -118,7 +118,7 @@
<div class="row">
<div class="form-group col-lg-12">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="workspacesetprefs" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="workspacesetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/admin/include_wysiwyg.tpl
===================================================================
--- trunk/templates/admin/include_wysiwyg.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/admin/include_wysiwyg.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -10,7 +10,7 @@
{glyph name="cog"} {tr}Toolbars{/tr}
</a>
<div class="pull-right">
- <input type="submit" class="btn btn-primary btn-sm" name="wysiwygfeatures" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="wysiwygfeatures" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
@@ -62,7 +62,7 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<div class="text-center">
- <input type="submit" class="btn btn-primary btn-sm" name="wysiwygfeatures" value="{tr}Apply{/tr}" />
+ <input type="submit" class="btn btn-primary btn-sm" name="wysiwygfeatures" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
</div>
</div>
</div>
Modified: trunk/templates/goal/edit_condition.tpl
===================================================================
--- trunk/templates/goal/edit_condition.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/goal/edit_condition.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -65,7 +65,7 @@
</label>
</div>
<div class="submit col-md-offset-3">
- <input type="submit" class="btn btn-primary" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</form>
{jq}
Modified: trunk/templates/goal/edit_reward.tpl
===================================================================
--- trunk/templates/goal/edit_reward.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/goal/edit_reward.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -52,7 +52,7 @@
</label>
</div>
<div class="submit col-md-offset-3">
- <input type="submit" class="btn btn-primary" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</form>
{jq}
Modified: trunk/templates/modules/mod-category_transition.tpl
===================================================================
--- trunk/templates/modules/mod-category_transition.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/modules/mod-category_transition.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -39,7 +39,7 @@
$(this.href.substr(this.href.lastIndexOf('#'))).toggle('fast');
} );
{/literal}{/jq}
- <div><input type="submit" class="btn btn-default btn-sm" value="{tr}Apply{/tr}"/></div>
+ <div><input type="submit" class="btn btn-default btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}"/></div>
</form>
{/tikimodule}
{/if}
Modified: trunk/templates/monitor/object.tpl
===================================================================
--- trunk/templates/monitor/object.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/monitor/object.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -62,7 +62,7 @@
</div>
<div class="submit">
- <input type="submit" class="btn btn-primary" value="{tr}Apply{/tr}">
+ <input type="submit" class="btn btn-primary" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
</div>
</form>
{/block}
Modified: trunk/templates/tiki-admin_actionlog.tpl
===================================================================
--- trunk/templates/tiki-admin_actionlog.tpl 2014-07-22 05:06:33 UTC (rev 52073)
+++ trunk/templates/tiki-admin_actionlog.tpl 2014-07-22 10:57:00 UTC (rev 52074)
@@ -99,7 +99,7 @@
<div class="col-sm-11 col-sm-offset-1 form-inline">
<div class="form-group col-sm-10">
<div class="col-sm-4">
- <label>{tr}Contibution Time{/tr}</label>
+ <label>{tr}Contribution Time{/tr}</label>
</div>
<div class="form-group col-sm-4 col-sm-offset-1">
<label>{tr}Week{/tr}</label>
@@ -205,6 +205,7 @@
<form name="checkboxes_on" method="post" action="tiki-admin_actionlog.php">
{query _type='form_input'}
<div class="table-responsive">
+ <div>
<table class="table normal">
<tr>
<th>
@@ -317,6 +318,7 @@
{/foreach}
</table>
</div>
+ </div>
{pagination_links cant=$cant step=$maxRecords offset=$offset}{/pagination_links}
<div class="formcolor">
{tr}Perform action with checked:{/tr}
@@ -339,6 +341,7 @@
{if $endDate}<input type="hidden" name="endDate" value="{$endDate}">{/if}
{$action.action} / {$action.objectType} / {$action.object}
<div class="table-responsive">
+ <div>
<table class="table normal">
{if $prefs.feature_contribution eq 'y'}
{include file='contribution.tpl' section=$action.objectType}
@@ -354,6 +357,7 @@
</tr>
</table>
</div>
+ </div>
</form>
{/if}
@@ -387,7 +391,8 @@
{if $showLogin eq 'y' and $logTimes|@count ne 0}
<div class="table-responsive">
- <table class="table normal">
+ <div>
+ <table class="table normal">
<caption>{tr}Log in{/tr}</caption>
<tr>
{if $selectedUsers|@count gt 0}<th>{tr}User{/tr}</th>{/if}
@@ -407,12 +412,14 @@
<td>{$time.nbLogins}</td>
</tr>
{/foreach}
+ </table>
</div>
- </table>
+ </div>
{/if}
{if $showCateg eq 'y' and $volCateg|@count ne 0 and $tiki_p_admin eq 'y'}
<div class="table-responsive">
+ <div>
<table class="table normal">
<caption>{tr}Volume per category{/tr}</caption>
<tr>
@@ -433,12 +440,14 @@
{/foreach}
</tr>
{/foreach}
+ </table>
</div>
- </table>
+ </div>
{/if}
{if $showCateg eq 'y' and $volUserCateg|@count ne 0}
<div class="table-responsive">
+ <div>
<table class="table normal">
<caption>{tr}Volume per category and per user{/tr}</caption>
<tr>
@@ -461,12 +470,14 @@
{/foreach}
</tr>
{/foreach}
+ </table>
</div>
- </table>
+ </div>
{/if}
{if $userActions|@count ne 0}
<div class="table-responsive">
+ <div>
<table class="table normal">
<caption>{tr}Number of actions per user{/tr}</caption>
<tr>
@@ -484,13 +495,15 @@
{/foreach}
</tr>
{/foreach}
+ </table>
</div>
- </table>
+ </div>
{tr}Total number of users:{/tr} {$smarty.foreach.userActions.total}
{/if}
{if $objectActions|@count ne 0}
<div class="table-responsive">
+ <div>
<table class="table normal">
<caption>{tr}Number of actions per object{/tr}</caption>
<tr>
@@ -510,13 +523,15 @@
{/foreach}
</tr>
{/foreach}
+ </table>
</div>
- </table>
+ </div>
{tr}Total number of objects:{/tr} {$smarty.foreach.objectActions.total}
{/if}
{if $showbigbluebutton eq 'y' and $stay_in_big_Times|@count ne 0}
<div class="table-responsive">
+ <div>
<table class="table normal">
<caption>{tr}Bigbluebutton{/tr}</caption>
<tr>
@@ -545,14 +560,16 @@
</form>
{/if}
</td>
- <td></td>
+ <td></td><td></td>
</tr>
</table>
</div>
+ </td>
{/if}
{if $showCateg eq 'y' and $tiki_p_admin eq 'y'}
<div class="table-responsive">
+ <div>
<table class="table normal">
<caption>{tr}Number of actions per category{/tr}</caption>
<tr>
@@ -572,10 +589,12 @@
{/foreach}
</table>
</div>
+ </div>
{/if}
{if $showCateg eq 'y' && $statUserCateg|@count ne 0}
<div class="table-responsive">
+ <div>
<table class="table normal">
<caption>{tr}Number of actions per category and per user{/tr}</caption>
<tr>
@@ -598,9 +617,12 @@
{/foreach}
</table>
</div>
+ </div>
{/if}
{if $prefs.feature_contribution eq 'y' && isset($groupContributions) && $groupContributions|@count >= 1}
+ <div class="table-responsive">
+ <div>
<table>
<caption>
{if $selectedUsers}
@@ -626,9 +648,13 @@
{/foreach}
{/foreach}
</table>
+ </div>
+ </div>
{/if}
{if $prefs.feature_contribution eq 'y' && isset($user...
[truncated message content] |