Menu
▾
▴
tikiwiki-cvs
|
From: <lu...@us...> - 2015-10-01 22:04:51
|
Revision: 56383
http://sourceforge.net/p/tikiwiki/code/56383
Author: luciash
Date: 2015-10-01 22:04:48 +0000 (Thu, 01 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56374 to 56382
Modified Paths:
--------------
trunk/lib/smarty_tiki/function.toolbars.php
trunk/lib/toolbars/toolbarslib.php
trunk/templates/comment-footer.tpl
trunk/templates/comments.tpl
trunk/templates/wiki_edit.tpl
Property Changed:
----------------
trunk/
trunk/templates/
Index: trunk
===================================================================
--- trunk 2015-10-01 21:59:00 UTC (rev 56382)
+++ trunk 2015-10-01 22:04:48 UTC (rev 56383)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56374
+/branches/14.x:54079-56382
/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/smarty_tiki/function.toolbars.php
===================================================================
--- trunk/lib/smarty_tiki/function.toolbars.php 2015-10-01 21:59:00 UTC (rev 56382)
+++ trunk/lib/smarty_tiki/function.toolbars.php 2015-10-01 22:04:48 UTC (rev 56383)
@@ -11,7 +11,7 @@
function smarty_function_toolbars($params, $smarty)
{
- global $prefs, $is_html, $tiki_p_admin, $section;
+ global $prefs, $is_html, $tiki_p_admin, $tiki_p_admin_toolbars, $section;
$default = array(
'comments' => 'n',
'is_html' => $is_html,
@@ -28,7 +28,7 @@
$hidden[] = 'switcheditor';
}
- if(!$tiki_p_admin) {
+ if( $tiki_p_admin != 'y' || $tiki_p_admin_toolbars != 'y' ) {
$hidden[] = 'admintoolbar';
}
Modified: trunk/lib/toolbars/toolbarslib.php
===================================================================
--- trunk/lib/toolbars/toolbarslib.php 2015-10-01 21:59:00 UTC (rev 56382)
+++ trunk/lib/toolbars/toolbarslib.php 2015-10-01 22:04:48 UTC (rev 56383)
@@ -1629,7 +1629,7 @@
return $this->getSelfLink(
'admintoolbar();',
htmlentities($this->label, ENT_QUOTES, 'UTF-8'),
- 'qt-switcheditor'
+ 'qt-admintoolbar'
);
} // }}}
Index: trunk/templates
===================================================================
--- trunk/templates 2015-10-01 21:59:00 UTC (rev 56382)
+++ trunk/templates 2015-10-01 22:04:48 UTC (rev 56383)
Property changes on: trunk/templates
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x/templates:45702-47762
/branches/12.x/templates:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53463,53608,55301
/branches/13.x/templates:51407-53060,53145,53192
-/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56374
+/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382
/branches/3.0/templates:16998-18916
/branches/4.x/templates:22817-23908
/branches/5.x/templates:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/templates/comment-footer.tpl
===================================================================
--- trunk/templates/comment-footer.tpl 2015-10-01 21:59:00 UTC (rev 56382)
+++ trunk/templates/comment-footer.tpl 2015-10-01 22:04:48 UTC (rev 56383)
@@ -38,7 +38,7 @@
</span>
{else}
<span class="back_to_top">
- <a href="#thread-breadcrumb" class="tips" title=":{tr}top of page{/tr}">
+ <a href="#top" class="tips" title=":{tr}top of page{/tr}">
{icon name='arrow-up'}
</a>
</span>
@@ -51,7 +51,7 @@
{if ( $prefs.feature_comments_locking neq 'y' or $thread_is_locked neq 'y' ) and
( $tiki_p_forum_post eq 'y' and ( $forum_is_locked neq 'y' or $prefs.feature_comments_locking neq 'y' ) )}
{if $first eq 'y'}
- {button href="#form" _text="{tr}Reply{/tr}"}
+ {button href="#form" _onclick="show('`$postclass`open');" _text="{tr}Reply{/tr}"}
{elseif $comments_grandParentId}
{button href="?post_reply=1&comments_threshold=`$comments_threshold`&comments_reply_threadId=`$comment.threadId`&comments_offset=`$comments_offset`&thread_sort_mode=`$thread_sort_mode`&comments_per_page=`$comments_per_page`&comments_grandParentId=`$comment_grandParentId`&comments_parentId=`$comments_grandParentId`&thread_style=`$thread_style`#form" _auto_args='*' _text="{tr}Reply{/tr}"}
{elseif $forum_info.is_flat neq 'y' or $prefs.feature_forum_allow_flat_forum_quotes eq 'y'}
Modified: trunk/templates/comments.tpl
===================================================================
--- trunk/templates/comments.tpl 2015-10-01 21:59:00 UTC (rev 56382)
+++ trunk/templates/comments.tpl 2015-10-01 22:04:48 UTC (rev 56383)
@@ -326,7 +326,7 @@
}
needToConfirm=false;
});{/jq}
- <input type="submit" class="btn btn-default btn-sm" name="comments_cancelComment" value="{tr}Cancel{/tr}" onclick="hide('{$postclass}'); return false">
+ <input type="submit" class="btn btn-default btn-sm" name="comments_cancelComment" value="{tr}Cancel{/tr}" onclick="hide('{$postclass}open'); return false">
</div>
</div>
</form>
Modified: trunk/templates/wiki_edit.tpl
===================================================================
--- trunk/templates/wiki_edit.tpl 2015-10-01 21:59:00 UTC (rev 56382)
+++ trunk/templates/wiki_edit.tpl 2015-10-01 22:04:48 UTC (rev 56383)
@@ -1,6 +1,6 @@
{* $Id$ *}
-<div class='edit-zone'>
+<div class='col-md-9 edit-zone'> {* grid class added here for correct layout in form-horizontal tracker plugin; hopefully no unintended side-effects *}
{if $textarea__toolbars ne 'n'}
<div class='textarea-toolbar nav-justified' id='{$textarea_id|default:editwiki}_toolbar'>
{toolbars area_id=$textarea_id|default:editwiki comments=$comments switcheditor=$switcheditor section=$toolbar_section}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2015-10-01 22:53:14
|
Revision: 56385
http://sourceforge.net/p/tikiwiki/code/56385
Author: luciash
Date: 2015-10-01 22:53:12 +0000 (Thu, 01 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56382 to 56384
Modified Paths:
--------------
trunk/lib/toolbars/toolbarslib.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-01 22:50:25 UTC (rev 56384)
+++ trunk 2015-10-01 22:53:12 UTC (rev 56385)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56382
+/branches/14.x:54079-56384
/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/toolbars/toolbarslib.php
===================================================================
--- trunk/lib/toolbars/toolbarslib.php 2015-10-01 22:50:25 UTC (rev 56384)
+++ trunk/lib/toolbars/toolbarslib.php 2015-10-01 22:53:12 UTC (rev 56385)
@@ -1413,7 +1413,7 @@
$icon = smarty_function_icon(array('_id' => 'help'), $smarty);
$url = $servicelib->getUrl($params);
- return "<a href=\"$url\" data-toggle=\"modal\" data-target=\"#bootstrap-modal\">$icon</a>";
+ return "<a class=\"toolbar btn btn-xs btn-link qt-help\" href=\"$url\" data-toggle=\"modal\" data-target=\"#bootstrap-modal\">$icon</a>";
} // }}}
function getWysiwygToken( $areaId ) // {{{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2015-10-02 18:55:23
|
Revision: 56394
http://sourceforge.net/p/tikiwiki/code/56394
Author: luciash
Date: 2015-10-02 18:55:20 +0000 (Fri, 02 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56384 to 56387
Modified Paths:
--------------
trunk/lib/core/Reports/Send/EmailBuilder.php
trunk/templates/wiki_edit.tpl
Property Changed:
----------------
trunk/
trunk/templates/
Index: trunk
===================================================================
--- trunk 2015-10-02 18:43:55 UTC (rev 56393)
+++ trunk 2015-10-02 18:55:20 UTC (rev 56394)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56384
+/branches/14.x:54079-56387
/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/core/Reports/Send/EmailBuilder.php
===================================================================
--- trunk/lib/core/Reports/Send/EmailBuilder.php 2015-10-02 18:43:55 UTC (rev 56393)
+++ trunk/lib/core/Reports/Send/EmailBuilder.php 2015-10-02 18:55:20 UTC (rev 56394)
@@ -143,6 +143,11 @@
$change['data']['editUser'] = smarty_modifier_username($change['data']['editUser']);
}
+ if (isset($change['user'])) {
+ include_once('lib/smarty_tiki/modifier.username.php');
+ $change['user'] = smarty_modifier_username($change['user']);
+ }
+
$body .= $eventObject->getOutput($change);
$body .= "<br>\n";
Index: trunk/templates
===================================================================
--- trunk/templates 2015-10-02 18:43:55 UTC (rev 56393)
+++ trunk/templates 2015-10-02 18:55:20 UTC (rev 56394)
Property changes on: trunk/templates
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x/templates:45702-47762
/branches/12.x/templates:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53463,53608,55301
/branches/13.x/templates:51407-53060,53145,53192
-/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382
+/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382,56385-56387
/branches/3.0/templates:16998-18916
/branches/4.x/templates:22817-23908
/branches/5.x/templates:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/templates/wiki_edit.tpl
===================================================================
--- trunk/templates/wiki_edit.tpl 2015-10-02 18:43:55 UTC (rev 56393)
+++ trunk/templates/wiki_edit.tpl 2015-10-02 18:55:20 UTC (rev 56394)
@@ -1,6 +1,6 @@
{* $Id$ *}
-<div class='col-md-9 edit-zone'> {* grid class added here for correct layout in form-horizontal tracker plugin; hopefully no unintended side-effects *}
+<div class='edit-zone'> {* grid class col-md-9 was added here for correct layout in form-horizontal tracker plugin but nested col-md-9s resulted; testing. *}
{if $textarea__toolbars ne 'n'}
<div class='textarea-toolbar nav-justified' id='{$textarea_id|default:editwiki}_toolbar'>
{toolbars area_id=$textarea_id|default:editwiki comments=$comments switcheditor=$switcheditor section=$toolbar_section}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-03 12:54:22
|
Revision: 56398
http://sourceforge.net/p/tikiwiki/code/56398
Author: jonnybradley
Date: 2015-10-03 12:54:19 +0000 (Sat, 03 Oct 2015)
Log Message:
-----------
[NEW] upload: New jQuery File Upload interface for file galleries (as a smarty plugin). Somewhat experimental so far but basically functional.
TODO: Syntax insert etc for "filegals_manager" mode, a cancel/stop/start buttons, autoload option and client-side resize to come (thanks marclaporte)
Modified Paths:
--------------
trunk/composer.json
trunk/composer.lock
trunk/lib/core/Services/File/Controller.php
trunk/lib/prefs/file.php
trunk/templates/admin/include_fgal.tpl
trunk/templates/tiki-upload_file.tpl
trunk/tiki-upload_file.php
Added Paths:
-----------
trunk/lib/jquery_tiki/tiki-jquery_upload.js
trunk/lib/smarty_tiki/function.filegal_uploader.php
trunk/templates/file/jquery_upload.tpl
Modified: trunk/composer.json
===================================================================
--- trunk/composer.json 2015-10-03 12:39:04 UTC (rev 56397)
+++ trunk/composer.json 2015-10-03 12:54:19 UTC (rev 56398)
@@ -10,6 +10,9 @@
"adodb/adodb": "5.18",
"aFarkas/html5shiv": "3.7.2",
"alxlit/bootstrap-chosen": "1.0.1",
+ "blueimp/jquery-file-upload": "9.11.0",
+ "blueimp/javascript-load-image": "1.14.0",
+ "blueimp/javascript-canvas-to-blob": "2.2.0",
"bombayworks/zendframework1": "1.12.11",
"ckeditor/ckeditor": "4.5.1",
"ckeditor/ckeditor/skins/kama": "4.5.1",
Modified: trunk/composer.lock
===================================================================
--- trunk/composer.lock 2015-10-03 12:39:04 UTC (rev 56397)
+++ trunk/composer.lock 2015-10-03 12:54:19 UTC (rev 56398)
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "8a443c894f80881262a1a0df2fa92fdb",
- "content-hash": "7f963dc02bcc14a04d5d6aa945629c74",
+ "hash": "2310536a75ef881e91770cc0076463dd",
+ "content-hash": "5d0d837dd2b1c0878a87fe09e16c8e37",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
@@ -86,6 +86,78 @@
"type": "library"
},
{
+ "name": "blueimp/javascript-canvas-to-blob",
+ "version": "2.2.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://github.com/blueimp/JavaScript-Canvas-to-Blob/archive/2.2.0.zip",
+ "reference": null,
+ "shasum": null
+ },
+ "type": "component"
+ },
+ {
+ "name": "blueimp/javascript-load-image",
+ "version": "1.14.0",
+ "dist": {
+ "type": "zip",
+ "url": "https://github.com/blueimp/JavaScript-Load-Image/archive/1.14.0.zip",
+ "reference": null,
+ "shasum": null
+ },
+ "type": "library"
+ },
+ {
+ "name": "blueimp/jquery-file-upload",
+ "version": "9.11.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/vkhramtsov/jQuery-File-Upload.git",
+ "reference": "e6236257b91f4824235ec6941f22878eb9bb1ed2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://composer.tiki.org/dist/blueimp-jquery-file-upload-e6236257b91f4824235ec6941f22878eb9bb1ed2-zip-44acc0.zip",
+ "reference": "e6236257b91f4824235ec6941f22878eb9bb1ed2",
+ "shasum": "793fe1a1b8ee4833db005e82b9de4645871cfbb0"
+ },
+ "type": "library",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Tschan",
+ "homepage": "https://blueimp.net"
+ }
+ ],
+ "description": "File Upload widget for jQuery.",
+ "homepage": "https://github.com/blueimp/jQuery-File-Upload",
+ "keywords": [
+ "bootstrap",
+ "chunk",
+ "cross-domain",
+ "cross-site",
+ "drag",
+ "drop",
+ "file",
+ "gae",
+ "go",
+ "jquery",
+ "multiple",
+ "php",
+ "preview",
+ "progress",
+ "python",
+ "resume",
+ "selection",
+ "upload",
+ "widget"
+ ],
+ "time": "2015-08-11 06:07:24"
+ },
+ {
"name": "bombayworks/zendframework1",
"version": "v1.12.11",
"source": {
@@ -1552,7 +1624,7 @@
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Config.git",
+ "url": "https://github.com/symfony/config.git",
"reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408"
},
"dist": {
@@ -1600,7 +1672,7 @@
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Console.git",
+ "url": "https://github.com/symfony/console.git",
"reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34"
},
"dist": {
@@ -1657,7 +1729,7 @@
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
- "url": "https://github.com/symfony/DependencyInjection.git",
+ "url": "https://github.com/symfony/dependency-injection.git",
"reference": "42bbb43fab66292a1865dc9616c299904c3d4d14"
},
"dist": {
@@ -1713,16 +1785,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Filesystem.git",
- "reference": "f079e9933799929584200b9a926f72f29e291654"
+ "url": "https://github.com/symfony/filesystem.git",
+ "reference": "a17f8a17c20e8614c15b8e116e2f4bcde102cfab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Filesystem/zipball/f079e9933799929584200b9a926f72f29e291654",
- "reference": "f079e9933799929584200b9a926f72f29e291654",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/a17f8a17c20e8614c15b8e116e2f4bcde102cfab",
+ "reference": "a17f8a17c20e8614c15b8e116e2f4bcde102cfab",
"shasum": ""
},
"require": {
@@ -1758,20 +1830,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2015-08-27 07:03:44"
+ "time": "2015-09-09 17:42:36"
},
{
"name": "symfony/process",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process.git",
- "reference": "f7b3f73f70a7f8f49a1c838dc3debbf054732d8e"
+ "url": "https://github.com/symfony/process.git",
+ "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/f7b3f73f70a7f8f49a1c838dc3debbf054732d8e",
- "reference": "f7b3f73f70a7f8f49a1c838dc3debbf054732d8e",
+ "url": "https://api.github.com/repos/symfony/process/zipball/b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
+ "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
"shasum": ""
},
"require": {
@@ -1807,7 +1879,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2015-08-27 06:45:45"
+ "time": "2015-09-19 19:59:23"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -2112,12 +2184,12 @@
"source": {
"type": "git",
"url": "https://github.com/BafS/Testify.php.git",
- "reference": "63e4d023a1a2527d8a80b911030558b5d71b0116"
+ "reference": "5a173af660fe3ebb8f9d4a093ef637a7f14b4066"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/BafS/Testify.php/zipball/63e4d023a1a2527d8a80b911030558b5d71b0116",
- "reference": "63e4d023a1a2527d8a80b911030558b5d71b0116",
+ "url": "https://api.github.com/repos/BafS/Testify.php/zipball/5a173af660fe3ebb8f9d4a093ef637a7f14b4066",
+ "reference": "5a173af660fe3ebb8f9d4a093ef637a7f14b4066",
"shasum": ""
},
"require": {
@@ -2131,7 +2203,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "GPL"
+ "GPL-3.0"
],
"description": "Testify makes writing unit tests fun again. It has an elegant syntax and keeps things simple",
"keywords": [
@@ -2139,7 +2211,7 @@
"testing",
"unit"
],
- "time": "2014-07-15 21:22:12"
+ "time": "2015-09-22 10:09:31"
},
{
"name": "doctrine/instantiator",
@@ -2635,16 +2707,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.8.8",
+ "version": "4.8.10",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "521720279261e5b14799cf1bb895d4b55e516f26"
+ "reference": "463163747474815c5ccd4ae12b5b355ec12158e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/521720279261e5b14799cf1bb895d4b55e516f26",
- "reference": "521720279261e5b14799cf1bb895d4b55e516f26",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/463163747474815c5ccd4ae12b5b355ec12158e8",
+ "reference": "463163747474815c5ccd4ae12b5b355ec12158e8",
"shasum": ""
},
"require": {
@@ -2703,20 +2775,20 @@
"testing",
"xunit"
],
- "time": "2015-09-19 05:44:37"
+ "time": "2015-10-01 09:14:30"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "2.3.7",
+ "version": "2.3.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "5e2645ad49d196e020b85598d7c97e482725786a"
+ "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a",
- "reference": "5e2645ad49d196e020b85598d7c97e482725786a",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+ "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
"shasum": ""
},
"require": {
@@ -2759,7 +2831,7 @@
"mock",
"xunit"
],
- "time": "2015-08-19 09:14:08"
+ "time": "2015-10-02 06:51:40"
},
{
"name": "sebastian/comparator",
@@ -3134,16 +3206,16 @@
},
{
"name": "symfony/yaml",
- "version": "v2.7.4",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "2dc7b06c065df96cc686c66da2705e5e18aef661"
+ "url": "https://github.com/symfony/yaml.git",
+ "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/2dc7b06c065df96cc686c66da2705e5e18aef661",
- "reference": "2dc7b06c065df96cc686c66da2705e5e18aef661",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+ "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
"shasum": ""
},
"require": {
@@ -3179,7 +3251,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2015-08-24 07:13:45"
+ "time": "2015-09-14 14:14:09"
}
],
"aliases": [],
Modified: trunk/lib/core/Services/File/Controller.php
===================================================================
--- trunk/lib/core/Services/File/Controller.php 2015-10-03 12:39:04 UTC (rev 56397)
+++ trunk/lib/core/Services/File/Controller.php 2015-10-03 12:54:19 UTC (rev 56398)
@@ -89,6 +89,53 @@
);
}
+ /**
+ * Uploads several files at once, currently from jquery_upload when file_galleries_use_jquery_upload pref is enabled
+ *
+ * @param $input
+ * @return array
+ * @throws Services_Exception
+ * @throws Services_Exception_NotAvailable
+ */
+ function action_upload_multiple($input)
+ {
+ $output = ['files' => []];
+
+ if (isset($_FILES['files']) && is_array($_FILES['files']['tmp_name'])) {
+
+ // a few other params that are still arrays but shouldn't be
+ $input->offsetSet('galleryId', $input->galleryId->asArray()[0]);
+ $input->offsetSet('hit_limit', $input->hit_limit->asArray()[0]);
+ $input->offsetSet('isbatch', $input->isbatch->asArray()[0]);
+ $input->offsetSet('deleteAfter', $input->deleteAfter->asArray()[0]);
+ $input->offsetSet('author', $input->author->asArray()[0]);
+ $input->offsetSet('listtoalert', $input->listtoalert->asArray()[0]);
+
+ for ($i = 0; $i < count($_FILES['files']['tmp_name']); $i++) {
+ if (is_uploaded_file($_FILES['files']['tmp_name'][$i])) {
+ $input->offsetSet('name', $_FILES['files']['name'][$i]);
+ $input->offsetSet('size', $_FILES['files']['size'][$i]);
+ $input->offsetSet('type', $_FILES['files']['type'][$i]);
+ $data = file_get_contents($_FILES['files']['tmp_name'][$i]);
+ $input->offsetSet('data', base64_encode($data));
+
+ $file = $this->action_upload($input);
+ if (!empty($file['fileId'])) {
+ $file['info'] = TikiLib::lib('filegal')->get_file_info($file['fileId']);
+ $file['syntax'] = TikiLib::lib('filegal')->getWikiSyntax($file['galleryId'], $file['info']);
+ }
+
+ $output['files'][] = $file;
+ } else {
+ throw new Services_Exception_NotAvailable(tr('File could not be uploaded.'));
+ }
+ }
+ }
+
+ return $output;
+
+ }
+
function action_browse($input)
{
try {
Added: trunk/lib/jquery_tiki/tiki-jquery_upload.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery_upload.js (rev 0)
+++ trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-03 12:54:19 UTC (rev 56398)
@@ -0,0 +1,145 @@
+/*
+ * jQuery File Upload connector for Tiki
+ *
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * $Id$
+ */
+
+$(function () {
+
+ var url = $.service("file", "upload_multiple"), // upload handler:
+ uploadButton = $('<button/>')
+ .addClass('btn btn-primary')
+ .prop('disabled', true)
+ .text('Processing...')
+ .on('click', function () {
+ var $this = $(this),
+ data = $this.data();
+ $this
+ .off('click')
+ .text('Abort')
+ .on('click', function () {
+ $this.remove();
+ data.abort();
+ });
+ data.submit().always(function () {
+ $this.remove();
+ });
+ });
+ $('#fileupload').fileupload({
+ url: url,
+ dataType: 'json',
+ autoUpload: false,
+ //maxFileSize: 999000,
+ // Enable image resizing, except for Android and Opera,
+ // which actually support image resizing, but fail to
+ // send Blob objects via XHR requests:
+ disableImageResize: /Android(?!.*Chrome)|Opera/
+ .test(window.navigator.userAgent),
+ previewMaxWidth: 100,
+ previewMaxHeight: 100,
+ previewCrop: true,
+
+ singleFileUploads: true, // make optional one day
+
+
+ filesContainer: $('div.files'),
+ uploadTemplateId: null,
+ downloadTemplateId: null,
+ uploadTemplate: null,
+ downloadTemplate: null
+
+ }).on('fileuploadadd', function (e, data) {
+
+ data.context = $('<div/>').appendTo('#files');
+
+ $.each(data.files, function (index, file) {
+ var node = $('<p/>')
+ .append($('<span/>').text(file.name));
+ if (!index) {
+ node
+ .append('<br>')
+ .append(uploadButton.clone(true).data(data));
+ }
+ node.appendTo(data.context);
+ });
+ }).on('fileuploadprocessalways', function (e, data) {
+ var index = data.index,
+ file = data.files[index],
+ context = data.context;
+
+ if (!context.length) { // context seems to fail here
+ context = $("div:contains("+file.name+")", "#files");
+ }
+ var node = $(context.children()[index]);
+
+ if (file.preview) {
+ node
+ .prepend('<br>')
+ .prepend(file.preview);
+ }
+ if (file.error) {
+ node
+ .append('<br>')
+ .append($('<span class="text-danger"/>').text(file.error));
+ }
+ if (index + 1 === data.files.length) {
+ context.find('button')
+ .text('Upload')
+ .prop('disabled', !!data.files.error);
+ }
+ }).on('fileuploadprogressall', function (e, data) {
+ var progress = parseInt(data.loaded / data.total * 100, 10);
+ $('.progress-bar', '#progress').css(
+ 'width',
+ progress + '%'
+ );
+ }).on('fileuploaddone', function (e, data) {
+ $.each(data.result.files, function (index, file) {
+
+ var context = data.context;
+
+ if (file.fileId) {
+ var display = file.type.match(/^image\//) ? "display" : "dl",
+ link = $('<a>')
+ .attr('target', '_blank')
+ .prop('href', display + file.fileId);
+
+ $(context.children()[index])
+ .wrap(link)
+ .find("span").text(file.info.name);
+
+ $(context)
+ .append("<code>" + file.syntax + "</code>");
+
+ } else if (file.error) {
+ var error = $('<span class="text-danger"/>').text(file.error);
+
+ $(context.children()[index])
+ .append('<br>')
+ .append(error);
+ }
+ });
+
+ }).on('fileuploadfail', function (e, data) {
+ $.each(data.files, function (index) {
+ var error = $('<span class="text-danger"/>').text('File upload failed.' + data.errorThrown),
+ context = data.context;
+
+ if (!context.length) { // context seems to fail here too
+ context = $("div:contains("+data.files[0].name+")", "#files");
+ }
+ $(context.children()[index])
+ .append('<br>')
+ .append(error);
+ });
+ return false;
+ }).parents("form").off("submit").on("submit", function (e) {
+ // submitting the form seems to happen automatically resulting in a white page - not sure how still but this stops it...
+ return false;
+
+ }).prop('disabled', !$.support.fileInput)
+ .parent().addClass($.support.fileInput ? undefined : 'disabled');
+
+});
Property changes on: trunk/lib/jquery_tiki/tiki-jquery_upload.js
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/prefs/file.php
===================================================================
--- trunk/lib/prefs/file.php 2015-10-03 12:39:04 UTC (rev 56397)
+++ trunk/lib/prefs/file.php 2015-10-03 12:54:19 UTC (rev 56398)
@@ -26,5 +26,16 @@
),
'default' => 'points_desc',
),
+ 'file_galleries_use_jquery_upload' => array(
+ 'name' => tra('Use jQuery Upload'),
+ 'description' => tra('Use the improved Tiki 15+ upload page'),
+ 'type' => 'flag',
+ 'default' => 'n',
+ 'tags' => array('experimental'),
+ 'dependencies' => array(
+ 'feature_file_galleries',
+ 'feature_jquery_ui',
+ ),
+ ),
);
}
Copied: trunk/lib/smarty_tiki/function.filegal_uploader.php (from rev 56169, trunk/lib/smarty_tiki/function.filegal_manager_url.php)
===================================================================
--- trunk/lib/smarty_tiki/function.filegal_uploader.php (rev 0)
+++ trunk/lib/smarty_tiki/function.filegal_uploader.php 2015-10-03 12:54:19 UTC (rev 56398)
@@ -0,0 +1,57 @@
+<?php
+// (c) Copyright 2002-2015 by authors of the Tiki Wiki CMS Groupware Project
+//
+// All Rights Reserved. See copyright.txt for details and a complete list of authors.
+// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+// $Id$
+
+//this script may only be included - so its better to die if called directly.
+if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) {
+ header("location: index.php");
+ exit;
+}
+
+/** filegal_uploader: Adds a widget to the page to upload files
+ *
+ * @param array $params
+ * 'galleryId' => int file gallery to upload into by default
+ *
+ * @param Smarty $smarty
+ * @return string html
+ */
+function smarty_function_filegal_uploader($params, $smarty)
+{
+ $headerlib = TikiLib::lib('header');
+
+// Image loader and canvas libs
+ $headerlib->add_jsfile('vendor/blueimp/javascript-load-image/js/load-image.all.min.js');
+ $headerlib->add_jsfile('vendor/blueimp/javascript-canvas-to-blob/js/canvas-to-blob.min.js');
+
+// The Iframe Transport is required for browsers without support for XHR file uploads
+ $headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js');
+// The basic File Upload plugin
+ $headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js');
+// The File Upload processing plugin
+ $headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-process.js');
+// The File Upload image preview & resize plugin
+ $headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-image.js');
+// The File Upload audio preview plugin
+ $headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-audio.js');
+// The File Upload video preview plugin
+ $headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-video.js');
+// The File Upload validation plugin
+ $headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-validate.js');
+// The File Upload user interface plugin
+ $headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-ui.js');
+// CSS
+ $headerlib->add_cssfile('vendor/blueimp/jquery-file-upload/css/jquery.fileupload.css');
+ $headerlib->add_cssfile('vendor/blueimp/jquery-file-upload/css/jquery.fileupload-ui.css');
+
+// Tiki customised application script
+ $headerlib->add_jsfile('lib/jquery_tiki/tiki-jquery_upload.js');
+
+
+ $return = $smarty->fetch('file/jquery_upload.tpl');
+
+ return $return;
+}
Modified: trunk/templates/admin/include_fgal.tpl
===================================================================
--- trunk/templates/admin/include_fgal.tpl 2015-10-03 12:39:04 UTC (rev 56397)
+++ trunk/templates/admin/include_fgal.tpl 2015-10-03 12:54:19 UTC (rev 56398)
@@ -75,6 +75,8 @@
{preference name='fgal_allow_duplicates'}
{preference name='feature_file_galleries_batch'}
+ {preference name='file_galleries_use_jquery_upload'}
+
<div class="adminoptionboxchild" id="feature_file_galleries_batch_childcontainer">
{remarksbox title="Note"}
{tr}You are highly recommended to use a file directory as the File Gallery storage, when using this feature{/tr}
Added: trunk/templates/file/jquery_upload.tpl
===================================================================
--- trunk/templates/file/jquery_upload.tpl (rev 0)
+++ trunk/templates/file/jquery_upload.tpl 2015-10-03 12:54:19 UTC (rev 56398)
@@ -0,0 +1,15 @@
+{* $Id$ *}
+{* Used by smarty_function_filegal_uploader() when $prefs.file_galleries_use_jquery_upload is enabled *}
+{* The fileinput-button span is used to style the file input field as button *}
+<div class="btn btn-success fileinput-button margin-bottom-sm">
+ {icon name='plus'}
+ <span>Add files...</span>
+ <!-- The file input field used as target for the file upload widget -->
+ <input id="fileupload" type="file" name="files[]" multiple>
+</div>
+{* The global progress bar *}
+<div id="progress" class="progress margin-bottom-sm">
+ <div class="progress-bar progress-bar-success"></div>
+</div>
+{* The container for the uploaded files *}
+<table id="files" class="files"></table>
Property changes on: trunk/templates/file/jquery_upload.tpl
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/templates/tiki-upload_file.tpl
===================================================================
--- trunk/templates/tiki-upload_file.tpl 2015-10-03 12:39:04 UTC (rev 56397)
+++ trunk/templates/tiki-upload_file.tpl 2015-10-03 12:54:19 UTC (rev 56398)
@@ -114,43 +114,48 @@
<div class="fgal_file">
<div class="fgal_file_c1">
- {if $simpleMode neq 'y'}
- <div class="form-group">
- <label for="name" class="col-sm-3 control-label">{tr}File title{/tr}</label>
- <div class="col-sm-9">
- <input class="form-control" type="text" id="name" name="name[]"
- {if isset($fileInfo) and $fileInfo.name}
- value="{$fileInfo.name|escape}"
+ {if $prefs.file_galleries_use_jquery_upload eq 'n' or $editFileId}
+ {if $simpleMode neq 'y'}
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tr}File title{/tr}</label>
+ <div class="col-sm-9">
+ <input class="form-control" type="text" id="name" name="name[]"
+ {if isset($fileInfo) and $fileInfo.name}
+ value="{$fileInfo.name|escape}"
+ {/if}
+ size="40"
+ >
+ {if isset($gal_info.type) and ($gal_info.type eq "podcast" or $gal_info.type eq "vidcast")}
+ ({tr}required field for podcasts{/tr})
{/if}
- size="40"
- >
- {if isset($gal_info.type) and ($gal_info.type eq "podcast" or $gal_info.type eq "vidcast")}
- ({tr}required field for podcasts{/tr})
- {/if}
+ </div>
</div>
- </div>
- <div class="form-group">
- <label for="description" class="col-sm-3 control-label">{tr}File description{/tr}</label>
- <div class="col-sm-9">
- <textarea class="form-control" rows="2" cols="40" id="description" name="description[]">{if isset($fileInfo.description)}{$fileInfo.description|escape}{/if}</textarea>
- {if isset($gal_info.type) and ($gal_info.type eq "podcast" or $gal_info.type eq "vidcast")}
- <br><em>{tr}Required for podcasts{/tr}.</em>
- {/if}
+ <div class="form-group">
+ <label for="description" class="col-sm-3 control-label">{tr}File description{/tr}</label>
+ <div class="col-sm-9">
+ <textarea class="form-control" rows="2" cols="40" id="description" name="description[]">{if isset($fileInfo.description)}{$fileInfo.description|escape}{/if}</textarea>
+ {if isset($gal_info.type) and ($gal_info.type eq "podcast" or $gal_info.type eq "vidcast")}
+ <br><em>{tr}Required for podcasts{/tr}.</em>
+ {/if}
+ </div>
</div>
- </div>
- {/if}
- {if $prefs.javascript_enabled neq 'y' || !$editFileId}
- <div class="form-group">
- <label for="userfile" class="col-sm-3 control-label">{tr}Upload from disk{/tr}</label>
- <div class="col-sm-9">
- {if $editFileId}
- {$fileInfo.filename|escape}
- {/if}
+ {/if}
+ {if $prefs.javascript_enabled neq 'y' || !$editFileId}
+ <div class="form-group">
+ <label for="userfile" class="col-sm-3 control-label">{tr}Upload from disk{/tr}</label>
+ <div class="col-sm-9">
+ {if $editFileId}
+ {$fileInfo.filename|escape}
+ {/if}
- <input id="userfile" name="userfile[]" type="file" size="40">
+ <input id="userfile" name="userfile[]" type="file" size="40">
+ </div>
</div>
- </div>
+ {/if}
+ {else}{* file_galleries_use_jquery_upload = y *}
+ {filegal_uploader}
{/if}
+
</div>
{if $simpleMode neq 'y'}
@@ -313,25 +318,27 @@
{$upload_str}
- {if $editFileId}
- {include file='categorize.tpl'}<br>
- <div id="page_bar" class="form-group">
- <div class="col-sm-9 col-sm-offset-3">
- <input name="upload" type="submit" class="btn btn-default" value="{tr}Save{/tr}">
+ {if $prefs.file_galleries_use_jquery_upload eq 'n'}
+ {if $editFileId}
+ {include file='categorize.tpl'}<br>
+ <div id="page_bar" class="form-group">
+ <div class="col-sm-9 col-sm-offset-3">
+ <input name="upload" type="submit" class="btn btn-default" value="{tr}Save{/tr}">
+ </div>
</div>
- </div>
- {elseif $prefs.javascript_enabled neq 'y'}
- {$upload_str}
- {$upload_str}
- {include file='categorize.tpl'}<br>
- <div id="page_bar" class="form-group">
- <div class="col-sm-9 col-sm-offset-3">
- <input type="submit" class="btn btn-default btn-sm" name="upload" value="{tr}Upload{/tr}">
+ {elseif $prefs.javascript_enabled neq 'y'}
+ {$upload_str}
+ {$upload_str}
+ {include file='categorize.tpl'}<br>
+ <div id="page_bar" class="form-group">
+ <div class="col-sm-9 col-sm-offset-3">
+ <input type="submit" class="btn btn-default btn-sm" name="upload" value="{tr}Upload{/tr}">
+ </div>
</div>
- </div>
+ {/if}
{/if}
- {if !$editFileId}
+ {if !$editFileId && $prefs.file_galleries_use_jquery_upload eq 'n'}
<div id="page_bar" class="form-group">
<div class="col-sm-9 col-sm-offset-3">
<input type="submit" class="btn btn-primary btn-sm"
@@ -370,7 +377,7 @@
{include file='metadata/meta_view_tabs.tpl'}
{/if}
-{if ! $editFileId}
+{if ! $editFileId and $prefs.file_galleries_use_jquery_upload eq 'n'}
{if $prefs.feature_jquery_ui eq 'y'}
{jq}$('.datePicker').datepicker({minDate: 0, maxDate: '+1m', dateFormat: 'dd/mm/yy'});{/jq}
{/if}
Modified: trunk/tiki-upload_file.php
===================================================================
--- trunk/tiki-upload_file.php 2015-10-03 12:39:04 UTC (rev 56397)
+++ trunk/tiki-upload_file.php 2015-10-03 12:54:19 UTC (rev 56398)
@@ -221,7 +221,9 @@
// Display the template
if ( $prefs['javascript_enabled'] != 'y' or ! $isUpload ) {
- $headerlib->add_jsfile('vendor/jquery/plugins/form/jquery.form.js');
+ if ($prefs['file_galleries_use_jquery_upload'] === 'n') {
+ $headerlib->add_jsfile('vendor/jquery/plugins/form/jquery.form.js');
+ }
$smarty->assign('mid', 'tiki-upload_file.tpl');
if ( ! empty( $_REQUEST['filegals_manager'] ) ) {
$smarty->assign('filegals_manager', $_REQUEST['filegals_manager']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2015-10-03 13:38:40
|
Revision: 56400
http://sourceforge.net/p/tikiwiki/code/56400
Author: lindonb
Date: 2015-10-03 13:38:38 +0000 (Sat, 03 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56387 to 56399
Modified Paths:
--------------
trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php
trunk/lib/wiki-plugins/wikiplugin_trade.php
trunk/lib/wiki-plugins/wikiplugin_transclude.php
trunk/lib/wiki-plugins/wikiplugin_translated.php
trunk/lib/wiki-plugins/wikiplugin_translationof.php
trunk/lib/wiki-plugins/wikiplugin_twitter.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk 2015-10-03 13:38:38 UTC (rev 56400)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56387
+/branches/14.x:54079-56399
/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/wiki-plugins/wikiplugin_trackertoggle.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -10,13 +10,16 @@
return array(
'name' => tra('Tracker Toggle'),
'documentation' => 'PluginTrackerToggle',
- 'description' => tra('Toggle element display on a field value'),
+ 'description' => tra('Show or hide tracker content'),
+ 'iconname' => 'trackers',
+ 'introduced' => 7,
'prefs' => array('wikiplugin_trackertoggle', 'feature_jquery', 'feature_trackers'),
'params' => array(
'fieldId' => array(
'required' => true,
'name' => tra('Field ID'),
'description' => tra('Numeric value representing the field ID tested.'),
+ 'since' => '7.0',
'filter' => 'digits',
'profile_reference' => 'tracker_field',
),
@@ -24,25 +27,35 @@
'required' => true,
'name' => tra('Value'),
'description' => tra('Value to compare against.'),
+ 'since' => '7.0',
'filter' => 'text',
),
'visible' => array(
'required' => false,
- 'name' => tra('Element visibility'),
- 'description' => 'y|n' . tra('If y, is visible when the field has the value.'),
+ 'name' => tra('Element Visibility'),
+ 'description' => tra('Set whether visible when the field has the value.'),
+ 'since' => '7.0',
'filter' => 'alpha',
- 'default' => 'n'
+ 'default' => 'n',
+ 'options' => array(
+ array('text' => '', 'value' => ''),
+ array('text' => tra('Yes'), 'value' => 'y'),
+ array('text' => tra('No'), 'value' => 'n')
+ )
),
'id' => array(
'required' => true,
'name' => tra('ID'),
'description' => tra('Html ID of the element that is toggled'),
+ 'since' => '7.0',
'filter' => 'text',
),
'itemId' => array(
'required' => false,
'name' => tra('Item ID'),
- 'description' => tra('Use the field of specific item. The URL param itemId is used if this parameter is not set.'),
+ 'description' => tra('Use the field of specific item. The URL param itemId is used if this parameter
+ is not set.'),
+ 'since' => '7.0',
'filter' => 'digits',
'default' => 0,
'profile_reference' => 'tracker_item',
Modified: trunk/lib/wiki-plugins/wikiplugin_trade.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trade.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_trade.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -12,16 +12,18 @@
return array(
'name' => tra('Trade'),
'documentation' => 'PluginTrade',
- 'description' => tra('Send or receive payments from one member to another. (for cclite only so far, experimental)'),
+ 'description' => tra('Send payments between members using cclite'),
'validate' => 'all',
'prefs' => array( 'wikiplugin_trade', 'payment_feature' ),
- 'icon' => 'img/icons/money.png',
+ 'iconname' => 'money',
+ 'introduced' => 6,
'tags' => array( 'experimental' ),
'params' => array(
'price' => array(
'required' => true,
'name' => tra('Price'),
'description' => tr('Currency depends on the selected registry.'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => '',
),
@@ -29,6 +31,7 @@
'required' => false,
'name' => tra('Registry'),
'description' => tr('Registry to trade in. Default: site preference (or first in list when more than one)'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => '',
),
@@ -36,20 +39,25 @@
'required' => false,
'name' => tra('Currency'),
'description' => tr('Currency to trade in. Default: Cclite currency preference for registry set above'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => '',
),
'other_user' => array(
'required' => false,
'name' => tra('Other User'),
- 'description' => tra('Name of the user to recieve or send the payment.') . ' ' . tra('Leave empty to display an input box.'),
+ 'description' => tra('Name of the user to receive or send the payment.') . ' '
+ . tra('Leave empty to display an input box.'),
+ 'since' => '6.0',
'filter' => 'username',
'default' => '',
),
'wanted' => array(
'required' => false,
'name' => tra('Mode'),
- 'description' => tr('Offered or wanted item.') . ' ' . tr('Default') . ':' . tra('Offered'),
+ 'description' => tr('Offered or wanted item.') . ' ' . tr('Default') . ':' . tr('%0Offered%1', '<code>',
+ '</code>'),
+ 'since' => '6.0',
'options' => array(
array('text' => '', 'value' => ''),
array('text' => tra('Offered'), 'value' => 'n'),
@@ -61,15 +69,19 @@
'action' => array(
'required' => false,
'name' => tra('Button Label'),
- 'description' => tr('Default') . ':' . tra('Continue'),
+ 'description' => tr('Default') . ':' . tr('%0Continue%1', '<code>', '</code>'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => tra('Continue'),
),
'inputtitle' => array(
'required' => false,
'name' => tra('Input Title'),
- 'description' => tra('Title of the input form.').' '. tra('Use %0 for the amount, %1 for currency, %2 for your user name, %3 for the other user.').' '.tra('Supports wiki syntax') . '<br />'.
- tr('Default') . ':' . tra('"Payment of %0 %1 from user %2 to %3" for offered items, "Request payment of %0 %1 to user %2 from %3" for wanted'),
+ 'description' => tra('Title of the input form.').' '. tr('Use %0%0%1 for the amount, %0%1%1 for currency,
+ %0%2%1 for your user name, %0%3%1 for the other user.', '<code>', '</code>').' '.tra('Supports
+ wiki syntax') . '<br />'. tr('Default') . ':' . tra('"Payment of %0 %1 from user %2 to %3" for
+ offered items, "Request payment of %0 %1 to user %2 from %3" for wanted'),
+ 'since' => '6.0',
'filter' => 'text',
'default' => '',
),
Modified: trunk/lib/wiki-plugins/wikiplugin_transclude.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_transclude.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_transclude.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -14,13 +14,16 @@
'prefs' => array('wikiplugin_transclude', 'feature_wiki'),
'extraparams' => true,
'defaultfilter' => 'text',
- 'icon' => 'img/icons/page_copy.png',
+ 'iconname' => 'copy',
+ 'introduced' => 6,
'params' => array(
'page' => array(
'required' => true,
'name' => tra('Page Name'),
'description' => tra('Name of the wiki page to use as a template for the values.'),
+ 'since' => '6.0',
'default' => '',
+ 'filter' => 'pagename',
'profile_reference' => 'wiki_page',
),
),
Modified: trunk/lib/wiki-plugins/wikiplugin_translated.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_translated.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_translated.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -10,21 +10,26 @@
return array(
'name' => tra('Translated'),
'documentation' => 'PluginTranslated',
- 'description' => tra('Create multi-lingual links'),
+ 'description' => tra('Create multilingual links'),
'prefs' => array( 'feature_multilingual', 'wikiplugin_translated' ),
'body' => tra('[url] or ((wikiname)) or ((inter:interwiki)) (use wiki syntax)'),
- 'icon' => 'img/icons/world_link.png',
+ 'iconname' => 'language',
+ 'introduced' => 1,
'params' => array(
'lang' => array(
'required' => true,
'name' => tra('Language'),
- 'description' => tra('Two letter language code of the language, ex: fr'),
+ 'description' => tra('Two letter language code of the language, example:') . ' <code>fr</code>',
+ 'since' => '1',
+ 'filter' => 'alpha',
'default' => '',
),
'flag' => array(
'required' => false,
'name' => tra('Flag'),
- 'description' => tra('Country name, ex: France'),
+ 'description' => tr('Country name, example:') . ' <code>France</code>',
+ 'since' => '1',
+ 'filter' => 'alpha',
'default' => '',
),
),
Modified: trunk/lib/wiki-plugins/wikiplugin_translationof.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_translationof.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_translationof.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -20,31 +20,39 @@
function wikiplugin_translationof_info()
{
$description =
- tra('Assist in the translation of a link from one language to another.');
+ tra('Translate a link from one language to another');
return array(
'name' => tra('TranslationOf'),
'documentation' => 'PluginTranslationOf',
'description' => $description,
'prefs' => array( 'feature_multilingual', 'wikiplugin_translationof' ),
- 'icon' => 'img/icons/world_link.png',
+ 'iconname' => 'language',
+ 'introduced' => 12,
'params' => array(
'orig_page' => array(
'required' => true,
'name' => tra('Original Page'),
- 'description' => tra('Name of the page from which this link will be translate.'),
+ 'description' => tra('Name of the page from which this link will be translated.'),
+ 'since' => '12.0',
+ 'filter' => 'pagename',
'default' => '',
),
'translation_lang' => array(
'required' => true,
'name' => tra('Translation Language'),
- 'description' => tra('Two letter language code of the language in which you want to translate this link, ex: fr'),
+ 'description' => tr('Two letter language code of the language in which you want to translate this
+ link. Example:') . ' <code>fr</code>',
+ 'since' => '12.0',
+ 'filter' => 'alpha',
'default' => '',
),
'translation_page' => array(
'required' => false,
'name' => tra('Translation Name'),
'description' => tra('Name of the page that will become the translation of the "Original Page".'),
+ 'since' => '12.0',
+ 'filter' => 'pagename',
'default' => '',
),
),
Modified: trunk/lib/wiki-plugins/wikiplugin_twitter.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_twitter.php 2015-10-03 13:37:53 UTC (rev 56399)
+++ trunk/lib/wiki-plugins/wikiplugin_twitter.php 2015-10-03 13:38:38 UTC (rev 56400)
@@ -10,15 +10,20 @@
return array(
'name' => tra('Twitter'),
'documentation' => 'PluginTwitter',
- 'description' => tra('Twitter Timeline. Display the activity for a twitter account'),
+ 'description' => tra('Display the activity for a twitter account'),
'prefs' => array('wikiplugin_twitter'),
'body' => '',
- 'icon' => 'img/icons/twitter.png',
+ 'iconname' => 'twitter',
+ 'introduced' => 7,
'params' => array(
'tweet' => array(
'required' => true,
'name' => tra('Twitter Path'),
- 'description' => tra('Depends on the type of timeline (Users, Collections, Favorites or Lists). For an User, it is the Account Name (like twitterdev), for Favorites it is like (twitterdev/favorites), for lists it is like twitterdev/lists/listname, etc. '),
+ 'description' => tr('Depends on the type of timeline (Users, Collections, Favorites or Lists). For a
+ User, it is the Account Name (like %0twitterdev%1), for Favorites, something like
+ %0twitterdev/favorites%1. For lists, something like %0twitterdev/lists/listname%1, etc. ',
+ '<code>', '</code>'),
+ 'since' => '7.0',
'filter' => 'text',
'default' => ''
),
@@ -26,15 +31,20 @@
'required' => true,
'name' => tra('Widget Id'),
'description' => tra('Numeric identifier of the widget'),
+ 'since' => '13.1',
'filter' => 'digits',
'default' => ''
),
'theme' => array(
'required' => false,
'name' => tra('Theme'),
- 'description' => tra('Embedded timelines are available in light and dark themes for customization. The light theme is for pages that use a light colored background, while the dark theme is for pages that use a dark colored background. Default is light'),
+ 'description' => tra('Embedded timelines are available in light and dark themes for customization.
+ The light theme is for pages that use a light colored background, while the dark theme is for pages
+ that use a dark colored background. Default is %0light%1.', '<code>', '</code>'),
+ 'since' => '13.1',
'filter' => 'alpha',
'options' => array(
+ array('text' => '', 'value' => ''),
array('text' => tra('light'), 'value' => 'light'),
array('text' => tra('dark'), 'value' => 'dark'),
),
@@ -42,38 +52,44 @@
),
'tweetcolor' => array(
'required' => false,
- 'name' => tra('Link color'),
+ 'name' => tra('Link Color'),
'description' => tra('Text color for individual tweets. Default is theme default.'),
+ 'since' => '7.0',
'accepted' => tra('Valid HTML color codes (with beginning #) or names.'),
'filter' => 'text'
),
'tweetbg' => array(
'required' => false,
- 'name' => tra('Border color'),
+ 'name' => tra('Border Color'),
'description' => tra('Change the border color used by the widget. Default is theme default.'),
+ 'since' => '7.0',
'accepted' => tra('Valid HTML color codes (with beginning #) or names.'),
'filter' => 'text'
),
'height' => array(
'required' => false,
'name' => tra('Height'),
- 'description' => tra('Height of widget in pixels. Default is 300.'),
+ 'description' => tr('Height of widget in pixels. Default is %0.', '<code>300</code>'),
+ 'since' => '7.0',
'filter' => 'digits',
'default' => 300
),
'width' => array(
'required' => false,
'name' => tra('Width'),
- 'description' => tra('Width of widget in pixels or \'auto\' to fit to width of page. Default is auto.'),
+ 'description' => tr('Width of widget in pixels or \'auto\' to fit to width of page. Default is %0.',
+ '<code>auto</code>'),
'accepted' => tra('Number of pixels or the word \'auto\'.'),
+ 'since' => '7.0',
'filter' => 'text',
'default' => 'auto'
),
'noheader' => array(
'required' => false,
'advanced' => true,
- 'name' => tra('Layout Option: No Header'),
+ 'name' => tra('No Header'),
'description' => tra('Default is with Header'),
+ 'since' => '13.1',
'filter' => 'text',
'options' => array(
array('text' => tra('Header'), 'value' => ''),
@@ -83,8 +99,9 @@
'nofooter' => array(
'required' => false,
'advanced' => true,
- 'name' => tra('Layout Option: No Footer'),
+ 'name' => tra('No Footer'),
'description' => tra('Default is with Footer'),
+ 'since' => '13.1',
'filter' => 'text',
'options' => array(
array('text' => tra('Footer'), 'value' => ''),
@@ -96,6 +113,7 @@
'advanced' => true,
'name' => tra('Layout Option: No Borders'),
'description' => tra('Default is with Borders'),
+ 'since' => '13.1',
'filter' => 'text',
'options' => array(
array('text' => tra('Borders'), 'value' => ''),
@@ -105,8 +123,9 @@
'noscrollbar' => array(
'required' => false,
'advanced' => true,
- 'name' => tra('Layout Option: No Scrollbar'),
+ 'name' => tra('No Scrollbar'),
'description' => tra('Default is with Scrollbar'),
+ 'since' => '13.1',
'filter' => 'text',
'options' => array(
array('text' => tra('Scrollbar'), 'value' => ''),
@@ -116,8 +135,9 @@
'shellbg' => array(
'required' => false,
'advanced' => true,
- 'name' => tra('Layout Option: Transparent Background'),
+ 'name' => tra('Transparent Background'),
'description' => tra('Transparent Shell Background. Default is theme default'),
+ 'since' => '7.0',
'filter' => 'text',
'options' => array(
array('text' => tra('Theme default'), 'value' => ''),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-04 14:00:46
|
Revision: 56403
http://sourceforge.net/p/tikiwiki/code/56403
Author: jonnybradley
Date: 2015-10-04 14:00:44 +0000 (Sun, 04 Oct 2015)
Log Message:
-----------
[FIX] upload: Test for pref file_galleries_use_jquery_upload neq 'y' instead of eq 'n' so that the feature isn't automatically enabled when upgrading if the caches have not been flushed (thanks marclaporte)
Modified Paths:
--------------
trunk/templates/tiki-upload_file.tpl
trunk/tiki-upload_file.php
Modified: trunk/templates/tiki-upload_file.tpl
===================================================================
--- trunk/templates/tiki-upload_file.tpl 2015-10-04 13:55:22 UTC (rev 56402)
+++ trunk/templates/tiki-upload_file.tpl 2015-10-04 14:00:44 UTC (rev 56403)
@@ -114,7 +114,7 @@
<div class="fgal_file">
<div class="fgal_file_c1">
- {if $prefs.file_galleries_use_jquery_upload eq 'n' or $editFileId}
+ {if $prefs.file_galleries_use_jquery_upload neq 'y' or $editFileId}
{if $simpleMode neq 'y'}
<div class="form-group">
<label for="name" class="col-sm-3 control-label">{tr}File title{/tr}</label>
@@ -318,7 +318,7 @@
{$upload_str}
- {if $prefs.file_galleries_use_jquery_upload eq 'n'}
+ {if $prefs.file_galleries_use_jquery_upload neq 'y'}
{if $editFileId}
{include file='categorize.tpl'}<br>
<div id="page_bar" class="form-group">
@@ -338,7 +338,7 @@
{/if}
{/if}
- {if !$editFileId && $prefs.file_galleries_use_jquery_upload eq 'n'}
+ {if !$editFileId && $prefs.file_galleries_use_jquery_upload neq 'y'}
<div id="page_bar" class="form-group">
<div class="col-sm-9 col-sm-offset-3">
<input type="submit" class="btn btn-primary btn-sm"
@@ -377,7 +377,7 @@
{include file='metadata/meta_view_tabs.tpl'}
{/if}
-{if ! $editFileId and $prefs.file_galleries_use_jquery_upload eq 'n'}
+{if ! $editFileId and $prefs.file_galleries_use_jquery_upload neq 'y'}
{if $prefs.feature_jquery_ui eq 'y'}
{jq}$('.datePicker').datepicker({minDate: 0, maxDate: '+1m', dateFormat: 'dd/mm/yy'});{/jq}
{/if}
Modified: trunk/tiki-upload_file.php
===================================================================
--- trunk/tiki-upload_file.php 2015-10-04 13:55:22 UTC (rev 56402)
+++ trunk/tiki-upload_file.php 2015-10-04 14:00:44 UTC (rev 56403)
@@ -221,7 +221,7 @@
// Display the template
if ( $prefs['javascript_enabled'] != 'y' or ! $isUpload ) {
- if ($prefs['file_galleries_use_jquery_upload'] === 'n') {
+ if ($prefs['file_galleries_use_jquery_upload'] !== 'y') {
$headerlib->add_jsfile('vendor/jquery/plugins/form/jquery.form.js');
}
$smarty->assign('mid', 'tiki-upload_file.tpl');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2015-10-04 15:10:59
|
Revision: 56405
http://sourceforge.net/p/tikiwiki/code/56405
Author: lindonb
Date: 2015-10-04 15:10:57 +0000 (Sun, 04 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56399 to 56404
Modified Paths:
--------------
trunk/lib/wiki-plugins/wikiplugin_trade.php
trunk/lib/wiki-plugins/wikiplugin_twitter.php
trunk/lib/wiki-plugins/wikiplugin_usercount.php
trunk/lib/wiki-plugins/wikiplugin_userlastlogged.php
trunk/lib/wiki-plugins/wikiplugin_userlink.php
trunk/lib/wiki-plugins/wikiplugin_userlist.php
trunk/lib/wiki-plugins/wikiplugin_userpref.php
trunk/lib/wiki-plugins/wikiplugin_versions.php
trunk/lib/wiki-plugins/wikiplugin_vimeo.php
trunk/lib/wiki-plugins/wikiplugin_vote.php
trunk/lib/wiki-plugins/wikiplugin_votings.php
trunk/lib/wiki-plugins/wikiplugin_wantedpages.php
trunk/lib/wiki-plugins/wikiplugin_webdocviewer.php
trunk/lib/wiki-plugins/wikiplugin_webservice.php
trunk/lib/wiki-plugins/wikiplugin_wysiwyg.php
trunk/lib/wiki-plugins/wikiplugin_youtube.php
trunk/lib/wiki-plugins/wikiplugin_zotero.php
trunk/lib/wiki-plugins/wikiplugin_zoterolist.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk 2015-10-04 15:10:57 UTC (rev 56405)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56399
+/branches/14.x:54079-56404
/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/wiki-plugins/wikiplugin_trade.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trade.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_trade.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -77,10 +77,12 @@
'inputtitle' => array(
'required' => false,
'name' => tra('Input Title'),
- 'description' => tra('Title of the input form.').' '. tr('Use %0%0%1 for the amount, %0%1%1 for currency,
- %0%2%1 for your user name, %0%3%1 for the other user.', '<code>', '</code>').' '.tra('Supports
- wiki syntax') . '<br />'. tr('Default') . ':' . tra('"Payment of %0 %1 from user %2 to %3" for
- offered items, "Request payment of %0 %1 to user %2 from %3" for wanted'),
+ 'description' => tra('Title of the input form.').' '. tr('Use %0 for the amount, %1 for currency,
+ %2 for your user name, %3 for the other user.', '<code>%0</code>', '<code>%1</code>',
+ '<code>%2</code>', '<code>%3</code>').' '
+ .tra('Supports wiki syntax') . '<br />'. tr('Default') . ':'
+ . tra('"Payment of %0 %1 from user %2 to %3" for offered items, "Request payment of %0 %1 to user
+ %2 from %3" for wanted'),
'since' => '6.0',
'filter' => 'text',
'default' => '',
Modified: trunk/lib/wiki-plugins/wikiplugin_twitter.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_twitter.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_twitter.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -38,7 +38,7 @@
'theme' => array(
'required' => false,
'name' => tra('Theme'),
- 'description' => tra('Embedded timelines are available in light and dark themes for customization.
+ 'description' => tr('Embedded timelines are available in light and dark themes for customization.
The light theme is for pages that use a light colored background, while the dark theme is for pages
that use a dark colored background. Default is %0light%1.', '<code>', '</code>'),
'since' => '13.1',
Modified: trunk/lib/wiki-plugins/wikiplugin_usercount.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_usercount.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_usercount.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -10,16 +10,21 @@
return array(
'name' => tra('User Count'),
'documentation' => 'PluginUserCount',
- 'description' => tra('Display number of users for a site or group'),
+ 'description' => tra('Display number of users for a site or one or more groups'),
'prefs' => array( 'wikiplugin_usercount' ),
- 'body' => tra('Group name'),
- 'icon' => 'img/icons/group_gear.png',
+ 'body' => tra('Group name. If left blank, the total number of users for the site will be shown.'),
+ 'iconname' => 'group',
+ 'introduced' => 1,
'params' => array(
'groups' => array(
'required' => false,
'name' => tra('Groups'),
- 'description' => tra('List of colon separated groups where a consolidated user count for multiple groups is needed.'),
+ 'description' => tra('List of colon separated groups where a consolidated user count for multiple
+ groups is needed. Users in multiple groups are counted only once. If left blank then the behaviour
+ is defined by the body parameter settings.'),
+ 'since' => '14.1',
'separator' => ':',
+ 'filter' => 'groupname',
'default' => '',
),
),
Modified: trunk/lib/wiki-plugins/wikiplugin_userlastlogged.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_userlastlogged.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_userlastlogged.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -10,12 +10,17 @@
return array(
'name' => tra('Last Login information'),
'documentation' => tra('PluginUserLastLogged'),
- 'description' => tra('Show the last login information for a current user'),
+ 'description' => tra('Show the last login information for a given or current user'),
+ 'iconname' => 'user',
+ 'introduced' => 13,
'params' => array(
'user' => array(
'required' => false,
'name' => tra('Username'),
- 'description' => tra('Username to display last login information'),
+ 'description' => tra('Username to display last login information for. Current user information shown
+ if left blank.'),
+ 'since' => '13.0',
+ 'filter' => 'username',
),
),
);
Modified: trunk/lib/wiki-plugins/wikiplugin_userlink.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_userlink.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_userlink.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -12,12 +12,14 @@
'documentation' => 'PluginUserlink',
'description' => tra('Display a link to a user\'s information page'),
'prefs' => array('wikiplugin_userlink'),
- 'icon' => 'img/icons/user_go.png',
- 'params' => array(
+ 'iconname' => 'user',
+ 'introduced' => 6,
+ 'params' => array(
'user' => array(
'required' => false,
'name' => tra('User Name'),
'description' => tra('User account name (which can be an email address)'),
+ 'since' => '6.0',
'filter' => 'xss',
'default' => ''
),
Modified: trunk/lib/wiki-plugins/wikiplugin_userlist.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_userlist.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_userlist.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -13,12 +13,14 @@
'description' => tra('Display a list of registered users'),
'prefs' => array( 'wikiplugin_userlist' ),
'body' => tra('Login Filter'),
- 'icon' => 'img/icons/group_go.png',
+ 'iconname' => 'group',
+ 'introduced' => 3,
'params' => array(
'sep' => array(
'required' => false,
'name' => tra('Separator'),
'description' => tra('Separator to use between users in the list. Default: comma'),
+ 'since' => '3.0',
'default' => ', ',
'advanced' => true,
),
@@ -26,6 +28,7 @@
'required' => false,
'name' => tra('Maximum'),
'description' => tra('Result limit'),
+ 'since' => '3.0',
'default' => '',
'filter' => 'digits',
'advanced' => true,
@@ -33,7 +36,8 @@
'sort' => array(
'required' => false,
'name' => tra('Sort Order'),
- 'description' => 'Set to sort in ascending or descending order',
+ 'description' => tra('Set to sort in ascending or descending order'),
+ 'since' => '3.0',
'default' => '',
'filter' => 'alpha',
'options' => array(
@@ -45,7 +49,8 @@
'layout' => array(
'required' => false,
'name' => tra('Layout'),
- 'description' => 'Set to table to display results in a table',
+ 'description' => tra('Set to table to display results in a table'),
+ 'since' => '3.0',
'default' => '',
'filter' => 'alpha',
'options' => array(
@@ -57,7 +62,8 @@
'link' => array(
'required' => false,
'name' => tra('Link'),
- 'description' => 'Make the user names listed links to different types of user information',
+ 'description' => tra('Make the user names listed links to different types of user information'),
+ 'since' => '3.0',
'default' => '',
'filter' => 'alpha',
'options' => array(
@@ -72,6 +78,7 @@
'filter' => 'alpha',
'name' => tra('Real Name'),
'description' => tra('Display the user\'s real name (when available) instead of login name'),
+ 'since' => '4.0',
'default' => '',
'options' => array(
array('text' => '', 'value' => ''),
@@ -83,6 +90,7 @@
'required' => false,
'name' => tra('Group'),
'description' => tra('Filter on a group'),
+ 'since' => '5.0',
'filter' => 'groupname',
'default' => '',
),
Modified: trunk/lib/wiki-plugins/wikiplugin_userpref.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_userpref.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_userpref.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -11,11 +11,13 @@
'name' => tra('User Preference'),
'documentation' => 'PluginUserpref',
'description' => tra('Display contents based on user preference settings'),
- 'body' => tra('Wiki text to display if conditions are met. The body may contain {ELSE}. Text after the marker will be displayed to users not matching the conditions.'),
+ 'body' => tr('Wiki text to display if conditions are met. The body may contain %0. Text after the marker
+ will be displayed to users not matching the conditions.', '<code>{ELSE}</code>'),
'prefs' => array('wikiplugin_userpref'),
'filter' => 'wikicontent',
'extraparams' => true,
- 'icon' => 'img/icons/user.png',
+ 'iconname' => 'user',
+ 'introduced' => 4,
'params' => array(
),
);
Modified: trunk/lib/wiki-plugins/wikiplugin_versions.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_versions.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_versions.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -12,14 +12,17 @@
'documentation' => 'PluginVersions',
'description' => tra('Create tabs for showing alternate versions of content'),
'prefs' => array( 'wikiplugin_versions' ),
- 'body' => tra('Block of text separated by ---(version x)--- markers. Text before the first marker is used by default.'),
- 'icon' => 'img/icons/tab_edit.png',
- 'tags' => array( 'basic' ),
+ 'body' => tra('Block of text separated by ---(version x)--- markers. Text before the first marker is used by
+ default.'),
+ 'iconname' => 'copy',
+ 'introduced' => 1,
+ 'tags' => array( 'basic' ),
'params' => array(
'nav' => array(
'required' => false,
'name' => tra('Navigation'),
- 'description' => tra('Displays a navigation box that allows users to select a specific version to display.'),
+ 'description' => tra('Display a navigation box that allows users to select a specific version to display.'),
+ 'since' => '1',
'default' => 'n',
'filter' => 'alpha',
'options' => array(
@@ -31,7 +34,9 @@
'title' => array(
'required' => false,
'name' => tra('Title'),
- 'description' => tra('Display the current version name as the title. No title shows when nav=>y; otherwise shows by default.'),
+ 'description' => tr('Display the current version name as the title. No title shows when %0nav="y"%1;
+ otherwise shows by default.', '<code>', '</code>'),
+ 'since' => '1',
'default' => 'y',
'filter' => 'alpha',
'parent' => array('name' => 'nav', 'value' => 'n'),
@@ -44,7 +49,9 @@
'default' => array(
'required' => false,
'name' => tra('Default Label'),
- 'description' => tra('Specifies version label to show when displaying the page for the first time. Default label is \'Default\''),
+ 'description' => tra('Specifies version label to show when displaying the page for the first time.
+ Default label is \'Default\''),
+ 'since' => '1',
'default' => tra('Default'),
),
),
Modified: trunk/lib/wiki-plugins/wikiplugin_vimeo.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_vimeo.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_vimeo.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -14,17 +14,18 @@
return array(
'name' => tra('Vimeo'),
'documentation' => 'PluginVimeo',
- 'description' => tra('Display a Vimeo video'),
+ 'description' => tra('Embed a Vimeo video'),
'prefs' => array( 'wikiplugin_vimeo' ),
- 'icon' => 'img/icons/vimeo.png',
+ 'iconname' => 'vimeo',
'introduced' => 6.1,
'format' => 'html',
'params' => array(
'url' => array(
'required' => $prefs['vimeo_upload'] !== 'y',
'name' => tra('URL'),
- 'description' => tra('Entire URL to the Vimeo video. Example: http://vimeo.com/3319966') .
- ($prefs['vimeo_upload'] === 'y' ? ' ' . tra('or leave blank to upload one.') : ''),
+ 'description' => tra('Entire URL to the Vimeo video. Example:') . ' <code>http://vimeo.com/3319966</code>'
+ . ($prefs['vimeo_upload'] === 'y' ? ' ' . tra('or leave blank to upload one.') : ''),
+ 'since' => '6.1',
'filter' => 'url',
'default' => '',
),
@@ -32,6 +33,7 @@
'required' => false,
'name' => tra('Width'),
'description' => tra('Width in pixels'),
+ 'since' => '6.1',
'filter' => 'digits',
'default' => 425,
),
@@ -39,6 +41,7 @@
'required' => false,
'name' => tra('Height'),
'description' => tra('Height in pixels'),
+ 'since' => '6.1',
'filter' => 'digits',
'default' => 350,
),
@@ -46,6 +49,7 @@
'required' => false,
'name' => tra('Quality'),
'description' => tra('Quality of the video'),
+ 'since' => '6.1',
'filter' => 'alpha',
'options' => array(
array('text' => '', 'value' => ''),
@@ -60,6 +64,7 @@
'required' => false,
'name' => tra('Full screen'),
'description' => tra('Expand to full screen'),
+ 'since' => '6.1',
'filter' => 'alpha',
'options' => array(
array('text' => '', 'value' => ''),
@@ -72,8 +77,10 @@
'fileId' => array(
'required' => false,
'name' => tra('File ID'),
- 'description' => tra('Numeric ID of a Vimeo file in a File Gallery (or list separated by commas or |).'),
- 'filter' => 'striptags',
+ 'description' => tr('Numeric ID of a Vimeo file in a File Gallery (or list separated by commas or %0).',
+ '<code>|</code>'),
+ 'since' => '12.0',
+ 'filter' => 'text',
'default' => '',
'advanced' => true
),
@@ -81,6 +88,7 @@
'required' => false,
'name' => tra('Field ID'),
'description' => tra('Numeric ID of a Tracker Files field, using Vimeo displayMode.'),
+ 'since' => '12.0',
'filter' => 'int',
'default' => 0,
'advanced' => true
@@ -89,6 +97,7 @@
'required' => false,
'name' => tra('Item ID'),
'description' => tra('Numeric ID of a Tracker item, using Vimeo displayMode.'),
+ 'since' => '12.0',
'filter' => 'int',
'default' => 0,
'advanced' => true
@@ -97,13 +106,15 @@
'required' => false,
'name' => tra('Gallery ID'),
'description' => tra('Gallery ID to upload to.'),
+ 'since' => '12.0',
'filter' => 'int',
'advanced' => true
),
'useFroogaloopApi' => array(
'required' => false,
- 'name' => tra('Use Vimeo Froogaloop API'),
+ 'name' => tra('Froogaloop API'),
'description' => tra('Use Vimeo Froogaloop API'),
+ 'since' => '14.0',
'filter' => 'alpha',
'options' => array(
array('text' => '', 'value' => ''),
Modified: trunk/lib/wiki-plugins/wikiplugin_vote.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_vote.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_vote.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -13,12 +13,14 @@
'description' => tra('Create a tracker for voting'),
'prefs' => array( 'feature_trackers', 'wikiplugin_vote' ),
'body' => tra('Title'),
- 'icon' => 'img/icons/thumb_up.png',
+ 'iconname' => 'thumbs-up',
+ 'introduced' => 2,
'params' => array(
'trackerId' => array(
'required' => true,
'name' => tra('Tracker ID'),
'description' => tra('Numeric value representing the tracker ID'),
+ 'since' => '2.0',
'filter' => 'digits',
'default' => '',
'profile_reference' => 'tracker',
@@ -26,7 +28,9 @@
'fields' => array(
'required' => true,
'name' => tra('Fields'),
- 'description' => tra('Colon-separated list of field IDs to be displayed. Example: 2:4:5'),
+ 'description' => tra('Colon-separated list of field IDs to be displayed. If not set all the fields that
+ can be used (except IP, user, system, private fields) are used. Example:') . ' <code>2:4:5</code>',
+ 'since' => '2.0',
'default' => '',
'separator' => ':',
'profile_reference' => 'tracker_field',
@@ -34,7 +38,9 @@
'show_percent' => array(
'required' => false,
'name' => tra('Show Percentage'),
- 'description' => tra('Choose whether to show the percentage of the vote each option received (not shown by default)'),
+ 'description' => tra('Choose whether to show the percentage of the vote each option received (not
+ shown by default)'),
+ 'since' => '2.0',
'filter' => 'alpha',
'default' => 'n',
'options' => array(
@@ -46,7 +52,9 @@
'show_bar' => array(
'required' => false,
'name' => tra('Show Bar'),
- 'description' => tra('Choose whether to show a bar representing the number of votes each option received (not shown by default)'),
+ 'description' => tra('Choose whether to show a bar representing the number of votes each option
+ received (not shown by default)'),
+ 'since' => '2.0',
'filter' => 'alpha',
'default' => 'n',
'options' => array(
@@ -59,6 +67,7 @@
'required' => false,
'name' => tra('Show Stats'),
'description' => tra('Choose whether to show the voting results (shown by default)'),
+ 'since' => '2.0',
'filter' => 'alpha',
'default' => 'y',
'options' => array(
@@ -70,7 +79,9 @@
'show_stat_only_after' => array(
'required' => false,
'name' => tra('Show Stats After'),
- 'description' => tra('Choose whether to show the voting results only after the date given in the tracker configuration (not set by default)'),
+ 'description' => tra('Choose whether to show the voting results only after the date given in the
+ tracker configuration (not set by default)'),
+ 'since' => '2.0',
'filter' => 'alpha',
'default' => '',
'options' => array(
@@ -82,7 +93,9 @@
'show_creator' => array(
'required' => false,
'name' => tra('Show Creator'),
- 'description' => tra('Choose whether to display the user name of the creator of the voting tracker (not shown by default)'),
+ 'description' => tra('Choose whether to display the user name of the creator of the voting tracker (not
+ shown by default)'),
+ 'since' => '2.0',
'filter' => 'alpha',
'default' => '',
'options' => array(
@@ -95,6 +108,7 @@
'required' => false,
'name' => tra('Status Filter'),
'description' => tra('Only show items matching certain status filters'),
+ 'since' => '2.0',
'filter' => 'alpha',
'default' => 'o',
'options' => array(
@@ -111,7 +125,9 @@
'float' => array(
'required' => false,
'name' => tra('Float'),
- 'description' => tra('Align the plugin on the page, allowing other elements to wrap around it (not set by default)'),
+ 'description' => tra('Align the plugin on the page, allowing other elements to wrap around it (not set
+ by default)'),
+ 'since' => '2.0',
'filter' => 'alpha',
'default' => '',
'options' => array(
@@ -125,6 +141,7 @@
'required' => false,
'name' => tra('Show Toggle'),
'description' => tra('Show toggle or not to display the form and the results'),
+ 'since' => '10.0',
'filter' => 'alpha',
'default' => '',
'options' => array(
Modified: trunk/lib/wiki-plugins/wikiplugin_votings.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_votings.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_votings.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -13,11 +13,14 @@
'description' => tra('Saves voting information in Smarty variables for display'),
'prefs' => array( 'wikiplugin_votings' ),
'format' => 'html',
+ 'iconname' => 'thumbs-up',
+ 'introduced' => 8,
'params' => array(
'objectkey' => array(
'required' => true,
'name' => tra('Object Key'),
'description' => tra('Object key that is used to record votes'),
+ 'since' => '8.0',
'filter' => 'text',
'default' => '',
),
@@ -25,6 +28,7 @@
'required' => false,
'name' => tra('Return value'),
'description' => tra('Value to display as output of plugin'),
+ 'since' => '8.0',
'filter' => 'text',
'default' => '',
),
Modified: trunk/lib/wiki-plugins/wikiplugin_wantedpages.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_wantedpages.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_wantedpages.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -14,14 +14,18 @@
'documentation' => 'PluginWantedPages',
'description' => tra('Show location of links to pages not yet created'),
'prefs' => array( 'wikiplugin_wantedpages' ),
- 'body' => tra('Custom level regex. A custom filter for wanted pages to be listed (only used when level=>custom). Possible values: a valid regex-expression (PCRE).'),
- 'icon' => 'img/icons/page_white_find.png',
+ 'body' => tr('Custom level regex. A custom filter for wanted pages to be listed (only used when %0). Possible
+ values: a valid regex-expression (PCRE).', '<code>level="custom"</code>'),
+ 'iconname' => 'search',
+ 'introduced' => 1,
'tags' => array( 'basic' ),
'params' => array(
'ignore' => array(
'required' => false,
'name' => tra('Ignore'),
- 'description' => tra('A wildcard pattern of originating pages to be ignored. (refer to PHP fuction fnmatch() for details)'),
+ 'description' => tra('A wildcard pattern of originating pages to be ignored. (refer to PHP function
+ fnmatch() for details)'),
+ 'since' => '1',
'accepted' => tra('a valid regex-expression (PCRE)'),
'default' => '',
'advanced' => true,
@@ -30,6 +34,7 @@
'required' => false,
'name' => tra('Split By'),
'description' => tra('The character by which ignored patterns are separated.'),
+ 'since' => '1',
'default' => '+',
'advanced' => true,
),
@@ -37,6 +42,7 @@
'required' => false,
'name' => tra('Skip Alias'),
'description' => tra('Whether to skip wanted pages that have a defined alias (not skipped by default)'),
+ 'since' => '12.1',
'default' => 0,
'filter' => 'digits',
'options' => array(
@@ -49,6 +55,7 @@
'required' => false,
'name' => tra('Skip Extension'),
'description' => tra('Whether to include external wikis in the list (not included by default)'),
+ 'since' => '1',
'default' => 0,
'filter' => 'digits',
'options' => array(
@@ -60,7 +67,9 @@
'collect' => array(
'required' => false,
'name' => tra('Collect'),
- 'description' => tra('Collect either originating (from) or wanted pages (to) in a cell and display them in the second column.'),
+ 'description' => tra('Collect either originating (from) or wanted pages (to) in a cell and display them
+ in the second column.'),
+ 'since' => '1',
'default' => 'from',
'filter' => 'alpha',
'options' => array(
@@ -73,6 +82,7 @@
'required' => false,
'name' => tra('Debug'),
'description' => tra('Switch on debug output with details about the items (debug not on by default)'),
+ 'since' => '1',
'default' => 0,
'filter' => 'digits',
'advanced' => true,
@@ -86,7 +96,9 @@
'table' => array(
'required' => false,
'name' => tra('Table'),
- 'description' => tra('Multiple collected items are separated in distinct table rows (default), or by comma or line break in one cell.'),
+ 'description' => tra('Multiple collected items are separated in distinct table rows (default), or by
+ comma or line break in one cell.'),
+ 'since' => '1',
'filter' => 'alpha',
'default' => 'sep',
'accepted' => 'sep, co, br',
@@ -100,8 +112,11 @@
'level' => array(
'required' => false,
'name' => tra('Level'),
- 'description' => tra('Filter the list of wanted pages according to page_regex or custom filter. The default value is the site\'s __current__ page_regex.'),
+ 'description' => tra('Filter the list of wanted pages according to page_regex or custom filter. The
+ default value is the site\'s __current__ page_regex.'),
+ 'since' => '1',
'default' => '',
+ 'filter' => 'alpha',
'advanced' => true,
'options' => array(
array('text' => '', 'value' => ''),
Modified: trunk/lib/wiki-plugins/wikiplugin_webdocviewer.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_webdocviewer.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_webdocviewer.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -10,24 +10,32 @@
return array(
'name' => tra('Web Document Viewer'),
'documentation' => 'PluginWebDocViewer',
- 'description' => tra('Display files found in a gallery or from a URL in an embedded document viewer'),
+ 'description' => tra('View a document in a page'),
'prefs' => array( 'wikiplugin_webdocviewer' ),
'tags' => array( 'basic' ),
+ 'iconname' => 'copy',
+ 'introduced' => 12,
'params' => array(
'fileId' => array(
'required' => false,
'name' => tra('File Id'),
'description' => tra('The FileId of a file in a File Gallery of the file you wish to embed in the viewer.'),
+ 'since' => '12.0',
+ 'filter' => 'digits',
),
'url' => array(
'required' => false,
'name' => tra('URL'),
- 'description' => tra('The URL of the file you wish to embed in the viewer. If the file is stored in File Galleries, please use the fileId parameter'),
+ 'description' => tr('The URL of the file you wish to embed in the viewer. If the file is stored in
+ File Galleries, please use the %0 parameter', '<code>fileId</code>'),
+ 'since' => '12.0',
+ 'filter' => 'url',
),
'width' => array(
'required' => false,
'name' => tra('Width'),
'description' => tra('Width in pixels'),
+ 'since' => '12.0',
'filter' => 'digits',
'default' => 425,
),
@@ -35,6 +43,7 @@
'required' => false,
'name' => tra('Height'),
'description' => tra('Height in pixels'),
+ 'since' => '12.0',
'filter' => 'digits',
'default' => 350,
),
Modified: trunk/lib/wiki-plugins/wikiplugin_webservice.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_webservice.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_webservice.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -10,16 +10,20 @@
return array(
'name' => tra('Web Service'),
'documentation' => 'PluginWebservice',
- 'description' => tra('Display remote information exposed in JSON or YAML.'),
+ 'description' => tra('Display remote information exposed in JSON or YAML or SOAP XML'),
'prefs' => array( 'wikiplugin_webservice' ),
- 'body' => tra('Template to apply to the data provided. Template format uses smarty templating engine using double brackets as delimiter. Output must provide wiki syntax. Body can be sent to a parameter instead by using the bodyname parameter.'),
+ 'body' => tr('Template to apply to the data provided. Template format uses smarty templating engine using
+ double brackets as delimiter. Output must provide wiki syntax. Body can be sent to a parameter instead by
+ using the %0 parameter.', '<code>bodyname</code>'),
'validate' => 'all',
- 'icon' => 'img/icons/world_go.png',
+ 'iconname' => 'move',
+ 'introduced' => 3,
'params' => array(
'url' => array(
'required' => false,
'name' => tra('URL'),
'description' => tra('Complete service URL'),
+ 'since' => '3.0',
'default' => '',
),
'service' => array(
@@ -27,13 +31,16 @@
'safe' => true,
'name' => tra('Service Name'),
'description' => tra('Registered service name.'),
+ 'since' => '3.0',
'default' => '',
),
'template' => array(
'required' => false,
'safe' => true,
'name' => tra('Template Name'),
- 'description' => tra('For use with registered services, name of the template to be used to display the service output. This parameter will be ignored if a body is provided.'),
+ 'description' => tra('For use with registered services, name of the template to be used to display the
+ service output. This parameter will be ignored if a body is provided.'),
+ 'since' => '3.0',
'default' => '',
),
'bodyname' => array(
@@ -41,17 +48,20 @@
'filter' => 'word',
'safe' => true,
'name' => tra('Body as Parameter'),
- 'description' => tra('Name of the argument to send the body as for services with complex input. Named service required for this to be useful.'),
+ 'description' => tra('Name of the argument to send the body as for services with complex input.
+ Named service required for this to be useful.'),
+ 'since' => '3.0',
'default' => '',
),
'params' => array(
'required' => false,
'safe' => true,
'name' => tra('Parameters'),
- 'description' => tra('Parameters formatted like a query : param1=value1&param2=value2.'),
+ 'description' => tra('Parameters formatted like a query')
+ . ': <code>param1=value1&param2=value2</code>',
+ 'since' => '7.0',
'default' => '',
),
-
),
);
}
Modified: trunk/lib/wiki-plugins/wikiplugin_wysiwyg.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_wysiwyg.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_wysiwyg.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -12,9 +12,10 @@
return array(
'name' => 'WYSIWYG',
'documentation' => 'PluginWYSIWYG',
- 'description' => tra('Permits to have a WYSIWYG section for part of a page.'),
+ 'description' => tra('Use a WYSIWYG editor to edit a section of content'),
'prefs' => array('wikiplugin_wysiwyg'),
- 'icon' => 'img/icons/mime/default.png',
+ 'iconname' => 'wysiwyg',
+ 'introduced' => 9,
'tags' => array( 'experimental' ),
'filter' => 'purifier', /* N.B. uses htmlpurifier to ensure only "clean" html gets in */
'format' => 'html',
@@ -24,21 +25,25 @@
'width' => array(
'required' => false,
'name' => tra('Width'),
- 'description' => tra('Minimum width for DIV. Default:500px'),
+ 'description' => tra('Minimum width for DIV. Default:') . ' <code>500px</code>',
+ 'since' => '9.0',
'filter' => 'text',
'default' => '500px',
),
'height' => array(
'required' => false,
'name' => tra('Height'),
- 'description' => tra('Minimum height for DIV. Default:300px.'),
+ 'description' => tra('Minimum height for DIV. Default:') . ' <code>300px</code>',
+ 'since' => '9.0',
'filter' => 'text',
'default' => '300px',
),
'use_html' => array(
'required' => false,
'name' => tra('Use HTML'),
- 'description' => tra('Overrides the "wysiwyg_htmltowiki" preference if needed. Defaults to "n" if wysiwyg_htmltowiki is set to "y".'),
+ 'description' => tr('Override the %0wysiwyg_htmltowiki%1 preference if needed. Defaults to No (%0n%1)
+ if wysiwyg_htmltowiki is set to Yes (%0y%1).', '<code>', '</code>'),
+ 'since' => '14.1',
'filter' => 'alpha',
'default' => $prefs['wysiwyg_htmltowiki'] == 'y' ? 'n' : 'y',
'options' => array(
Modified: trunk/lib/wiki-plugins/wikiplugin_youtube.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_youtube.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_youtube.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -10,15 +10,18 @@
return array(
'name' => tra('YouTube'),
'documentation' => 'PluginYouTube',
- 'description' => tra('Display a YouTube video'),
+ 'description' => tra('Embed a YouTube video in a page'),
'prefs' => array( 'wikiplugin_youtube' ),
- 'icon' => 'img/icons/youtube.png',
+ 'iconname' => 'youtube',
+ 'introduced' => 2,
'tags' => array( 'basic' ),
'params' => array(
'movie' => array(
'required' => true,
'name' => tra('Movie'),
- 'description' => tra('Entire URL to the YouTube video or last part (after www.youtube.com/v/ and before the first question mark)'),
+ 'description' => tr('Entire URL to the YouTube video or last part (after %0www.youtube.com/v/%1 and
+ before the first question mark)', '<code>', '</code>'),
+ 'since' => '2.0',
'filter' => 'url',
'default' => '',
),
@@ -37,14 +40,16 @@
'width' => array(
'required' => false,
'name' => tra('Width'),
- 'description' => tra('Width in pixels'),
+ 'description' => tra('Width in pixels.') . ' ' . tra('Default') . ' :<code>425</code>',
+ 'since' => '2.0',
'filter' => 'digits',
'default' => 425,
),
'height' => array(
'required' => false,
'name' => tra('Height'),
- 'description' => tra('Height in pixels'),
+ 'description' => tra('Height in pixels') . ' ' . tra('Default') . ' :<code>350</code>',
+ 'since' => '2.0',
'filter' => 'digits',
'default' => 350,
),
@@ -58,7 +63,8 @@
'quality' => array(
'required' => false,
'name' => tra('Quality'),
- 'description' => tra('Quality of the video. Default is high.'),
+ 'description' => tr('Quality of the video. Default is %0high%1.', '<code>', '</code>'),
+ 'since' => '2.0',
'default' => 'high',
'filter' => 'alpha',
'options' => array(
@@ -73,6 +79,7 @@
'required' => false,
'name' => tra('Allow Fullscreen'),
'description' => tra('Enlarge video to full screen size'),
+ 'since' => '5.0',
'default' => '',
'filter' => 'alpha',
'options' => array(
@@ -86,7 +93,7 @@
'required' => false,
'name' => tra('Related'),
'description' => tra('Show related videos (shown by default)'),
- 'since' => 6.1,
+ 'since' => '6.1',
'default' => '',
'filter' => 'alpha',
'options' => array(
@@ -99,20 +106,22 @@
'background' => array(
'required' => false,
'name' => tra('Background'),
- 'description' => tra('Toolbar background color. Use an HTML color code. Example: ffffff'),
+ 'description' => tra('Toolbar background color. Use an HTML color code.') . ' ' . tra('Example')
+ . ': <code>ffffff</code>',
'accepted' => tra('HTML color code, e.g. ffffff'),
- 'since' => 6.1,
- 'filter' => 'striptags',
+ 'since' => '6.1',
+ 'filter' => 'text',
'default' => '',
'advanced' => true
),
'border' => array(
'required' => false,
'name' => tra('Borders'),
- 'description' => tra('Toolbar border colors. Use an HTML color code. Example: ffffff'),
+ 'description' => tra('Toolbar border colors. Use an HTML color code.') . ' ' . tra('Example')
+ . ': <code>ffffff</code>',
'accepted' => tra('HTML color code, e.g. ffffff'),
- 'since' => 6.1,
- 'filter' => 'striptags',
+ 'since' => '6.1',
+ 'filter' => 'text',
'default' => '',
'advanced' => true
),
Modified: trunk/lib/wiki-plugins/wikiplugin_zotero.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_zotero.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_zotero.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -11,22 +11,30 @@
'name' => tra('Zotero Citation'),
'description' => tra('Retrieves and includes a Zotero reference in the page.'),
'prefs' => array('zotero_enabled', 'wikiplugin_zotero', 'wikiplugin_footnote'),
+ 'iconname' => 'bookmark',
+ 'introduced' => 7,
'params' => array(
'key' => array(
'name' => tra('Reference Key'),
- 'description' => tra('Unique reference for the group associated to the site. Can be retrieved from the Zotero Bibliography module.'),
+ 'description' => tra('Unique reference for the group associated to the site. Can be retrieved from the
+ Zotero Bibliography module.'),
'required' => false,
+ 'since' => '7.0',
'filter' => 'alnum',
),
'tag' => array(
'name' => tra('Reference Tag'),
- 'description' => tra('Uses the first result using the specified tag. Useful when the tag mechanism is coerced into creating unique human memorizable keys.'),
+ 'description' => tra('Uses the first result using the specified tag. Useful when the tag mechanism is
+ coerced into creating unique human memorizable keys.'),
+ 'since' => '7.0',
'required' => false,
'filter' => 'alnum',
),
'note' => array(
'name' => tra('Note'),
- 'description' => tra('Append a note to the reference for additional information, like page numbers or other sub-references.'),
+ 'description' => tra('Append a note to the reference for additional information, like page numbers or
+ other sub-references.'),
+ 'since' => '7.0',
'required' => false,
'filter' => 'text',
),
Modified: trunk/lib/wiki-plugins/wikiplugin_zoterolist.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_zoterolist.php 2015-10-04 15:10:22 UTC (rev 56404)
+++ trunk/lib/wiki-plugins/wikiplugin_zoterolist.php 2015-10-04 15:10:57 UTC (rev 56405)
@@ -9,12 +9,15 @@
{
return array(
'name' => tra('Zotero Reference List'),
- 'description' => tra('Produces the complete reference list from the Zotero server.'),
+ 'description' => tra('Display the complete reference list from a Zotero server'),
'prefs' => array('zotero_enabled', 'wikiplugin_zoterolist'),
+ 'iconname' => 'bookmark',
+ 'introduced' => 7,
'params' => array(
'tag' => array(
'name' => tra('Tag'),
'description' => tra('Provide the list of references with a given tag.'),
+ 'since' => '7.0',
'required' => true,
'filter' => 'alnum',
),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-04 15:59:25
|
Revision: 56406
http://sourceforge.net/p/tikiwiki/code/56406
Author: jonnybradley
Date: 2015-10-04 15:59:23 +0000 (Sun, 04 Oct 2015)
Log Message:
-----------
[FIX] upload: Fix progress bar and use one per upload and add a cancel/clear button
Modified Paths:
--------------
trunk/lib/jquery_tiki/tiki-jquery_upload.js
trunk/templates/file/jquery_upload.tpl
Modified: trunk/lib/jquery_tiki/tiki-jquery_upload.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-04 15:10:57 UTC (rev 56405)
+++ trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-04 15:59:23 UTC (rev 56406)
@@ -12,7 +12,7 @@
uploadButton = $('<button/>')
.addClass('btn btn-primary')
.prop('disabled', true)
- .text('Processing...')
+ .text(tr('Processing...'))
.on('click', function () {
var $this = $(this),
data = $this.data();
@@ -24,8 +24,15 @@
data.abort();
});
data.submit().always(function () {
+ $this.next("button").text(tr("Clear"));
$this.remove();
});
+ }),
+ cancelButton = $('<button/>')
+ .addClass('btn btn-default')
+ .text(tr('Cancel'))
+ .on('click', function () {
+ $(this).parents("div:first").remove();
});
$('#fileupload').fileupload({
url: url,
@@ -57,12 +64,12 @@
$.each(data.files, function (index, file) {
var node = $('<p/>')
.append($('<span/>').text(file.name));
+ node.appendTo(data.context);
if (!index) {
- node
- .append('<br>')
- .append(uploadButton.clone(true).data(data));
+ data.context
+ .append(uploadButton.clone(true).data(data))
+ .append(cancelButton.clone(true).data(data));
}
- node.appendTo(data.context);
});
}).on('fileuploadprocessalways', function (e, data) {
var index = data.index,
@@ -75,26 +82,23 @@
var node = $(context.children()[index]);
if (file.preview) {
- node
- .prepend('<br>')
- .prepend(file.preview);
+ node.prepend(file.preview);
}
if (file.error) {
- node
- .append('<br>')
- .append($('<span class="text-danger"/>').text(file.error));
+ node.append($('<span class="text-danger"/>').text(file.error));
}
if (index + 1 === data.files.length) {
- context.find('button')
+ context.find('button:first')
.text('Upload')
.prop('disabled', !!data.files.error);
+
+ var $progdiv = $('<div class="progress"/>')
+ .append('<div class="progress-bar progress-bar-success"/>');
+
+ context.find("canvas").after($progdiv);
+
+
}
- }).on('fileuploadprogressall', function (e, data) {
- var progress = parseInt(data.loaded / data.total * 100, 10);
- $('.progress-bar', '#progress').css(
- 'width',
- progress + '%'
- );
}).on('fileuploaddone', function (e, data) {
$.each(data.result.files, function (index, file) {
@@ -110,8 +114,8 @@
.wrap(link)
.find("span").text(file.info.name);
- $(context)
- .append("<code>" + file.syntax + "</code>");
+ $(context).find("a")
+ .after("<code>" + file.syntax + "</code><br>");
} else if (file.error) {
var error = $('<span class="text-danger"/>').text(file.error);
@@ -122,6 +126,8 @@
}
});
+ e.preventDefault();
+
}).on('fileuploadfail', function (e, data) {
$.each(data.files, function (index) {
var error = $('<span class="text-danger"/>').text(tr('File upload failed: ') + data.errorThrown),
Modified: trunk/templates/file/jquery_upload.tpl
===================================================================
--- trunk/templates/file/jquery_upload.tpl 2015-10-04 15:10:57 UTC (rev 56405)
+++ trunk/templates/file/jquery_upload.tpl 2015-10-04 15:59:23 UTC (rev 56406)
@@ -7,9 +7,5 @@
<!-- The file input field used as target for the file upload widget -->
<input id="fileupload" type="file" name="files[]" multiple>
</div>
-{* The global progress bar *}
-<div id="progress" class="progress margin-bottom-sm">
- <div class="progress-bar progress-bar-success"></div>
-</div>
{* The container for the uploaded files *}
-<table id="files" class="files"></table>
+<div id="files" class="files"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2015-10-04 17:34:48
|
Revision: 56412
http://sourceforge.net/p/tikiwiki/code/56412
Author: lindonb
Date: 2015-10-04 17:34:46 +0000 (Sun, 04 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56404 to 56411
Modified Paths:
--------------
trunk/lib/core/Services/User/Controller.php
trunk/lib/wiki/pluginslib.php
trunk/lib/wiki-plugins/wikiplugin_sign.php
trunk/templates/tiki-plugin_help.tpl
trunk/templates/user/info.tpl
trunk/themes/base_files/css/tiki_base.css
trunk/themes/base_files/less/tiki-wikipages_and_plugins.less
Property Changed:
----------------
trunk/
trunk/templates/
Index: trunk
===================================================================
--- trunk 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk 2015-10-04 17:34:46 UTC (rev 56412)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56404
+/branches/14.x:54079-56411
/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/core/Services/User/Controller.php
===================================================================
--- trunk/lib/core/Services/User/Controller.php 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk/lib/core/Services/User/Controller.php 2015-10-04 17:34:46 UTC (rev 56412)
@@ -229,7 +229,7 @@
}
if ($prefs['feature_community_mouseover_lastlogin'] == 'y') {
- $result['lastSeen'] = $info['currentLogin'] ? $info['currentLogin'] : $info['lastLogin'];
+ $result['lastSeen'] = $info['currentLogin'] ? $info['currentLogin'] : null;
}
Modified: trunk/lib/wiki/pluginslib.php
===================================================================
--- trunk/lib/wiki/pluginslib.php 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk/lib/wiki/pluginslib.php 2015-10-04 17:34:46 UTC (rev 56412)
@@ -209,7 +209,7 @@
$sOutput .= '<em>'. tra('Required parameters are in</em> <b>bold</b>') . '<br />';
}
// Header for info
- $sOutput .= '<table class="table table-striped table-hover normal">' . "\n\t" . '<tr>' . "\n\t\t"
+ $sOutput .= '<table class="table table-striped table-hover">' . "\n\t" . '<tr>' . "\n\t\t"
. '<td class="heading"' . $sStyle. '>' . tra($aPrincipalField['name']) . '</td>';
foreach ($aInfo as $iInfo => $sHeader) {
if ($sHeader == 'paraminfo') {
@@ -321,7 +321,7 @@
$aPrincipalField = array('field' => 'pageName', 'name' => 'Pages');
// Header for info
- $sOutput = '<table class="table table-striped table-hover normal"><tr><th class="heading">'
+ $sOutput = '<table class="table table-striped table-hover"><tr><th class="heading">'
. tra($aPrincipalField['name']) . '</th></tr><tr><td>';
$iCounter = 0;
// create a comma separated list of entries
Modified: trunk/lib/wiki-plugins/wikiplugin_sign.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_sign.php 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk/lib/wiki-plugins/wikiplugin_sign.php 2015-10-04 17:34:46 UTC (rev 56412)
@@ -78,7 +78,7 @@
$tip = $smarty->fetch('wiki-plugins/wikiplugin_sign.tpl');
$smarty->loadPlugin('smarty_function_icon');
- $icon = smarty_function_icon(array('_id' => 'text_signature', 'title' => '', 'class' => 'wp-sign-icon'), $smarty);
+ $icon = smarty_function_icon(array('name' => 'pencil', 'title' => '', 'iclass' => 'wp-sign-icon'), $smarty);
TikiLib::lib('header')-> add_jq_onready(
'
Index: trunk/templates
===================================================================
--- trunk/templates 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk/templates 2015-10-04 17:34:46 UTC (rev 56412)
Property changes on: trunk/templates
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x/templates:45702-47762
/branches/12.x/templates:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53463,53608,55301
/branches/13.x/templates:51407-53060,53145,53192
-/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382,56385-56387
+/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382,56385-56387,56405-56411
/branches/3.0/templates:16998-18916
/branches/4.x/templates:22817-23908
/branches/5.x/templates:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/templates/tiki-plugin_help.tpl
===================================================================
--- trunk/templates/tiki-plugin_help.tpl 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk/templates/tiki-plugin_help.tpl 2015-10-04 17:34:46 UTC (rev 56412)
@@ -4,13 +4,7 @@
<em>{$plugin_name|lower}</em>
{if $prefs.javascript_enabled eq 'y' && $area_id}
- <a href="javascript:void(0);" onclick="needToConfirm=false;$.closeModal();popup_plugin_form('{$area_id}','{$plugin_name|lower|@addslashes}');return false;">
- {if !empty($plugin.iconname)}
- {icon name=$plugin.iconname _text="{tr}Insert{/tr}"}
- {else}
- {icon _id=$plugin.icon|default:"plugin_add" _text="{tr}Insert{/tr}"}
- {/if}
- </a>
+ <a href="javascript:void(0);" onclick="needToConfirm=false;$.closeModal();popup_plugin_form('{$area_id}','{$plugin_name|lower|@addslashes}');return false;">{icon name=$plugin.iconname|default:"plugin" _text="{tr}Insert{/tr}"}</a>
{/if}
{if $prefs.feature_help eq 'y'}
{if !empty($plugin.documentation)}
Modified: trunk/templates/user/info.tpl
===================================================================
--- trunk/templates/user/info.tpl 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk/templates/user/info.tpl 2015-10-04 17:34:46 UTC (rev 56412)
@@ -49,7 +49,7 @@
{/if}
<tr>
<td><strong>{tr}Last login{/tr}</strong></td>
- <td>{$lastSeen|tiki_short_datetime}</td>
+ <td>{if !empty($lastSeen)}{$lastSeen|tiki_short_datetime}{else}{tr}Never logged in{/tr}{/if}</td>
</tr>
{if $shared_groups}
<tr>
Modified: trunk/themes/base_files/css/tiki_base.css
===================================================================
--- trunk/themes/base_files/css/tiki_base.css 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk/themes/base_files/css/tiki_base.css 2015-10-04 17:34:46 UTC (rev 56412)
@@ -4042,7 +4042,6 @@
overflow: hidden;
position: absolute;
z-index: 1;
- background-image: url('../../../img/icons/text_signature.png');
background-repeat: no-repeat;
padding: 0.3em;
vertical-align: bottom;
Modified: trunk/themes/base_files/less/tiki-wikipages_and_plugins.less
===================================================================
--- trunk/themes/base_files/less/tiki-wikipages_and_plugins.less 2015-10-04 17:33:47 UTC (rev 56411)
+++ trunk/themes/base_files/less/tiki-wikipages_and_plugins.less 2015-10-04 17:34:46 UTC (rev 56412)
@@ -778,7 +778,6 @@
overflow: hidden;
position: absolute;
z-index: 1;
- background-image: url('@{imagePathToIcons}text_signature.png');
background-repeat: no-repeat;
padding: 0.3em;
vertical-align: bottom;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-04 18:53:03
|
Revision: 56413
http://sourceforge.net/p/tikiwiki/code/56413
Author: jonnybradley
Date: 2015-10-04 18:53:00 +0000 (Sun, 04 Oct 2015)
Log Message:
-----------
[ENH] upload: Add automatic upload checkbox (and store setting in a user pref)
Modified Paths:
--------------
trunk/lib/core/Services/File/Controller.php
trunk/lib/jquery_tiki/tiki-jquery_upload.js
trunk/templates/file/jquery_upload.tpl
Modified: trunk/lib/core/Services/File/Controller.php
===================================================================
--- trunk/lib/core/Services/File/Controller.php 2015-10-04 17:34:46 UTC (rev 56412)
+++ trunk/lib/core/Services/File/Controller.php 2015-10-04 18:53:00 UTC (rev 56413)
@@ -132,6 +132,13 @@
throw new Services_Exception_NotAvailable(tr('File could not be uploaded.'));
}
}
+
+ global $user;
+ if ($input->autoupload->word()) {
+ TikiLib::lib('user')->set_user_preference($user, 'filegals_autoupload', 'y');
+ } else {
+ TikiLib::lib('user')->set_user_preference($user, 'filegals_autoupload', 'n');
+ }
}
return $output;
Modified: trunk/lib/jquery_tiki/tiki-jquery_upload.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-04 17:34:46 UTC (rev 56412)
+++ trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-04 18:53:00 UTC (rev 56413)
@@ -59,7 +59,7 @@
}).on('fileuploadadd', function (e, data) {
- data.context = $('<div/>').appendTo('#files');
+ data.context = $('<div/>').addClass("margin-bottom-md").appendTo('#files');
$.each(data.files, function (index, file) {
var node = $('<p/>')
@@ -92,12 +92,14 @@
.text('Upload')
.prop('disabled', !!data.files.error);
- var $progdiv = $('<div class="progress"/>')
+ var $progdiv = $('<div class="progress margin-bottom-xs"/>')
.append('<div class="progress-bar progress-bar-success"/>');
context.find("canvas").after($progdiv);
-
+ if ($("input[name=autoupload]:checked").length) {
+ context.find('button:first').click();
+ }
}
}).on('fileuploaddone', function (e, data) {
$.each(data.result.files, function (index, file) {
@@ -118,12 +120,16 @@
if (match) {
$(context).find("a").click(function () {
window.opener.insertAt(match[1], file.syntax);
- checkClose();;
+ checkClose();
return false;
}).attr("title", tr("Click here to use the file"));
} else {
$(context).find("a")
.after("<code>" + file.syntax + "</code><br>");
+
+ if (jqueryTiki.colorbox) {
+ context.find("a").colorbox({photo: true});
+ }
}
} else if (file.error) {
Modified: trunk/templates/file/jquery_upload.tpl
===================================================================
--- trunk/templates/file/jquery_upload.tpl 2015-10-04 17:34:46 UTC (rev 56412)
+++ trunk/templates/file/jquery_upload.tpl 2015-10-04 18:53:00 UTC (rev 56413)
@@ -2,10 +2,14 @@
{* Used by smarty_function_filegal_uploader() when $prefs.file_galleries_use_jquery_upload is enabled *}
{* The fileinput-button span is used to style the file input field as button *}
<div class="btn btn-success fileinput-button margin-bottom-sm">
- {icon name='plus'}
- <span>Add files...</span>
- <!-- The file input field used as target for the file upload widget -->
- <input id="fileupload" type="file" name="files[]" multiple>
+ {icon name='plus'}
+ <span>Add files...</span>
+ {* The file input field used as target for the file upload widget *}
+ <input id="fileupload" type="file" name="files[]" multiple>
+ {* auto-upload user pref *}
</div>
-{* The container for the uploaded files *}
+<label>
+ <input type="checkbox" name="autoupload"{if $prefs.filegals_autoupload eq 'y'} checked="checked"{/if}>
+ {tr}Automatic upload{/tr}
+</label>{* The container for the uploaded files *}
<div id="files" class="files"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2015-10-05 01:47:35
|
Revision: 56417
http://sourceforge.net/p/tikiwiki/code/56417
Author: lindonb
Date: 2015-10-05 01:47:32 +0000 (Mon, 05 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56411 to 56416
Modified Paths:
--------------
trunk/lib/wiki-plugins/wikiplugin_article.php
trunk/lib/wiki-plugins/wikiplugin_articles.php
trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php
trunk/themes/base_files/iconsets/default.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-05 01:46:12 UTC (rev 56416)
+++ trunk 2015-10-05 01:47:32 UTC (rev 56417)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56411
+/branches/14.x:54079-56416
/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/wiki-plugins/wikiplugin_article.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_article.php 2015-10-05 01:46:12 UTC (rev 56416)
+++ trunk/lib/wiki-plugins/wikiplugin_article.php 2015-10-05 01:47:32 UTC (rev 56417)
@@ -12,7 +12,7 @@
'documentation' => 'PluginArticle',
'description' => tra('Display a field of an article'),
'prefs' => array( 'feature_articles', 'wikiplugin_article' ),
- 'iconname' => 'article',
+ 'iconname' => 'articles',
'format' => 'html',
'introduced' => 1,
'params' => array(
Modified: trunk/lib/wiki-plugins/wikiplugin_articles.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_articles.php 2015-10-05 01:46:12 UTC (rev 56416)
+++ trunk/lib/wiki-plugins/wikiplugin_articles.php 2015-10-05 01:47:32 UTC (rev 56417)
@@ -13,7 +13,7 @@
'documentation' => 'PluginArticles',
'description' => tra('Display multiple articles'),
'prefs' => array( 'feature_articles', 'wikiplugin_articles' ),
- 'iconname' => 'article',
+ 'iconname' => 'articles',
'tags' => array( 'basic' ),
'introduced' => 1,
'params' => array(
Modified: trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php 2015-10-05 01:46:12 UTC (rev 56416)
+++ trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php 2015-10-05 01:47:32 UTC (rev 56417)
@@ -13,7 +13,7 @@
'description' => tra('Allow users to subscribe to a newsletter'),
'prefs' => array('feature_newsletters', 'wikiplugin_subscribenewsletter'),
'body' => tra('Invitation message'),
- 'iconname' => 'article',
+ 'iconname' => 'articles',
'introduced' => 5,
'tags' => array( 'basic' ),
'params' => array(
Modified: trunk/themes/base_files/iconsets/default.php
===================================================================
--- trunk/themes/base_files/iconsets/default.php 2015-10-05 01:46:12 UTC (rev 56416)
+++ trunk/themes/base_files/iconsets/default.php 2015-10-05 01:47:32 UTC (rev 56417)
@@ -194,7 +194,13 @@
'id' => 'step-backward',
),
//ban in defaults
+ 'box' => array(
+ 'id' => 'list-alt',
+ ),
//caret-left & caret-right in defaults
+ 'cart' => array(
+ 'id' => 'shopping-cart',
+ ),
'chart' => array(
'id' => 'area-chart',
),
@@ -214,6 +220,9 @@
'compose' => array(
'id' => 'pencil',
),
+ 'computer' => array(
+ 'id' => 'desktop',
+ ),
'contacts' => array(
'id' => 'group',
),
@@ -237,6 +246,9 @@
'id' => 'sort-desc',
),
//edit in defaults
+ 'education' => array(
+ 'id' => 'graduation-cap',
+ ),
'envelope' => array(
'id' => 'envelope-o',
),
@@ -295,6 +307,9 @@
'id' => 'external-link',
),
//list in defaults
+ 'list-numbered' => array(
+ 'id' => 'list-ol',
+ ),
//lock in defaults
//same fa icon used for admin_security, but not the same in other icon sets
'log' => array(
@@ -309,6 +324,9 @@
'mailbox' => array(
'id' => 'inbox',
),
+ 'map' => array(
+ 'id' => 'map-marker',
+ ),
'menu' => array(
'id' => 'bars',
),
@@ -367,6 +385,9 @@
'id' => 'arrow-left',
),
//print in defaults
+ 'quotes' => array(
+ 'id' => 'quote-left',
+ ),
'ranking' => array(
'id' => 'sort-numeric-asc',
),
@@ -451,6 +472,9 @@
'id' => 'trash-o',
),
//twitter in defaults
+ 'tv' => array(
+ 'id' => 'desktop',
+ ),
//undo in defaults
//unlock in defaults
'up' => array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-05 12:26:41
|
Revision: 56419
http://sourceforge.net/p/tikiwiki/code/56419
Author: jonnybradley
Date: 2015-10-05 12:26:38 +0000 (Mon, 05 Oct 2015)
Log Message:
-----------
[ENH] upload: Switch to using multiple uploads mode (so files selected together get uploaded together) and add some basic LESS/CSS styling
Modified Paths:
--------------
trunk/lib/jquery_tiki/tiki-jquery_upload.js
trunk/themes/base_files/css/tiki_base.css
trunk/themes/base_files/less/tiki-file_galleries.less
Modified: trunk/lib/jquery_tiki/tiki-jquery_upload.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-05 01:50:16 UTC (rev 56418)
+++ trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-05 12:26:38 UTC (rev 56419)
@@ -10,7 +10,7 @@
var url = $.service("file", "upload_multiple"), // upload handler:
uploadButton = $('<button/>')
- .addClass('btn btn-primary')
+ .addClass('btn btn-primary upload')
.prop('disabled', true)
.text(tr('Processing...'))
.on('click', function () {
@@ -32,8 +32,9 @@
.addClass('btn btn-default')
.text(tr('Cancel'))
.on('click', function () {
- $(this).parents("div:first").remove();
+ $(this).parents("div.file-list").remove();
});
+
$('#fileupload').fileupload({
url: url,
dataType: 'json',
@@ -48,9 +49,8 @@
previewMaxHeight: 100,
previewCrop: true,
- singleFileUploads: true, // make optional one day
+ singleFileUploads: false,
-
filesContainer: $('div.files'),
uploadTemplateId: null,
downloadTemplateId: null,
@@ -59,16 +59,21 @@
}).on('fileuploadadd', function (e, data) {
- data.context = $('<div/>').addClass("margin-bottom-md").appendTo('#files');
+ data.context = $('<div/>').addClass("file-list").appendTo('#files');
$.each(data.files, function (index, file) {
- var node = $('<p/>')
+ var node = $('<p/>').addClass("file-to-upload")
+ .append("<br>")
.append($('<span/>').text(file.name));
+
node.appendTo(data.context);
- if (!index) {
- data.context
+
+ if (index === data.files.length - 1) {
+ var $div = $("<div/>")
+ .addClass("buttons")
.append(uploadButton.clone(true).data(data))
.append(cancelButton.clone(true).data(data));
+ data.context.append($div);
}
});
}).on('fileuploadprocessalways', function (e, data) {
@@ -79,7 +84,7 @@
if (!context.length) { // context seems to fail here
context = $("div:contains("+file.name+")", "#files");
}
- var node = $(context.children()[index]);
+ var node = $(context.children("p")[index]);
if (file.preview) {
node.prepend(file.preview);
@@ -87,7 +92,7 @@
if (file.error) {
node.append($('<span class="text-danger"/>').text(file.error));
}
- if (index + 1 === data.files.length) {
+ if (index === data.files.length - 1) {
context.find('button:first')
.text('Upload')
.prop('disabled', !!data.files.error);
@@ -95,7 +100,7 @@
var $progdiv = $('<div class="progress margin-bottom-xs"/>')
.append('<div class="progress-bar progress-bar-success"/>');
- context.find("canvas").after($progdiv);
+ context.find(".buttons").prepend($progdiv);
if ($("input[name=autoupload]:checked").length) {
context.find('button:first').click();
@@ -112,7 +117,8 @@
.attr('target', '_blank')
.prop('href', display + file.fileId);
- $(context.children()[index])
+ $(context.children("p")[index])
+ .children()
.wrap(link)
.find("span").text(file.info.name);
@@ -124,8 +130,8 @@
return false;
}).attr("title", tr("Click here to use the file"));
} else {
- $(context).find("a")
- .after("<code>" + file.syntax + "</code><br>");
+ $(context).find("a:last")
+ .after("<br><code>" + file.syntax + "</code>");
if (jqueryTiki.colorbox) {
context.find("a").colorbox({photo: true});
Modified: trunk/themes/base_files/css/tiki_base.css
===================================================================
--- trunk/themes/base_files/css/tiki_base.css 2015-10-05 01:50:16 UTC (rev 56418)
+++ trunk/themes/base_files/css/tiki_base.css 2015-10-05 12:26:38 UTC (rev 56419)
@@ -1,4 +1,3 @@
-util.print: Use console.log instead
/* $Id$
This Tiki Wiki CMS Groupware file contains global design
and layout properties. */
@@ -1835,6 +1834,30 @@
#fgalexplorer > div > ul ul {
padding-left: 16px;
}
+/* additions for jquery file upload */
+.files .file-list {
+ overflow-x: scroll;
+ overflow-y: hidden;
+ white-space: nowrap;
+}
+.files .file-list .file-to-upload {
+ display: inline-block;
+ width: 120px;
+ overflow: hidden;
+ padding: 10px;
+ text-overflow: ellipsis;
+}
+.files .file-list .file-to-upload span {
+ font-size: x-small;
+}
+.files .file-list .file-to-upload code {
+ font-size: x-small;
+ white-space: normal;
+}
+.files .file-list .buttons {
+ clear: both;
+ margin: 10px;
+}
.statuson,
.statusoff {
padding: 3px 2px 0 2px;
Modified: trunk/themes/base_files/less/tiki-file_galleries.less
===================================================================
--- trunk/themes/base_files/less/tiki-file_galleries.less 2015-10-05 01:50:16 UTC (rev 56418)
+++ trunk/themes/base_files/less/tiki-file_galleries.less 2015-10-05 12:26:38 UTC (rev 56419)
@@ -192,3 +192,34 @@
#fgalexplorer > div > ul ul {
padding-left: 16px;
}
+
+/* additions for jquery file upload */
+
+.files .file-list {
+ overflow-x: scroll;
+ overflow-y: hidden;
+ white-space: nowrap;
+}
+
+.files .file-list .file-to-upload {
+ display: inline-block;
+ width: 120px;
+ overflow: hidden;
+ padding: 10px;
+ text-overflow: ellipsis;
+}
+
+.files .file-list .file-to-upload span{
+ font-size: x-small;
+}
+
+.files .file-list .file-to-upload code {
+ font-size: x-small;
+ white-space: normal;
+}
+
+.files .file-list .buttons {
+ clear: both;
+ margin: 10px;
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-05 14:53:47
|
Revision: 56420
http://sourceforge.net/p/tikiwiki/code/56420
Author: jonnybradley
Date: 2015-10-05 14:53:44 +0000 (Mon, 05 Oct 2015)
Log Message:
-----------
[ENH] upload: Add a few file type icons to stop client-side previews getting mixed up, and also remove the progress bar once it's served it's purpose
Modified Paths:
--------------
trunk/lib/jquery_tiki/tiki-jquery_upload.js
trunk/templates/file/jquery_upload.tpl
trunk/themes/base_files/css/tiki_base.css
trunk/themes/base_files/less/tiki-file_galleries.less
Modified: trunk/lib/jquery_tiki/tiki-jquery_upload.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-05 12:26:38 UTC (rev 56419)
+++ trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-05 14:53:44 UTC (rev 56420)
@@ -88,6 +88,18 @@
if (file.preview) {
node.prepend(file.preview);
+ } else {
+ var type = "file";
+ if (file.type.match(/pdf/)) {
+ type = "pdf";
+ } else if (file.type.match(/video/)) {
+ type = "video";
+ } else if (file.type.match(/audio/)) {
+ type = "audio";
+ } else if (file.type.match(/zip/)) {
+ type = "zip";
+ }
+ node.prepend($("#" + type + "_icon").clone().removeAttr("id"));
}
if (file.error) {
node.append($('<span class="text-danger"/>').text(file.error));
@@ -145,6 +157,10 @@
.append('<br>')
.append(error);
}
+ if (index = data.files.length - 1) {
+ context.find(".progress").delay(1000).fadeOut("fast");
+ }
+
});
e.preventDefault();
Modified: trunk/templates/file/jquery_upload.tpl
===================================================================
--- trunk/templates/file/jquery_upload.tpl 2015-10-05 12:26:38 UTC (rev 56419)
+++ trunk/templates/file/jquery_upload.tpl 2015-10-05 14:53:44 UTC (rev 56420)
@@ -6,10 +6,16 @@
<span>Add files...</span>
{* The file input field used as target for the file upload widget *}
<input id="fileupload" type="file" name="files[]" multiple>
- {* auto-upload user pref *}
</div>
-<label>
+<label>{* auto-upload user pref *}
<input type="checkbox" name="autoupload"{if $prefs.filegals_autoupload eq 'y'} checked="checked"{/if}>
{tr}Automatic upload{/tr}
</label>{* The container for the uploaded files *}
<div id="files" class="files"></div>
+<div class="hidden">
+ {icon name='file' id='file_icon'}
+ {icon name='pdf' id='pdf_icon'}
+ {icon name='video' id='video_icon'}
+ {icon name='audio' id='audio_icon'}
+ {icon name='zip' id='zip_icon'}
+</div>
Modified: trunk/themes/base_files/css/tiki_base.css
===================================================================
--- trunk/themes/base_files/css/tiki_base.css 2015-10-05 12:26:38 UTC (rev 56419)
+++ trunk/themes/base_files/css/tiki_base.css 2015-10-05 14:53:44 UTC (rev 56420)
@@ -1858,6 +1858,11 @@
clear: both;
margin: 10px;
}
+.files .file-list span.icon {
+ font-size: 90px;
+ width: 100px;
+ height: 100px;
+}
.statuson,
.statusoff {
padding: 3px 2px 0 2px;
Modified: trunk/themes/base_files/less/tiki-file_galleries.less
===================================================================
--- trunk/themes/base_files/less/tiki-file_galleries.less 2015-10-05 12:26:38 UTC (rev 56419)
+++ trunk/themes/base_files/less/tiki-file_galleries.less 2015-10-05 14:53:44 UTC (rev 56420)
@@ -223,3 +223,9 @@
margin: 10px;
}
+.files .file-list span.icon {
+ font-size: 90px;
+ width: 100px;
+ height: 100px;
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-05 18:30:12
|
Revision: 56421
http://sourceforge.net/p/tikiwiki/code/56421
Author: jonnybradley
Date: 2015-10-05 18:30:09 +0000 (Mon, 05 Oct 2015)
Log Message:
-----------
[ENH] pdf: Add support for Weasyprint - see http://weasyprint.org for more info (thanks marclaporte)
Modified Paths:
--------------
trunk/lib/pdflib.php
trunk/lib/prefs/print.php
trunk/templates/admin/include_general.tpl
Modified: trunk/lib/pdflib.php
===================================================================
--- trunk/lib/pdflib.php 2015-10-05 14:53:44 UTC (rev 56420)
+++ trunk/lib/pdflib.php 2015-10-05 18:30:09 UTC (rev 56421)
@@ -23,10 +23,16 @@
if ( $prefs['print_pdf_from_url'] == 'webkit' ) {
$path = $prefs['print_pdf_webkit_path'];
- if ( ! empty($path) && is_executable($path) ) {
+ if (!empty($path) && is_executable($path)) {
$this->mode = 'webkit';
$this->location = $path;
}
+ } else if ($prefs['print_pdf_from_url'] == 'weasyprint') {
+ $path = $prefs['print_pdf_weasyprint_path'];
+ if (!empty($path) && is_executable($path)) {
+ $this->mode = 'weasyprint';
+ $this->location = $path;
+ }
} elseif ( $prefs['print_pdf_from_url'] == 'webservice' ) {
if ( ! empty( $prefs['print_pdf_webservice_url'] ) ) {
$this->mode = 'webservice';
@@ -107,6 +113,45 @@
return $pdf;
}
+ /**
+ * @param $url
+ * @return mixed
+ */
+ private function weasyprint( $url )
+ {
+ // Make sure shell_exec is available
+ if (!function_exists('shell_exec')) {
+ die(tra('Required function shell_exec is not enabled.'));
+ }
+
+ // escapeshellarg will replace all % characters with spaces on Windows
+ // So, decode the URL before sending it to the commandline
+ $urlDecoded = urldecode($url);
+ $arg = escapeshellarg($urlDecoded);
+
+ // Write a temporary file, instead of using stdout
+ // There seemed to be encoding issues when using stdout (on Windows 7 64 bit).
+
+ // Use temp/public. It is cleaned up during a cache clean, in case some files are left
+ $filename = 'temp/public/out'.rand().'.pdf';
+
+ // Run shell_exec command to generate out file
+ // NOTE: this requires write permissions
+ $quotedFilename = '"'.$filename.'"';
+ $quotedCommand = '"'.$this->location.'"';
+
+ // redirect STDERR to null with 2>/dev/null becasue it outputs plenty of irrelevant warnings (hopefully nothing critical)
+ `$quotedCommand $arg $quotedFilename 2>/dev/null`;
+
+ // Read the out file
+ $pdf = file_get_contents($filename);
+
+ // Delete the outfile
+ unlink($filename);
+
+ return $pdf;
+ }
+
/**
* @param $url
* @return bool
Modified: trunk/lib/prefs/print.php
===================================================================
--- trunk/lib/prefs/print.php 2015-10-05 14:53:44 UTC (rev 56420)
+++ trunk/lib/prefs/print.php 2015-10-05 18:30:09 UTC (rev 56421)
@@ -15,6 +15,7 @@
'options' => array(
'none' => tra('Disabled'),
'webkit' => tra('WebKit (wkhtmltopdf)'),
+ 'weasyprint' => tra('Weasyprint'),
'webservice' => tra('Webservice'),
),
'default' => 'none',
@@ -36,6 +37,15 @@
'dependencies' => array('auth_token_access'),
'default' => '',
),
+ 'print_pdf_weasyprint_path' => array(
+ 'name' => tra('Weasyprint path'),
+ 'description' => tra('Full path to the weasyprint executable to generate the PDF document with.'),
+ 'type' => 'text',
+ 'size' => 50,
+ 'help' => 'weasyprint',
+ 'dependencies' => array('auth_token_access'),
+ 'default' => '',
+ ),
);
}
Modified: trunk/templates/admin/include_general.tpl
===================================================================
--- trunk/templates/admin/include_general.tpl 2015-10-05 14:53:44 UTC (rev 56420)
+++ trunk/templates/admin/include_general.tpl 2015-10-05 18:30:09 UTC (rev 56421)
@@ -194,6 +194,9 @@
<div class="adminoptionboxchild print_pdf_from_url_childcontainer webkit">
{preference name=print_pdf_webkit_path}
</div>
+ <div class="adminoptionboxchild print_pdf_from_url_childcontainer weasyprint">
+ {preference name=print_pdf_weasyprint_path}
+ </div>
<div class="adminoptionboxchild print_pdf_from_url_childcontainer webservice">
{preference name=print_pdf_webservice_url}
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nk...@us...> - 2015-10-06 06:11:26
|
Revision: 56422
http://sourceforge.net/p/tikiwiki/code/56422
Author: nkoth
Date: 2015-10-06 06:11:24 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
[NEW] Wiki tracker field, embeds and associates tracker item to actual wiki page (basically working, still testing for bugs)
Modified Paths:
--------------
trunk/lib/core/Tracker/Definition.php
trunk/lib/setup/events.php
trunk/lib/trackers/trackerlib.php
Added Paths:
-----------
trunk/lib/core/Tracker/Field/Wiki.php
trunk/templates/trackerinput/wiki.tpl
Modified: trunk/lib/core/Tracker/Definition.php
===================================================================
--- trunk/lib/core/Tracker/Definition.php 2015-10-05 18:30:09 UTC (rev 56421)
+++ trunk/lib/core/Tracker/Definition.php 2015-10-06 06:11:24 UTC (rev 56422)
@@ -215,6 +215,17 @@
}
}
+ function getWikiFields()
+ {
+ $fields = array();
+ foreach ($this->getFields() as $field) {
+ if ($field['type'] == 'wiki') {
+ $fields[] = $field['fieldId'];
+ }
+ }
+ return $fields;
+ }
+
function getIconField()
{
foreach ($this->getFields() as $field) {
Added: trunk/lib/core/Tracker/Field/Wiki.php
===================================================================
--- trunk/lib/core/Tracker/Field/Wiki.php (rev 0)
+++ trunk/lib/core/Tracker/Field/Wiki.php 2015-10-06 06:11:24 UTC (rev 56422)
@@ -0,0 +1,318 @@
+<?php
+// (c) Copyright 2002-2015 by authors of the Tiki Wiki CMS Groupware Project
+//
+// All Rights Reserved. See copyright.txt for details and a complete list of authors.
+// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+// $Id$
+
+class Tracker_Field_Wiki extends Tracker_Field_Text
+{
+ public static function getTypes()
+ {
+ global $prefs;
+ return array(
+ 'wiki' => array(
+ 'name' => tr('Wiki Page'),
+ 'description' => tr('Embeds an associated wiki page'),
+ 'help' => 'Wiki page Tracker Field',
+ 'prefs' => array('trackerfield_wiki'),
+ 'tags' => array('basic'),
+ 'default' => 'y',
+ 'params' => array(
+ 'fieldIdForPagename' => array(
+ 'name' => tr('Field that is used for Wiki Page Name'),
+ 'description' => tr('Field to get page name to create page name with.'),
+ 'filter' => 'int',
+ 'profile_reference' => 'tracker_field',
+ ),
+ 'namespace' => array(
+ 'name' => tr('Namespace for Wiki Page'),
+ 'description' => tr('The namespace to use for the wiki page to prevent page name clashes. See namespace feature for more information.'),
+ 'filter' => 'alpha',
+ 'options' => array(
+ 'default' => tr('Default (trackerfield<fieldId>)'),
+ 'none' => tr('No namespace'),
+ 'custom' => tr('Custom namespace'),
+ ),
+ 'default' => 'default',
+ ),
+ 'customnamespace' => array(
+ 'name' => tr('Custom Namespace'),
+ 'description' => tr('The custom namespace to use if the custom option is selected.'),
+ 'filter' => 'alpha',
+ ),
+ 'syncwikipagename' => array(
+ 'name' => tr('Rename Wiki Page when changed in tracker'),
+ 'description' => tr('Rename associated wiki page when the field that is used for Wiki Page Name is changed.'),
+ 'default' => $prefs['tracker_wikirelation_synctitle'],
+ 'filter' => 'alpha',
+ 'options' => array(
+ 'n' => tr('No'),
+ 'y' => tr('Yes'),
+ ),
+ ),
+ 'syncwikipagedelete' => array(
+ 'name' => tr('Delete Wiki Page when tracker item is deleted'),
+ 'description' => tr('Delete associated wiki page when the tracker item is deleted.'),
+ 'default' => 'n',
+ 'filter' => 'alpha',
+ 'options' => array(
+ 'n' => tr('No'),
+ 'y' => tr('Yes'),
+ ),
+ ),
+ 'toolbars' => array(
+ 'name' => tr('Toolbars'),
+ 'description' => tr('Enable the toolbars as syntax helpers.'),
+ 'filter' => 'int',
+ 'options' => array(
+ 0 => tr('Disable'),
+ 1 => tr('Enable'),
+ ),
+ 'default' => 1,
+ ),
+ 'width' => array(
+ 'name' => tr('Width'),
+ 'description' => tr('Size of the text area in characters.'),
+ 'filter' => 'int',
+ ),
+ 'height' => array(
+ 'name' => tr('Height'),
+ 'description' => tr('Size of the text area in lines.'),
+ 'filter' => 'int',
+ ),
+ 'max' => array(
+ 'name' => tr('Character Limit'),
+ 'description' => tr('Maximum amount of characters to be stored.'),
+ 'filter' => 'int',
+ ),
+ 'wordmax' => array(
+ 'name' => tr('Word Count'),
+ 'description' => tr('Limit the length of the text in words.'),
+ 'filter' => 'int',
+ ),
+ 'wysiwyg' => array(
+ 'name' => tr('Use WYSIWYG'),
+ 'description' => tr('Use a rich text editor instead of a plain text box.'),
+ 'default' => 'n',
+ 'filter' => 'alpha',
+ 'options' => array(
+ 'n' => tr('No'),
+ 'y' => tr('Yes'),
+ ),
+ ),
+ 'samerow' => array(
+ 'name' => tr('Same Row'),
+ 'description' => tr('Display the field name and input on the same row.'),
+ 'deprecated' => false,
+ 'filter' => 'int',
+ 'default' => 1,
+ 'options' => array(
+ 0 => tr('No'),
+ 1 => tr('Yes'),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+
+ function isValid($ins_fields_data)
+ {
+ $pagenameField = $this->getOption('fieldIdForPagename');
+ $pagename = $ins_fields_data[$pagenameField]['value'];
+ $itemId = $this->getItemId();
+
+ if (TikiLib::lib('trk')->check_field_value_exists($pagename, $pagenameField, $itemId)) {
+ return tr('The page name provided already exists. Please choose another.');
+ }
+
+ if (TikiLib::lib('wiki')->contains_badchars($pagename)) {
+ $bad_chars = TikiLib::lib('wiki')->get_badchars();
+ return tr('The page name specified contains unallowed characters. It will not be possible to save the page until those are removed: %0', $bad_chars);
+ }
+
+ return true;
+ }
+
+ function getFieldData(array $requestData = array())
+ {
+ $ins_id = $this->getInsertId();
+
+ global $user, $prefs;
+
+ $to_create_page = false;
+ $page_data = '';
+ $fieldId = $this->getConfiguration('fieldId');
+
+ if ($this->getOption('wysiwyg') === 'y' && $prefs['wysiwyg_htmltowiki'] != 'y') {
+ $is_html = true;
+ } else {
+ $is_html = false;
+ }
+
+ if ($page_name = $this->getValue()) {
+ // There is already a wiki pagename set (the value of the field is the wiki page name)
+ if (TikiLib::lib('tiki')->page_exists($page_name)) {
+ // Get wiki page content
+ $page_info = TikiLib::lib('tiki')->get_page_info($page_name);
+ $page_data = $page_info['data'];
+ if (!empty($requestData[$ins_id])) {
+ // There is new page data provided
+ if ($page_data != $requestData[$ins_id]) {
+ // Update page data
+ $edit_comment = 'Updated by Tracker Field ' . $fieldId;
+ $short_name = $requestData['ins_' . $this->getOption('fieldIdForPagename')];
+ $ins_fields_data[$this->getOption('fieldIdForPagename')]['value'] = $short_name;
+ if ($this->isValid($ins_fields_data) === true) {
+ TikiLib::lib('tiki')->update_page($page_name, $requestData[$ins_id], $edit_comment, $user, TikiLib::lib('tiki')->get_ip_address(), '', 0, '', $is_html, null, null, $this->getOption('wysiwyg'));
+ }
+ }
+ }
+ } else {
+ $to_create_page = true;
+ }
+ } elseif (!empty($requestData[$ins_id])) {
+ // the field value is currently null and there is input, so would need to create page.
+ if ($short_name = $requestData['ins_' . $this->getOption('fieldIdForPagename')]) {
+ $namespace = $this->getOption('namespace');
+ if ($namespace == 'none') {
+ $page_name = $short_name;
+ } elseif ($namespace == 'custom' && !empty($this->getOption('customnamespace'))) {
+ $page_name = $this->getOption('customnamespace') . $prefs['namespace_separator'] . $short_name;
+ } else {
+ $page_name = 'trackerfield' . $fieldId . $prefs['namespace_separator'] . $short_name;
+ }
+ if (!TikiLib::lib('tiki')->page_exists($page_name)) {
+ $ins_fields_data[$this->getOption('fieldIdForPagename')]['value'] = $short_name;
+ if ($this->isValid($ins_fields_data) === true) {
+ $to_create_page = true;
+ }
+ } else {
+ TikiLib::lib('errorreport')->report(tr('Page "%0" already exists. Not overwriting.', $page_name));
+ }
+ }
+ }
+
+ if ($to_create_page) {
+ // Note we do not want to create blank pages, but if in the event a page that is already linked is deleted, a blank page will be created.
+ if (!empty($requestData[$ins_id])) {
+ $page_data = $requestData[$ins_id];
+ }
+ $edit_comment = 'Created by Tracker Field ' . $fieldId;
+ TikiLib::lib('tiki')->create_page($page_name, 0, $page_data, TikiLib::lib('tiki')->now, $edit_comment, $user, TikiLib::lib('tiki')->get_ip_address(), '', '', $is_html, null, $this->getOption('wysiwyg'));
+ }
+
+ $data = array(
+ 'value' => $page_name,
+ 'page_data' => $page_data,
+ );
+
+ return $data;
+ }
+
+ function renderInput($context = array())
+ {
+ global $prefs;
+
+ static $firstTime = true;
+
+ $cols = $this->getOption('width');
+ $rows = $this->getOption('height');
+
+ if ($this->getOption('toolbars') === 0) {
+ $toolbars = false;
+ } else {
+ $toolbars = true;
+ }
+
+ $data = array(
+ 'toolbar' => $toolbars ? 'y' : 'n',
+ 'cols' => ($cols >= 1) ? $cols : 80,
+ 'rows' => ($rows >= 1) ? $rows : 6,
+ 'keyup' => '',
+ );
+
+ if ($this->getOption('wordmax')) {
+ $data['keyup'] = "wordCount({$this->getOption('wordmax')}, this, 'cpt_{$this->getConfiguration('fieldId')}', '" . addcslashes(tr('Word Limit Exceeded'), "'") . "')";
+ } elseif ($this->getOption('max')) {
+ $data['keyup'] = "charCount({$this->getOption('max')}, this, 'cpt_{$this->getConfiguration('fieldId')}', '" . addcslashes(tr('Character Limit Exceeded'), "'") . "')";
+ }
+ $data['element_id'] = 'area_' . uniqid();
+ if ($firstTime && $this->getOption('wysiwyg') === 'y' && $prefs['wysiwyg_htmltowiki'] != 'y') { // html wysiwyg
+ $is_html = '<input type="hidden" id="allowhtml" value="1" />';
+ $firstTime = false;
+ } else {
+ $is_html = '';
+ }
+ return $this->renderTemplate('trackerinput/wiki.tpl', $context, $data) . $is_html;
+ }
+
+ function renderOutput($context = array())
+ {
+ return $this->attemptParse($this->getConfiguration('page_data'));
+ }
+
+ function getDocumentPart(Search_Type_Factory_Interface $typeFactory)
+ {
+ $value = $this->getValue();
+ $baseKey = $this->getBaseKey();
+
+ $info = TikiLib::lib('tiki')->get_page_info($value, true, true);
+
+ if (! $info) {
+ return false;
+ }
+
+ if (!empty($value)) {
+
+ $data = array(
+ $baseKey => $typeFactory->identifier($value),
+ "{$baseKey}_text" => $typeFactory->wikitext($info['data']),
+ );
+
+ return $data;
+ }
+ }
+
+ function getProvidedFields()
+ {
+ $baseKey = $this->getBaseKey();
+
+ $data = array(
+ $baseKey, // the page name
+ "{$baseKey}_text", // wiki text
+ );
+
+ return $data;
+ }
+
+ function getGlobalFields()
+ {
+ $baseKey = $this->getBaseKey();
+
+ $data = array(
+ "{$baseKey}_text" => true,
+ );
+
+ return $data;
+ }
+
+ function getTabularSchema()
+ {
+ // TODO
+ }
+
+ protected function attemptParse($text)
+ {
+ global $prefs;
+
+ $parseOptions = array();
+ if ($this->getOption('wysiwyg') === 'y' && $prefs['wysiwyg_htmltowiki'] != 'y') {
+ $parseOptions['is_html'] = true;
+ }
+ return TikiLib::lib('tiki')->parse_data($text, $parseOptions);
+ }
+
+}
+
Modified: trunk/lib/setup/events.php
===================================================================
--- trunk/lib/setup/events.php 2015-10-05 18:30:09 UTC (rev 56421)
+++ trunk/lib/setup/events.php 2015-10-06 06:11:24 UTC (rev 56422)
@@ -74,6 +74,10 @@
$events->bind('tiki.trackeritem.create', $defer('trk', 'group_tracker_create'));
}
+ $events->bind('tiki.trackeritem.create', $defer('trk', 'setup_wiki_fields'));
+ $events->bind('tiki.trackeritem.update', $defer('trk', 'update_wiki_fields'));
+ $events->bind('tiki.trackeritem.delete', $defer('trk', 'delete_wiki_fields'));
+
if ($prefs['userTracker'] == 'y') {
$events->bind('tiki.trackeritem.save', $defer('trk', 'update_user_account'));
}
Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php 2015-10-05 18:30:09 UTC (rev 56421)
+++ trunk/lib/trackers/trackerlib.php 2015-10-06 06:11:24 UTC (rev 56422)
@@ -2418,6 +2418,9 @@
$trackerId = $res['trackerId'];
$status = $res['status'];
+ // keep copy of item for putting info into final event
+ $itemInfo = $this->get_tracker_item($itemId);
+
// ---- save image list before sql query ---------------------------------
$fieldList = $this->list_tracker_fields($trackerId, 0, -1, 'name_asc', '');
$imgList = array();
@@ -2530,6 +2533,7 @@
'object' => $itemId,
'trackerId' => $trackerId,
'user' => $GLOBALS['user'],
+ 'values' => $itemInfo,
)
);
@@ -3855,22 +3859,39 @@
{
global $prefs;
- $query = "update `tiki_tracker_item_fields` ttif left join `tiki_tracker_fields` ttf on (ttif.fieldId = ttf.fieldId) set ttif.`value`=? where ttif.`value`=? and ttf.`type` = ?";
- $this->query($query, array($new, $old, 'k'));
+ $query = "update `tiki_tracker_item_fields` ttif left join `tiki_tracker_fields` ttf on (ttif.fieldId = ttf.fieldId) set ttif.`value`=? where ttif.`value`=? and (ttf.`type` = ? or ttf.`type` = ?)";
+ $this->query($query, array($new, $old, 'k', 'wiki'));
- if ($prefs['tracker_wikirelation_synctitle'] == 'y') {
- $relationlib = TikiLib::lib('relation');
- $wikilib = TikiLib::lib('wiki');
- $relatedfields = $relationlib->get_object_ids_with_relations_from( 'wiki page', $new, 'tiki.wiki.linkedfield' ); // $new because attributes have been changed
- $relateditems = $relationlib->get_object_ids_with_relations_from( 'wiki page', $new, 'tiki.wiki.linkeditem' );
- foreach ($relateditems as $itemId) {
- foreach ($relatedfields as $fieldId) {
+ $relationlib = TikiLib::lib('relation');
+ $wikilib = TikiLib::lib('wiki');
+ $relatedfields = $relationlib->get_object_ids_with_relations_from( 'wiki page', $new, 'tiki.wiki.linkedfield' ); // $new because attributes have been changed
+ $relateditems = $relationlib->get_object_ids_with_relations_from( 'wiki page', $new, 'tiki.wiki.linkeditem' );
+ foreach ($relateditems as $itemId) {
+ foreach ($relatedfields as $fieldId) {
+ $field = $this->get_tracker_field($fieldId);
+ $toSync = false;
+ $nameFieldId = 0;
+ if ($field['type'] == 'wiki') {
+ $trackerId = $field['trackerId'];
+ $definition = Tracker_Definition::get($trackerId);
+ $field = $definition->getField($fieldId);
+ if ($field['options_map']['syncwikipagename'] != 'n') {
+ $toSync = true;
+ }
+ $nameFieldId = $field['options_map']['fieldIdForPagename'];
+ } elseif ($prefs['tracker_wikirelation_synctitle'] == 'y') {
+ $toSync = true;
+ }
+ if ($toSync) {
$value = $this->get_item_value(0, $itemId, $fieldId);
if ($wikilib->get_namespace($value) && $value != $new) {
$this->modify_field($itemId, $fieldId, $new);
} elseif (!$wikilib->get_namespace($value) && $value != $wikilib->get_without_namespace($new)) {
$this->modify_field($itemId, $fieldId, $wikilib->get_without_namespace($new));
}
+ if ($nameFieldId) {
+ $this->modify_field($itemId, $nameFieldId, $wikilib->get_without_namespace($new));
+ }
}
}
}
@@ -3904,6 +3925,67 @@
}
}
+ public function setup_wiki_fields($args)
+ {
+ $definition = Tracker_Definition::get($args['trackerId']);
+ $itemId = $args['object'];
+ $values = $args['values'];
+
+ if ($definition && $fieldIds = $definition->getWikiFields()) {
+ foreach ($fieldIds as $fieldId) {
+ if (!empty($values[$fieldId])) {
+ TikiLib::lib('relation')->add_relation('tiki.wiki.linkeditem', 'wiki page', $values[$fieldId], 'trackeritem', $itemId);
+ TikiLib::lib('relation')->add_relation('tiki.wiki.linkedfield', 'wiki page', $values[$fieldId], 'trackerfield', $fieldId);
+ }
+ }
+ }
+ }
+
+ public function update_wiki_fields($args) {
+ global $prefs;
+ $wikilib = TikiLib::lib('wiki');
+ $definition = Tracker_Definition::get($args['trackerId']);
+ $values = $args['values'];
+ $old_values = $args['old_values'];
+ $itemId = $args['object'];
+
+ if ($definition && $fieldIds = $definition->getWikiFields()) {
+ foreach($fieldIds as $fieldId) {
+ $field = $definition->getField($fieldId);
+ if ($field['options_map']['syncwikipagename'] != 'n') {
+ $nameFieldId = $field['options_map']['fieldIdForPagename'];
+ if (!empty($values[$nameFieldId]) && !empty($old_values[$nameFieldId]) && !empty($old_values[$fieldId])
+ && $values[$nameFieldId] != $old_values[$nameFieldId] ) {
+ if ($namespace = $wikilib->get_namespace($old_values[$fieldId])) {
+ $newname = $namespace . $prefs['namespace_separator'] . $wikilib->get_without_namespace($values[$nameFieldId]);
+ } else {
+ $newname = $values[$nameFieldId];
+ }
+ $args['values'][$fieldId] = $newname;
+ $this->modify_field($itemId, $fieldId, $newname);
+ $wikilib->wiki_rename_page($old_values[$fieldId], $newname, false);
+ }
+ }
+ }
+ }
+ }
+
+ public function delete_wiki_fields($args) {
+ $definition = Tracker_Definition::get($args['trackerId']);
+ $itemId = $args['object'];
+
+ if ($definition && $fieldIds = $definition->getWikiFields()) {
+ foreach($fieldIds as $fieldId) {
+ $field = $definition->getField($fieldId);
+
+ if ($field['options_map']['syncwikipagedelete'] == 'y' && !empty($args['values'][$fieldId])) {
+ $pagename = $args['values'][$fieldId];
+ TikiLib::lib('tiki')->remove_all_versions($pagename);
+ }
+ }
+ }
+ }
+
public function build_date($input, $format, $ins_id)
{
if (is_array($format)) {
Added: trunk/templates/trackerinput/wiki.tpl
===================================================================
--- trunk/templates/trackerinput/wiki.tpl (rev 0)
+++ trunk/templates/trackerinput/wiki.tpl 2015-10-06 06:11:24 UTC (rev 56422)
@@ -0,0 +1,27 @@
+{strip}
+ {if $field.options_map['wysiwyg'] eq 'y'}
+ {textarea _class='form-control' id=$data.element_id name=$field.ins_id rows=$data.rows onkeyup=$data.keyup _wysiwyg='y' section="trackers"}
+ {$field.page_data}
+ {/textarea}
+ {else}
+ {textarea _class='form-control' id=$data.element_id name=$field.ins_id _toolbars=$data.toolbar _simple='y' rows=$data.rows onkeyup=$data.keyup _wysiwyg='n' section="trackers"}
+ {$field.page_data}
+ {/textarea}
+ {/if}
+ {if $field.options_map['max']}
+ <div class="charCount">
+ {if $prefs.javascript_enabled eq 'y'}
+ {tr}Character Count:{/tr} <input type="text" id="cpt_{$field.fieldId}" size="4" readOnly="true"{if !empty($field.page_data)} value="{$field.page_data|count_characters}"{/if}>
+ {/if}
+ {if $field.options_map['max'] > 0} {tr}Max:{/tr} {$field.options_map['max']}{/if}
+ </div>
+ {/if}
+ {if $field.options_map['wordmax']}
+ <div class="wordCount">
+ {if $prefs.javascript_enabled eq 'y'}
+ {tr}Word Count:{/tr} <input type="text" id="cpt_{$field.fieldId}" size="4" readOnly="true"{if !empty($field.page_data)} value="{$field.page_data|count_words}"{/if}>
+ {/if}
+ {if $field.options_map['wordmax'] > 0} {tr}Max:{/tr} {$field.options_map['wordmax']}{/if}
+ </div>
+ {/if}
+{/strip}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-06 12:58:52
|
Revision: 56425
http://sourceforge.net/p/tikiwiki/code/56425
Author: jonnybradley
Date: 2015-10-06 12:58:50 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56416 to 56424
Modified Paths:
--------------
trunk/lib/core/Services/Tracker/Utilities.php
trunk/lib/filegals/filegallib.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-06 12:24:45 UTC (rev 56424)
+++ trunk 2015-10-06 12:58:50 UTC (rev 56425)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56416
+/branches/14.x:54079-56424
/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/core/Services/Tracker/Utilities.php
===================================================================
--- trunk/lib/core/Services/Tracker/Utilities.php 2015-10-06 12:24:45 UTC (rev 56424)
+++ trunk/lib/core/Services/Tracker/Utilities.php 2015-10-06 12:58:50 UTC (rev 56425)
@@ -85,10 +85,10 @@
}
if (count($errors['err_mandatory']) == 0 && count($errors['err_value']) == 0) {
- $newItem = $trklib->replace_item($trackerId, $itemId, array('data' => $fields), $status, 0, $options['bluk_import']);
+ $newItem = $trklib->replace_item($trackerId, $itemId, array('data' => $fields), $status, 0, $options['bulk_import']);
return $newItem;
} elseif (! $options['validate']) {
- $newItem = $trklib->replace_item($trackerId, $itemId, array('data' => $fields), $status, 0, $options['bluk_import']);
+ $newItem = $trklib->replace_item($trackerId, $itemId, array('data' => $fields), $status, 0, $options['bulk_import']);
return $newItem;
}
Modified: trunk/lib/filegals/filegallib.php
===================================================================
--- trunk/lib/filegals/filegallib.php 2015-10-06 12:24:45 UTC (rev 56424)
+++ trunk/lib/filegals/filegallib.php 2015-10-06 12:58:50 UTC (rev 56425)
@@ -2042,6 +2042,11 @@
$objectlib = TikiLib::lib('object');
$objectId = $objectlib->get_object_id($context['type'], $context['object']);
if (empty($objectId) && !empty( $fileIds)) {
+ $context = array_merge($context, array(
+ 'description' => null,
+ 'name' => null,
+ 'href' => null,
+ ));
$objectId = $objectlib->add_object($context['type'], $context['object'], FALSE, $context['description'], $context['name'], $context['href']);
}
if (!empty($objectId)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-06 14:02:31
|
Revision: 56427
http://sourceforge.net/p/tikiwiki/code/56427
Author: jonnybradley
Date: 2015-10-06 14:02:29 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56424 to 56426
Modified Paths:
--------------
trunk/lib/core/Search/Formatter/ValueFormatter/Trackerrender.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-06 14:01:34 UTC (rev 56426)
+++ trunk 2015-10-06 14:02:29 UTC (rev 56427)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56424
+/branches/14.x:54079-56426
/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/core/Search/Formatter/ValueFormatter/Trackerrender.php
===================================================================
--- trunk/lib/core/Search/Formatter/ValueFormatter/Trackerrender.php 2015-10-06 14:01:34 UTC (rev 56426)
+++ trunk/lib/core/Search/Formatter/ValueFormatter/Trackerrender.php 2015-10-06 14:02:29 UTC (rev 56427)
@@ -61,6 +61,10 @@
return $value;
}
$field = $tracker->getField(substr($name, 14));
+ // TextArea fields need the raw wiki syntax here for it to get wiki parsed if necessary
+ if ($field['type'] === 'a' && isset($entry[$name . '_raw'])) {
+ $value = $entry[$name . '_raw'];
+ }
$field['value'] = $value;
$this->cancache = ! in_array($field['type'], array('STARS', 's')); // don't cache ratings fields
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-07 11:25:55
|
Revision: 56431
http://sourceforge.net/p/tikiwiki/code/56431
Author: jonnybradley
Date: 2015-10-07 11:25:53 +0000 (Wed, 07 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56426 to 56429
Property Changed:
----------------
trunk/
trunk/templates/
Index: trunk
===================================================================
--- trunk 2015-10-07 11:19:20 UTC (rev 56430)
+++ trunk 2015-10-07 11:25:53 UTC (rev 56431)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56426
+/branches/14.x:54079-56429
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Index: trunk/templates
===================================================================
--- trunk/templates 2015-10-07 11:19:20 UTC (rev 56430)
+++ trunk/templates 2015-10-07 11:25:53 UTC (rev 56431)
Property changes on: trunk/templates
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x/templates:45702-47762
/branches/12.x/templates:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53463,53608,55301
/branches/13.x/templates:51407-53060,53145,53192
-/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382,56385-56387,56405-56411
+/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382,56385-56387,56405-56411,56427-56429
/branches/3.0/templates:16998-18916
/branches/4.x/templates:22817-23908
/branches/5.x/templates:26025-26523,26527-28378
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-07 15:18:03
|
Revision: 56433
http://sourceforge.net/p/tikiwiki/code/56433
Author: jonnybradley
Date: 2015-10-07 15:18:01 +0000 (Wed, 07 Oct 2015)
Log Message:
-----------
[FIX] upload: Various small fixes - thanks luciash :)
* user was passed as an array
* missing error if file upload failed entirely
* don't have "abort" and "cancel" buttons showing at the same time during upload
* make long errors display properly
* use animated progress bar so it looks like something's happening during large uploads
* use non-sefurl links and show the gallery, not a failed colorbox preview for non-images
Modified Paths:
--------------
trunk/lib/core/Services/File/Controller.php
trunk/lib/jquery_tiki/tiki-jquery_upload.js
trunk/themes/base_files/css/tiki_base.css
trunk/themes/base_files/less/tiki-file_galleries.less
Modified: trunk/lib/core/Services/File/Controller.php
===================================================================
--- trunk/lib/core/Services/File/Controller.php 2015-10-07 11:52:52 UTC (rev 56432)
+++ trunk/lib/core/Services/File/Controller.php 2015-10-07 15:18:01 UTC (rev 56433)
@@ -112,6 +112,7 @@
$input->offsetSet('isbatch', $input->isbatch->asArray()[0]);
$input->offsetSet('deleteAfter', $input->deleteAfter->asArray()[0]);
$input->offsetSet('author', $input->author->asArray()[0]);
+ $input->offsetSet('user', $input->user->asArray()[0]);
$input->offsetSet('listtoalert', $input->listtoalert->asArray()[0]);
for ($i = 0; $i < count($_FILES['files']['tmp_name']); $i++) {
@@ -169,6 +170,8 @@
} else {
TikiLib::lib('user')->set_user_preference($user, 'filegals_autoupload', 'n');
}
+ } else {
+ throw new Services_Exception_NotAvailable(tr('File could not be uploaded.'));
}
return $output;
Modified: trunk/lib/jquery_tiki/tiki-jquery_upload.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-07 11:52:52 UTC (rev 56432)
+++ trunk/lib/jquery_tiki/tiki-jquery_upload.js 2015-10-07 15:18:01 UTC (rev 56433)
@@ -22,9 +22,11 @@
.on('click', function () {
$this.remove();
data.abort();
- });
+ })
+ .next("button").hide();
+
data.submit().always(function () {
- $this.next("button").text(tr("Clear"));
+ $this.next("button").show().text(tr("Clear"));
$this.remove();
});
}),
@@ -87,6 +89,9 @@
var node = $(context.children("p")[index]);
if (file.preview) {
+ if (! $(file.preview).is("canvas")) {
+ node.css("width", "auto");
+ }
node.prepend(file.preview);
} else {
var type = "file";
@@ -110,7 +115,7 @@
.prop('disabled', !!data.files.error);
var $progdiv = $('<div class="progress margin-bottom-xs"/>')
- .append('<div class="progress-bar progress-bar-success"/>');
+ .append('<div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar"/>');
context.find(".buttons").prepend($progdiv);
@@ -126,9 +131,14 @@
if (file.fileId) {
var display = file.type.match(/^image\//) ? "display" : "dl",
link = $('<a>')
- .attr('target', '_blank')
- .prop('href', display + file.fileId);
+ .attr('target', '_blank');
+ if (file.type.match(/^image\//)) {
+ link.prop('href', "tiki-download_file.php?display&fileId=" + file.fileId); // view an image
+ } else {
+ link.prop('href', "tiki-list_file_gallery.php?galleryId=" + file.galleryId); // show gallery for other files
+ }
+
$(context.children("p")[index])
.children()
.wrap(link)
@@ -145,7 +155,7 @@
$(context).find("a:last")
.after("<br><code>" + file.syntax + "</code>");
- if (jqueryTiki.colorbox) {
+ if (jqueryTiki.colorbox && file.type.match(/^image\//)) {
context.find("a").colorbox({photo: true});
}
}
@@ -157,7 +167,7 @@
.append('<br>')
.append(error);
}
- if (index = data.files.length - 1) {
+ if (index === data.files.length - 1) {
context.find(".progress").delay(1000).fadeOut("fast");
}
@@ -171,7 +181,12 @@
context = data.context;
$(context.children()[index])
+ .append('<br>')
.append(error);
+
+ if (index === data.files.length - 1) {
+ context.find(".progress").delay(1000).fadeOut("fast");
+ }
});
return false;
}).parents("form").off("submit").on("submit", function (e) {
Modified: trunk/themes/base_files/css/tiki_base.css
===================================================================
--- trunk/themes/base_files/css/tiki_base.css 2015-10-07 11:52:52 UTC (rev 56432)
+++ trunk/themes/base_files/css/tiki_base.css 2015-10-07 15:18:01 UTC (rev 56433)
@@ -1850,6 +1850,9 @@
.files .file-list .file-to-upload span {
font-size: x-small;
}
+.files .file-list .file-to-upload span.text-danger {
+ white-space: normal;
+}
.files .file-list .file-to-upload code {
font-size: x-small;
white-space: normal;
Modified: trunk/themes/base_files/less/tiki-file_galleries.less
===================================================================
--- trunk/themes/base_files/less/tiki-file_galleries.less 2015-10-07 11:52:52 UTC (rev 56432)
+++ trunk/themes/base_files/less/tiki-file_galleries.less 2015-10-07 15:18:01 UTC (rev 56433)
@@ -209,10 +209,14 @@
text-overflow: ellipsis;
}
-.files .file-list .file-to-upload span{
+.files .file-list .file-to-upload span {
font-size: x-small;
}
+.files .file-list .file-to-upload span.text-danger{
+ white-space: normal;
+}
+
.files .file-list .file-to-upload code {
font-size: x-small;
white-space: normal;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-07 17:07:44
|
Revision: 56435
http://sourceforge.net/p/tikiwiki/code/56435
Author: jonnybradley
Date: 2015-10-07 17:07:42 +0000 (Wed, 07 Oct 2015)
Log Message:
-----------
[ENH] content templates: Implement tab view to split list and edit form for consistency with other admin pages
Modified Paths:
--------------
trunk/templates/tiki-admin_content_templates.tpl
trunk/tiki-admin_content_templates.php
Modified: trunk/templates/tiki-admin_content_templates.tpl
===================================================================
--- trunk/templates/tiki-admin_content_templates.tpl 2015-10-07 15:42:23 UTC (rev 56434)
+++ trunk/templates/tiki-admin_content_templates.tpl 2015-10-07 17:07:42 UTC (rev 56435)
@@ -1,211 +1,223 @@
{title help="Content+Templates"}{tr}Content templates{/tr}{/title}
-{remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Use the Administration page of each enabled feature to allow the use of content templates.{/tr}{/remarksbox}
-{if $preview eq 'y'}
- <h2>{tr}Preview{/tr}</h2>
- <div class="wikitext">{$parsed}</div>
-{/if}
+{tabset}
+ {tab name="{tr}Templates{/tr}"}
+ <h2>{tr}Templates{/tr}</h2>
+ {if $channels or ($find ne '')}
+ {include file='find.tpl'}
+ {/if}
+ {* Use css menus as fallback for item dropdown action menu if javascript is not being used *}
+ {if $prefs.javascript_enabled !== 'y'}
+ {$js = 'n'}
+ {$libeg = '<li>'}
+ {$liend = '</li>'}
+ {else}
+ {$js = 'y'}
+ {$libeg = ''}
+ {$liend = ''}
+ {/if}
-{if $templateId > 0}
- <h2>{tr}Edit template:{/tr} {$info.name|escape}</h2>
- {button href="tiki-admin_content_templates.php" _icon_name="create" _text="{tr}Create{/tr}"}
-{else}
- <h2>{tr}Create template{/tr}</h2>
-{/if}
-<form action="tiki-admin_content_templates.php" method="post" class="form-horizontal" role="form">
- <input type="hidden" name="templateId" value="{$templateId|escape}">
- <div class="form-group">
- <label class="col-sm-3 control-label" for="name">{tr}Name{/tr} *</label>
- <div class="col-sm-9">
- <input type="text" maxlength="255" class="form-control" id="name" name="name" value="{$info.name|escape}">
- {if $emptyname}
- <span class="attention alert-warning">{tr}Name field is mandatory{/tr}</span>
- {/if}
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label" for="section_css">{tr}Sections{/tr}</label>
- <div class="col-sm-9">
- {$toolbar_section='admin'}
- {if $prefs.feature_cms_templates eq 'y'}
- <div class="col-sm-3 checkbox-inline">
- <label for="section_cms">
- <input type="checkbox" name="section_cms" id="section_cms" {if $info.section_cms eq 'y'}checked="checked"{/if}>
- {if $info.section_cms eq 'y'}{$toolbar_section='cms'}{/if}
- {tr}Articles{/tr}
- </label>
+ <table class="table table-striped table-hover">
+ <tr>
+ <th>{tr}Id{/tr}</th>
+ <th>
+ <a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}Name{/tr}</a>
+ </th>
+ <th>
+ <a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={if $sort_mode eq 'created_desc'}created_asc{else}created_desc{/if}">{tr}Last Modified{/tr}</a>
+ </th>
+ <th>{tr}Sections{/tr}</th>
+ <th></th>
+ </tr>
+ {cycle values="odd,even" print=false advance=false}
+ {section name=user loop=$channels}
+ <tr>
+ <td class="text">{$channels[user].templateId}</td>
+ <td class="text">
+ <a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={$sort_mode}&templateId={$channels[user].templateId}&cookietab=2">
+ {$channels[user].name|escape}
+ </a>
+ </td>
+ <td class="date">{$channels[user].created|tiki_short_datetime}</td>
+ <td class="text">
+ {if count($channels[user].sections) == 0}{tr}Visible in no sections{/tr}{/if}
+ {section name=ix loop=$channels[user].sections}
+ {$channels[user].sections[ix]}
+ <a class="tips" title=":{tr}Delete{/tr}" class="link" href="tiki-admin_content_templates.php?removesection={$channels[user].sections[ix]}&rtemplateId={$channels[user].templateId}" >
+ {icon name='remove' alt="{tr}Remove section{/tr}"}
+ </a>
+ {/section}
+ </td>
+ <td class="action">
+ {capture name=template_actions}
+ {strip}
+ {$libeg}<a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={$sort_mode}&templateId={$channels[user].templateId}&cookietab=2">
+ {icon name='edit' _menu_text='y' _menu_icon='y' alt="{tr}Edit{/tr}"}
+ </a>{$liend}
+ {$libeg}<a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].templateId}" >
+ {icon name='remove' _menu_text='y' _menu_icon='y' alt="{tr}Remove{/tr}"}
+ </a>{$liend}
+ {/strip}
+ {/capture}
+ {if $js === 'n'}<ul class="cssmenu_horiz"><li>{/if}
+ <a
+ class="tips"
+ title="{tr}Actions{/tr}"
+ href="#"
+ {if $js === 'y'}{popup delay="0|2000" fullhtml="1" center=true text=$smarty.capture.template_actions|escape:"javascript"|escape:"html"}{/if}
+ style="padding:0; margin:0; border:0"
+ >
+ {icon name='wrench'}
+ </a>
+ {if $js === 'n'}
+ <ul class="dropdown-menu" role="menu">{$smarty.capture.template_actions}</ul></li></ul>
+ {/if}
+ </td>
+ </tr>
+ {sectionelse}
+ {norecords _colspan=4}
+ {/section}
+ </table>
+ {pagination_links cant=$cant_pages step=$prefs.maxRecords offset=$offset}{/pagination_links}
+
+ {/tab}
+ {if $templateId}
+ {$tabtitle="{tr}Edit template:{/tr} {$info.name|escape}"}
+ {else}
+ {$tabtitle="{tr}Create template{/tr}"}
+ {/if}
+ {tab name=$tabtitle}
+
+ {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Use the Administration page of each enabled feature to allow the use of content templates.{/tr}{/remarksbox}
+
+ {if $preview eq 'y'}
+ <h2>{tr}Preview{/tr}</h2>
+ <div class="wikitext">{$parsed}</div>
+ {/if}
+
+ <h2>{$tabtitle}</h2>
+ {if $templateId > 0}
+ {button href="tiki-admin_content_templates.php" cookietab="2" _icon_name="create" _text="{tr}Create{/tr}"}
+ {/if}
+ <form action="tiki-admin_content_templates.php" method="post" class="form-horizontal" role="form">
+ <input type="hidden" name="templateId" value="{$templateId|escape}">
+ <div class="form-group">
+ <label class="col-sm-3 control-label" for="name">{tr}Name{/tr} *</label>
+ <div class="col-sm-9">
+ <input type="text" maxlength="255" class="form-control" id="name" name="name" value="{$info.name|escape}">
+ {if $emptyname}
+ <span class="attention alert-warning">{tr}Name field is mandatory{/tr}</span>
+ {/if}
</div>
- {/if}
- {if $prefs.feature_wiki_templates eq 'y'}
- <div class="col-sm-3 checkbox-inline">
- <label for="section_wiki">
- <input type="checkbox" name="section_wiki" id="section_wiki" {if $info.section_wiki eq 'y'}checked="checked"{/if}>
- {if $info.section_wiki eq 'y'}{$toolbar_section='wiki page'}{/if}
- {tr}Wiki{/tr}
- </label>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label" for="section_css">{tr}Sections{/tr}</label>
+ <div class="col-sm-9">
+ {$toolbar_section='admin'}
+ {if $prefs.feature_cms_templates eq 'y'}
+ <div class="col-sm-3 checkbox-inline">
+ <label for="section_cms">
+ <input type="checkbox" name="section_cms" id="section_cms" {if $info.section_cms eq 'y'}checked="checked"{/if}>
+ {if $info.section_cms eq 'y'}{$toolbar_section='cms'}{/if}
+ {tr}Articles{/tr}
+ </label>
+ </div>
+ {/if}
+ {if $prefs.feature_wiki_templates eq 'y'}
+ <div class="col-sm-3 checkbox-inline">
+ <label for="section_wiki">
+ <input type="checkbox" name="section_wiki" id="section_wiki" {if $info.section_wiki eq 'y'}checked="checked"{/if}>
+ {if $info.section_wiki eq 'y'}{$toolbar_section='wiki page'}{/if}
+ {tr}Wiki{/tr}
+ </label>
+ </div>
+ {/if}
+ {if $prefs.feature_file_galleries_templates eq 'y'}
+ <div class="col-sm-3 checkbox-inline">
+ <label for="section_file_galleries">
+ <input type="checkbox" name="section_file_galleries" id="section_file_galleries" {if $info.section_file_galleries eq 'y'}checked="checked"{/if}>
+ {if $info.section_file_galleries eq 'y'}{$toolbar_section='admin'}{/if}
+ {tr}File Galleries{/tr}
+ </label>
+ </div>
+ {/if}
+ {if $prefs.feature_newsletters eq 'y'}
+ <div class="col-sm-3 checkbox-inline">
+ <label for="section_newsletters" >
+ <input type="checkbox" name="section_newsletters" id="section_newsletters" {if $info.section_newsletters eq 'y'}checked="checked"{/if}>
+ {if $info.section_newsletters eq 'y'}{$toolbar_section='newsletters'}{/if}
+ {tr}Newsletters{/tr}
+ </label>
+ </div>
+ {/if}
+ {if $prefs.feature_events eq 'y'}
+ <div class="col-sm-3 checkbox-inline">
+ <label for="section_events">{tr}Events{/tr}</label><input type="checkbox" name="section_events" id="section_events" {if $info.section_events eq 'y'}checked="checked"{/if}>
+ {if $info.section_events eq 'y'}{$toolbar_section='calendar'}{/if}
+ </div>
+ {/if}
+ {if $prefs.feature_html_pages eq 'y'}
+ <div class="col-sm-3 checkbox-inline">
+ <label for="section_html">{tr}HTML Pages{/tr}</label><input type="checkbox" name="section_html" id="section_html" {if $info.section_html eq 'y'}checked="checked"{/if}>
+ {if $info.section_html eq 'y'}{$toolbar_section='wiki page'}{/if}
+ </div>
+ {/if}
+ {if ($prefs.feature_cms_templates ne 'y') and ($prefs.feature_wiki_templates ne 'y') and ($prefs.feature_file_galleries_templates ne 'y') and ($prefs.feature_newsletters ne 'y') and ($prefs.feature_events ne 'y') and ($prefs.feature_html_pages ne 'y')}
+ {tr}No features are configured to use templates.{/tr}
+ {/if}
</div>
- {/if}
- {if $prefs.feature_file_galleries_templates eq 'y'}
- <div class="col-sm-3 checkbox-inline">
- <label for="section_file_galleries">
- <input type="checkbox" name="section_file_galleries" id="section_file_galleries" {if $info.section_file_galleries eq 'y'}checked="checked"{/if}>
- {if $info.section_file_galleries eq 'y'}{$toolbar_section='admin'}{/if}
- {tr}File Galleries{/tr}
- </label>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label" for="type-selector">{tr}Template Type{/tr}</label>
+ <div class="col-sm-9">
+ <select name="template_type" id="type-selector" class="form-control">
+ <option value="static"{if $info.template_type eq 'static'} selected="selected"{/if}>{tr}Text area{/tr}</option>
+ <option value="page"{if $info.template_type eq 'page'} selected="selected"{/if}>{tr}Wiki Page{/tr}</option>
+ </select>
</div>
- {/if}
- {if $prefs.feature_newsletters eq 'y'}
- <div class="col-sm-3 checkbox-inline">
- <label for="section_newsletters" >
- <input type="checkbox" name="section_newsletters" id="section_newsletters" {if $info.section_newsletters eq 'y'}checked="checked"{/if}>
- {if $info.section_newsletters eq 'y'}{$toolbar_section='newsletters'}{/if}
- {tr}Newsletters{/tr}
- </label>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label" for="is_html">{tr}HTML{/tr}</label>
+ <div class="col-sm-9 checkbox-inline">
+ <input type="checkbox" name="section_wiki_html" id="is_html" class="form=control" {if $info.section_wiki_html eq 'y'}checked="checked"{/if}>
</div>
- {/if}
- {if $prefs.feature_events eq 'y'}
- <div class="col-sm-3 checkbox-inline">
- <label for="section_events">{tr}Events{/tr}</label><input type="checkbox" name="section_events" id="section_events" {if $info.section_events eq 'y'}checked="checked"{/if}>
- {if $info.section_events eq 'y'}{$toolbar_section='calendar'}{/if}
+ </div>
+ <div class="form-group type-cond for-page">
+ <label class="col-sm-3 control-label" for="page_name">{tr}Page Name{/tr}</label>
+ <div class="col-sm-9">
+ <input class="form-control" type="text" name="page_name" id="page_name" value="{$info.page_name}" placeholder="{tr}Find{/tr}...">
+ {autocomplete element='input[name=page_name]' type='pagename'}
</div>
- {/if}
- {if $prefs.feature_html_pages eq 'y'}
- <div class="col-sm-3 checkbox-inline">
- <label for="section_html">{tr}HTML Pages{/tr}</label><input type="checkbox" name="section_html" id="section_html" {if $info.section_html eq 'y'}checked="checked"{/if}>
- {if $info.section_html eq 'y'}{$toolbar_section='wiki page'}{/if}
+ </div>
+
+ <div class="form-group type-cond for-static">
+ <label class="col-sm-12" for="editwiki">{tr}Template{/tr}</label>
+ <div class="col-sm-12">
+ {if $prefs.feature_wysiwyg eq 'y' and $info.section_wiki_html eq 'y'}
+ {$use_wysiwyg='y'}
+ <input type="hidden" name="allowhtml" value="on">
+ {if $prefs.wysiwyg_htmltowiki eq 'y'}{$is_html = 'y'}{else}{$is_html = 'n'}{/if}
+ {else}
+ {$use_wysiwyg='n'}
+ {$is_html = 'n'}
+ {/if}
+ {textarea id="editwiki" name="content" switcheditor="y" _class="form-control" _wysiwyg=$use_wysiwyg _is_html=$is_html section=$toolbar_section}{$info.content}{/textarea}
</div>
- {/if}
- {if ($prefs.feature_cms_templates ne 'y') and ($prefs.feature_wiki_templates ne 'y') and ($prefs.feature_file_galleries_templates ne 'y') and ($prefs.feature_newsletters ne 'y') and ($prefs.feature_events ne 'y') and ($prefs.feature_html_pages ne 'y')}
- {tr}No features are configured to use templates.{/tr}
- {/if}
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label" for="type-selector">{tr}Template Type{/tr}</label>
- <div class="col-sm-9">
- <select name="template_type" id="type-selector" class="form-control">
- <option value="static"{if $info.template_type eq 'static'} selected="selected"{/if}>{tr}Text area{/tr}</option>
- <option value="page"{if $info.template_type eq 'page'} selected="selected"{/if}>{tr}Wiki Page{/tr}</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label" for="is_html">{tr}HTML{/tr}</label>
- <div class="col-sm-9 checkbox-inline">
- <input type="checkbox" name="section_wiki_html" id="is_html" class="form=control" {if $info.section_wiki_html eq 'y'}checked="checked"{/if}>
- </div>
- </div>
- <div class="form-group type-cond for-page">
- <label class="col-sm-3 control-label" for="page_name">{tr}Page Name{/tr}</label>
- <div class="col-sm-9">
- <input class="form-control" type="text" name="page_name" id="page_name" value="{$info.page_name}" placeholder="{tr}Find{/tr}...">
- {autocomplete element='input[name=page_name]' type='pagename'}
- </div>
- </div>
+ </div>
+ <div class="form-group text-center">
+ <input type="submit" name="preview" class="btn btn-default" value="{tr}Preview{/tr}" onclick="needToConfirm=false;">
+ <input type="submit" name="save" class="btn btn-primary" value="{tr}Save{/tr}" onclick="needToConfirm=false;">
+ </div>
- <div class="form-group type-cond for-static">
- <label class="col-sm-12" for="editwiki">{tr}Template{/tr}</label>
- <div class="col-sm-12">
- {if $prefs.feature_wysiwyg eq 'y' and $info.section_wiki_html eq 'y'}
- {$use_wysiwyg='y'}
- <input type="hidden" name="allowhtml" value="on">
- {if $prefs.wysiwyg_htmltowiki eq 'y'}{$is_html = 'y'}{else}{$is_html = 'n'}{/if}
- {else}
- {$use_wysiwyg='n'}
- {$is_html = 'n'}
- {/if}
- {textarea id="editwiki" name="content" switcheditor="y" _class="form-control" _wysiwyg=$use_wysiwyg _is_html=$is_html section=$toolbar_section}{$info.content}{/textarea}
- </div>
- </div>
- <div class="form-group text-center">
- <input type="submit" name="preview" class="btn btn-default" value="{tr}Preview{/tr}" onclick="needToConfirm=false;">
- <input type="submit" name="save" class="btn btn-primary" value="{tr}Save{/tr}" onclick="needToConfirm=false;">
- </div>
-
- {jq}
- $('#type-selector').change( function( e ) {
- $('.type-cond').hide();
- var val = $('#type-selector').val();
- $('.for-' + val).show();
- } ).trigger('change');
- needToConfirm = false;
- {/jq}
-</form>
-
-<hr>
-
-<h2>{tr}Templates{/tr}</h2>
-{if $channels or ($find ne '')}
- {include file='find.tpl'}
-{/if}
-{* Use css menus as fallback for item dropdown action menu if javascript is not being used *}
-{if $prefs.javascript_enabled !== 'y'}
- {$js = 'n'}
- {$libeg = '<li>'}
- {$liend = '</li>'}
-{else}
- {$js = 'y'}
- {$libeg = ''}
- {$liend = ''}
-{/if}
-
-<table class="table table-striped table-hover">
- <tr>
- <th>{tr}Id{/tr}</th>
- <th>
- <a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}Name{/tr}</a>
- </th>
- <th>
- <a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={if $sort_mode eq 'created_desc'}created_asc{else}created_desc{/if}">{tr}Last Modified{/tr}</a>
- </th>
- <th>{tr}Sections{/tr}</th>
- <th></th>
- </tr>
- {cycle values="odd,even" print=false advance=false}
- {section name=user loop=$channels}
- <tr>
- <td class="text">{$channels[user].templateId}</td>
- <td class="text">{$channels[user].name|escape}</td>
- <td class="date">{$channels[user].created|tiki_short_datetime}</td>
- <td class="text">
- {if count($channels[user].sections) == 0}{tr}Visible in no sections{/tr}{/if}
- {section name=ix loop=$channels[user].sections}
- {$channels[user].sections[ix]}
- <a class="tips" title=":{tr}Delete{/tr}" class="link" href="tiki-admin_content_templates.php?removesection={$channels[user].sections[ix]}&rtemplateId={$channels[user].templateId}" >
- {icon name='remove' alt="{tr}Remove section{/tr}"}
- </a>
- {/section}
- </td>
- <td class="action">
- {capture name=template_actions}
- {strip}
- {$libeg}<a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={$sort_mode}&templateId={$channels[user].templateId}">
- {icon name='edit' _menu_text='y' _menu_icon='y' alt="{tr}Edit{/tr}"}
- </a>{$liend}
- {$libeg}<a href="tiki-admin_content_templates.php?offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].templateId}" >
- {icon name='remove' _menu_text='y' _menu_icon='y' alt="{tr}Remove{/tr}"}
- </a>{$liend}
- {/strip}
- {/capture}
- {if $js === 'n'}<ul class="cssmenu_horiz"><li>{/if}
- <a
- class="tips"
- title="{tr}Actions{/tr}"
- href="#"
- {if $js === 'y'}{popup delay="0|2000" fullhtml="1" center=true text=$smarty.capture.template_actions|escape:"javascript"|escape:"html"}{/if}
- style="padding:0; margin:0; border:0"
- >
- {icon name='wrench'}
- </a>
- {if $js === 'n'}
- <ul class="dropdown-menu" role="menu">{$smarty.capture.template_actions}</ul></li></ul>
- {/if}
- </td>
- </tr>
- {sectionelse}
- {norecords _colspan=4}
- {/section}
-</table>
-
-{pagination_links cant=$cant_pages step=$prefs.maxRecords offset=$offset}{/pagination_links}
+ {jq}
+ $('#type-selector').change( function( e ) {
+ $('.type-cond').hide();
+ var val = $('#type-selector').val();
+ $('.for-' + val).show();
+ } ).trigger('change');
+ needToConfirm = false;
+ {/jq}
+ </form>
+ {/tab}
+{/tabset}
Modified: trunk/tiki-admin_content_templates.php
===================================================================
--- trunk/tiki-admin_content_templates.php 2015-10-07 15:42:23 UTC (rev 56434)
+++ trunk/tiki-admin_content_templates.php 2015-10-07 17:07:42 UTC (rev 56435)
@@ -130,6 +130,8 @@
$info['page_name'] = $_REQUEST['page_name'];
$info['template_type'] = $_REQUEST['template_type'];
$smarty->assign('info', $info);
+
+ $cookietab = 2;
}
if (isset($_REQUEST["save"])) {
check_ticket('admin-content-templates');
@@ -188,6 +190,7 @@
} else {
$templateslib->remove_template_from_section($tid, 'html');
}
+ $cookietab = 1;
} else {
$smarty->assign("templateId", '0');
$info["name"] = '';
@@ -201,6 +204,8 @@
$info["section_html"] = (isset($_REQUEST["section_html"]) && $_REQUEST["section_html"] == 'on') ? 'y' : 'n';
$smarty->assign('info', $info);
$smarty->assign('emptyname', "true");
+
+ $cookietab = 2;
}
}
if (!isset($_REQUEST["sort_mode"])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-07 17:23:22
|
Revision: 56436
http://sourceforge.net/p/tikiwiki/code/56436
Author: jonnybradley
Date: 2015-10-07 17:23:20 +0000 (Wed, 07 Oct 2015)
Log Message:
-----------
[ENH] Moving $templateslib to dependency injection
Modified Paths:
--------------
trunk/db/config/tiki.xml
trunk/lib/core/Tiki/Profile/InstallHandler/Template.php
trunk/lib/multilingual/multilinguallib.php
trunk/tiki-admin_content_templates.php
trunk/tiki-admin_html_pages.php
trunk/tiki-edit_article.php
trunk/tiki-edit_submission.php
trunk/tiki-editpage.php
trunk/tiki-list_file_gallery.php
trunk/tiki-send_newsletters.php
Modified: trunk/db/config/tiki.xml
===================================================================
--- trunk/db/config/tiki.xml 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/db/config/tiki.xml 2015-10-07 17:23:20 UTC (rev 56436)
@@ -272,6 +272,9 @@
<service id="tiki.lib.tabular" class="Tracker\Tabular\Manager">
<argument type="service" id="tiki.lib.db"/>
</service>
+ <service id="tiki.lib.template" class="TemplatesLib">
+ <file>%kernel.root_dir%/lib/templates/templateslib.php</file>
+ </service>
<service id="tiki.lib.theme" class="ThemeLib">
<file>%kernel.root_dir%/lib/theme/themelib.php</file>
</service>
Modified: trunk/lib/core/Tiki/Profile/InstallHandler/Template.php
===================================================================
--- trunk/lib/core/Tiki/Profile/InstallHandler/Template.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/lib/core/Tiki/Profile/InstallHandler/Template.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -39,8 +39,7 @@
function _install()
{
- global $templateslib;
- if ( ! $templateslib ) require_once 'lib/templates/templateslib.php';
+ $templateslib = TikiLib::lib('template');
$data = $this->getData();
Modified: trunk/lib/multilingual/multilinguallib.php
===================================================================
--- trunk/lib/multilingual/multilinguallib.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/lib/multilingual/multilinguallib.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -1032,8 +1032,7 @@
*/
function getTemplateIDInLanguage($section, $template_name, $language)
{
- global $templateslib;
- require_once 'lib/templates/templateslib.php';
+ $templateslib = TikiLib::lib('template');
$all_templates = $templateslib->list_templates($section, 0, -1, 'name_asc', '');
$looking_for_templates_named = array("$template_name-$language");
Modified: trunk/tiki-admin_content_templates.php
===================================================================
--- trunk/tiki-admin_content_templates.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/tiki-admin_content_templates.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -12,8 +12,7 @@
require_once ('tiki-setup.php');
$access->check_feature(array('feature_wiki_templates','feature_cms_templates'), '', 'features', true);
-global $templateslib;
-include_once ('lib/templates/templateslib.php');
+$templateslib = TikiLib::lib('template');
$auto_query_args = array('templateId');
Modified: trunk/tiki-admin_html_pages.php
===================================================================
--- trunk/tiki-admin_html_pages.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/tiki-admin_html_pages.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -31,8 +31,7 @@
$htmlpageslib->remove_html_page($_REQUEST["remove"]);
}
if (isset($_REQUEST["templateId"]) && $_REQUEST["templateId"] > 0) {
- global $templateslib; require_once 'lib/templates/templateslib.php';
- $template_data = $templateslib->get_template($_REQUEST["templateId"]);
+ $template_data = TikiLib::lib('template')->get_template($_REQUEST["templateId"]);
$_REQUEST["content"] = $template_data["content"];
$_REQUEST["preview"] = 1;
}
@@ -80,8 +79,7 @@
$smarty->assign_by_ref('cant_pages', $channels["cant"]);
$smarty->assign_by_ref('channels', $channels["data"]);
if ($tiki_p_use_content_templates == 'y') {
- global $templateslib; require_once 'lib/templates/templateslib.php';
- $templates = $templateslib->list_templates('html', 0, -1, 'name_asc', '');
+ $templates = TikiLib::lib('template')->list_templates('html', 0, -1, 'name_asc', '');
}
$smarty->assign_by_ref('templates', $templates["data"]);
ask_ticket('admin-html-pages');
Modified: trunk/tiki-edit_article.php
===================================================================
--- trunk/tiki-edit_article.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/tiki-edit_article.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -85,7 +85,7 @@
);
if (isset($_REQUEST['templateId']) && $_REQUEST['templateId'] > 0) {
- global $templateslib; require_once 'lib/templates/templateslib.php';
+ $templateslib = TikiLib::lib('template');
$template_data = $templateslib->get_template($_REQUEST['templateId'], $prefs['language']);
$_REQUEST['preview'] = 1;
$_REQUEST['body'] = $template_data['content'];
@@ -727,8 +727,7 @@
$smarty->assign_by_ref('types', $types);
if ($prefs['feature_cms_templates'] == 'y' && $tiki_p_use_content_templates == 'y') {
- global $templateslib; require_once 'lib/templates/templateslib.php';
- $templates = $templateslib->list_templates('cms', 0, -1, 'name_asc', '');
+ $templates = TikiLib::lib('template')->list_templates('cms', 0, -1, 'name_asc', '');
}
$smarty->assign_by_ref('templates', $templates['data']);
Modified: trunk/tiki-edit_submission.php
===================================================================
--- trunk/tiki-edit_submission.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/tiki-edit_submission.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -61,8 +61,9 @@
(isset($_REQUEST['imageIsChanged']) && $_REQUEST['imageIsChanged']=='y') ? 'y' : 'n'
);
+$templateslib = TikiLib::lib('template');
+
if (isset($_REQUEST['templateId']) && $_REQUEST['templateId'] > 0) {
- global $templateslib; require_once 'lib/templates/templateslib.php';
$template_data = $templateslib->get_template($_REQUEST['templateId'], $prefs['language']);
$_REQUEST['preview'] = 1;
$_REQUEST['body'] = $template_data['content'];
@@ -106,7 +107,6 @@
$smarty->assign('edit_data', 'n');
if (isset($_REQUEST['templateId']) && $_REQUEST['templateId'] > 0) {
- global $templateslib; require_once 'lib/templates/templateslib.php';
$template_data = $templateslib->get_template($_REQUEST['templateId'], $prefs['language']);
$_REQUEST['preview'] = 1;
$_REQUEST['body'] = $template_data['content'];
@@ -547,7 +547,6 @@
$smarty->assign_by_ref('types', $types);
if ($prefs['feature_cms_templates'] == 'y' && $tiki_p_use_content_templates == 'y') {
- global $templateslib; require_once 'lib/templates/templateslib.php';
$templates = $templateslib->list_templates('cms', 0, -1, 'name_asc', '');
}
Modified: trunk/tiki-editpage.php
===================================================================
--- trunk/tiki-editpage.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/tiki-editpage.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -666,7 +666,6 @@
$smarty->assign('wikiHeaderTpl', $smarty->fetch("wiki:{$_REQUEST['wikiHeaderTpl']}"));
}
if ((isset($_REQUEST["template_name"]) || isset($_REQUEST["templateId"])) && !isset($_REQUEST['preview']) && !isset($_REQUEST['save'])) {
- global $templateslib; require_once 'lib/templates/templateslib.php';
$templateLang = isset( $_REQUEST['lang'] ) ? $_REQUEST['lang'] : null;
if (isset($_REQUEST["templateId"])) {
@@ -675,7 +674,7 @@
$multilinguallib = TikiLib::lib('multilingual');
$templateId = $multilinguallib->getTemplateIDInLanguage('wiki', $_REQUEST["template_name"], $templateLang);
}
- $template_data = $templateslib->get_template($templateId, $templateLang);
+ $template_data = TikiLib::lib('template')->get_template($templateId, $templateLang);
$_REQUEST["edit"] = $template_data["content"]."\n".$_REQUEST["edit"];
$smarty->assign("templateId", $templateId);
}
@@ -1371,8 +1370,7 @@
} //save
$smarty->assign('pageAlias', $pageAlias);
if ($prefs['feature_wiki_templates'] === 'y' && $tiki_p_use_content_templates === 'y') {
- global $templateslib; require_once 'lib/templates/templateslib.php';
- $templates = $templateslib->list_templates('wiki', 0, -1, 'name_asc', '');
+ $templates = TikiLib::lib('template')->list_templates('wiki', 0, -1, 'name_asc', '');
$smarty->assign_by_ref('templates', $templates["data"]);
}
if ($prefs['feature_polls'] ==='y' and $prefs['feature_wiki_ratings'] === 'y' && $tiki_p_wiki_admin_ratings === 'y') {
Modified: trunk/tiki-list_file_gallery.php
===================================================================
--- trunk/tiki-list_file_gallery.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/tiki-list_file_gallery.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -24,10 +24,7 @@
$categlib = TikiLib::lib('categ');
}
-if ($prefs['feature_file_galleries_templates'] == 'y') {
- global $templateslib;
- include_once ('lib/templates/templateslib.php');
-}
+$templateslib = TikiLib::lib('template');
if ($prefs['feature_groupalert'] == 'y') {
$groupalertlib = TikiLib::lib('groupalert');
Modified: trunk/tiki-send_newsletters.php
===================================================================
--- trunk/tiki-send_newsletters.php 2015-10-07 17:07:42 UTC (rev 56435)
+++ trunk/tiki-send_newsletters.php 2015-10-07 17:23:20 UTC (rev 56436)
@@ -171,10 +171,9 @@
}
if (isset($_REQUEST["templateId"]) && $_REQUEST["templateId"] > 0 && (!isset($_REQUEST['previousTemplateId']) || $_REQUEST['previousTemplateId'] != $_REQUEST['templateId'])) {
- global $templateslib; require_once 'lib/templates/templateslib.php';
- $template_data = $templateslib->get_template($_REQUEST["templateId"]);
+ $template_data = TikiLib::lib('template')->get_template($_REQUEST["templateId"]);
$_REQUEST["data"] = $template_data["content"];
- if ($templateslib->template_is_in_section($_REQUEST['templateId'], 'wiki_html') ) {
+ if (TikiLib::lib('template')->template_is_in_section($_REQUEST['templateId'], 'wiki_html') ) {
$_REQUEST['is_html'] = 'on';
$_REQUEST['wysiwyg'] ='y';
}
@@ -532,8 +531,7 @@
$smarty->assign_by_ref('cant_drafts', $drafts["cant"]);
$smarty->assign('url', "tiki-send_newsletters.php");
if (!empty($tiki_p_use_content_templates) && $tiki_p_use_content_templates == 'y') {
- global $templateslib; require_once 'lib/templates/templateslib.php';
- $templates = $templateslib->list_templates('newsletters', 0, -1, 'name_asc', '');
+ $templates = TikiLib::lib('template')->list_templates('newsletters', 0, -1, 'name_asc', '');
}
$smarty->assign_by_ref('templates', $templates["data"]);
$tpls = $nllib->list_tpls();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-07 18:57:28
|
Revision: 56439
http://sourceforge.net/p/tikiwiki/code/56439
Author: jonnybradley
Date: 2015-10-07 18:57:25 +0000 (Wed, 07 Oct 2015)
Log Message:
-----------
[ENH] content templates: Make content templates categorisable and implement category perms checking for use (thanks eromneg)
Still to do: Implement object and edit/admin perms on a non global basis
Modified Paths:
--------------
trunk/lib/categories/categlib.php
trunk/lib/objectlib.php
trunk/lib/templates/templateslib.php
trunk/lib/userslib.php
trunk/templates/tiki-admin_content_templates.tpl
trunk/tiki-admin_content_templates.php
Modified: trunk/lib/categories/categlib.php
===================================================================
--- trunk/lib/categories/categlib.php 2015-10-07 18:52:17 UTC (rev 56438)
+++ trunk/lib/categories/categlib.php 2015-10-07 18:57:25 UTC (rev 56439)
@@ -1148,9 +1148,10 @@
"tracker" => "tracker",
"wiki" => "wiki page",
"calendar" => "calendar",
- "img" => "image"
+ "img" => "image",
+ "template" => "template",
); //get_strings tra("article");tra("blog");tra("directory");tra("faq");tra("FAQ");tra("file gallery");tra("forum");tra("image gallery");tra("newsletter");
- //get_strings tra("poll");tra("quiz");tra("survey");tra("tracker");tra("wiki page");tra("image");tra("calendar");
+ //get_strings tra("poll");tra("quiz");tra("survey");tra("tracker");tra("wiki page");tra("image");tra("calendar");tra("template");
$typetitles = array(
"article" => "Articles",
@@ -1168,7 +1169,8 @@
"tracker" => "Trackers",
"wiki page" => "Wiki",
"calendar" => "Calendar",
- "image" => "Image"
+ "image" => "Image",
+ "template" => "Content Templates",
);
$out = "";
Modified: trunk/lib/objectlib.php
===================================================================
--- trunk/lib/objectlib.php 2015-10-07 18:52:17 UTC (rev 56438)
+++ trunk/lib/objectlib.php 2015-10-07 18:57:25 UTC (rev 56439)
@@ -21,7 +21,7 @@
* When creating, if $description is given, use the description, name and URL given as information.
* Otherwise retrieve it from the object (if $checkHandled is FALSE, fill with empty strings if the object type is not handled).
* Handled object types: "article", "blog", "calendar", "directory", "faq",
- * "file", "file gallery", "forum", "image gallery", "poll", "quiz", "tracker", "trackeritem" and "wiki page".
+ * "file", "file gallery", "forum", "image gallery", "poll", "quiz", "tracker", "trackeritem", "wiki page" and "template".
*
* Remember to update get_supported_types if this changes
*/
@@ -167,6 +167,14 @@
$href = 'tiki-index.php?page=' . urlencode($itemId);
break;
+ case 'template':
+ $info = TikiLib::lib('template')->get_template($itemId);
+
+ $description = '';
+ $name = $info['name'];
+ $href = "tiki-admin_content_templates.php?templateId=$itemId";
+ break;
+
default:
if ($checkHandled) {
return FALSE;
@@ -205,6 +213,7 @@
'tracker',
'trackeritem',
'wiki page',
+ 'template',
);
}
@@ -220,6 +229,7 @@
'trackerfield' => 'trackerfield',
'wiki_page' => 'wiki page',
'wiki page' => 'wiki page',
+ 'template' => 'template',
];
if (isset($supported[$type])) {
@@ -409,6 +419,16 @@
case 'edit':
return 'tiki_p_admin_trackers';
}
+
+ case 'template':
+ switch ($action) {
+ case 'view':
+ case 'read':
+ return 'tiki_p_use_content_templates';
+
+ case 'edit':
+ return 'tiki_p_edit_content_templates';
+ }
default :
return '';
}
@@ -454,6 +474,11 @@
case 'goal':
return TikiLib::lib('goal')->fetchGoal($object);
+
+ case 'template':
+ $info = TikiLib::lib('template')->get_template($object);
+ return array('title' => $info['name']);
+
}
return (array('error'=>'true'));
}
@@ -560,6 +585,7 @@
'blog' => 'tiki_p_read_blog',
'blog post' => 'tiki_p_read_blog',
'quiz' => 'tiki_p_take_quiz',
+ 'template' => 'tiki_p_use_content_templates',
// overhead - we are checking individual permission on types below, but they
// can't have individual permissions, although they can be categorized.
Modified: trunk/lib/templates/templateslib.php
===================================================================
--- trunk/lib/templates/templateslib.php 2015-10-07 18:52:17 UTC (rev 56438)
+++ trunk/lib/templates/templateslib.php 2015-10-07 18:57:25 UTC (rev 56439)
@@ -58,6 +58,10 @@
$ret[] = $res;
}
+ // filter out according to perms
+ $ret = Perms::filter(array('type' => 'template'), 'object', $ret, array( 'object' => 'templateId' ), 'use_content_templates');
+ $cant = count($ret);
+
$retval = array();
$retval["data"] = $ret;
$retval["cant"] = $cant;
Modified: trunk/lib/userslib.php
===================================================================
--- trunk/lib/userslib.php 2015-10-07 18:52:17 UTC (rev 56438)
+++ trunk/lib/userslib.php 2015-10-07 18:57:25 UTC (rev 56439)
@@ -3660,7 +3660,7 @@
'type' => 'content templates',
'admin' => true,
'prefs' => array('feature_wiki_templates', 'feature_cms_templates'),
- 'scope' => 'global',
+ 'scope' => 'object',
),
array(
'name' => 'tiki_p_edit_content_templates',
@@ -3669,7 +3669,7 @@
'type' => 'content templates',
'admin' => false,
'prefs' => array('feature_wiki_templates', 'feature_cms_templates'),
- 'scope' => 'global',
+ 'scope' => 'object',
),
array(
'name' => 'tiki_p_use_content_templates',
@@ -3678,7 +3678,7 @@
'type' => 'content templates',
'admin' => false,
'prefs' => array('feature_wiki_templates', 'feature_cms_templates'),
- 'scope' => 'global',
+ 'scope' => 'object',
),
array(
'name' => 'tiki_p_admin_contribution',
Modified: trunk/templates/tiki-admin_content_templates.tpl
===================================================================
--- trunk/templates/tiki-admin_content_templates.tpl 2015-10-07 18:52:17 UTC (rev 56438)
+++ trunk/templates/tiki-admin_content_templates.tpl 2015-10-07 18:57:25 UTC (rev 56439)
@@ -191,6 +191,8 @@
</div>
</div>
+ {include file='categorize.tpl'}
+
<div class="form-group type-cond for-static">
<label class="col-sm-12" for="editwiki">{tr}Template{/tr}</label>
<div class="col-sm-12">
Modified: trunk/tiki-admin_content_templates.php
===================================================================
--- trunk/tiki-admin_content_templates.php 2015-10-07 18:52:17 UTC (rev 56438)
+++ trunk/tiki-admin_content_templates.php 2015-10-07 18:57:25 UTC (rev 56439)
@@ -65,6 +65,9 @@
} else {
$info["section_cms"] = 'n';
}
+ $cat_type = 'template';
+ $cat_objid = $_REQUEST['templateId'];
+ include_once ("categorize_list.php");
} else {
$info = array();
$info["name"] = '';
@@ -189,6 +192,14 @@
} else {
$templateslib->remove_template_from_section($tid, 'html');
}
+
+ $cat_type = 'template';
+ $cat_objid = $tid;
+ $cat_desc = '';
+ $cat_name = $_REQUEST["name"];
+ $cat_href = "tiki-admin_content_templates.php?templateId=" . $cat_objid;
+ include_once ("categorize.php");
+
$cookietab = 1;
} else {
$smarty->assign("templateId", '0');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2015-10-08 16:03:22
|
Revision: 56445
http://sourceforge.net/p/tikiwiki/code/56445
Author: jonnybradley
Date: 2015-10-08 16:03:20 +0000 (Thu, 08 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56429 to 56444
Modified Paths:
--------------
trunk/tiki-listpages.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-08 16:00:15 UTC (rev 56444)
+++ trunk 2015-10-08 16:03:20 UTC (rev 56445)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56429
+/branches/14.x:54079-56444
/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/tiki-listpages.php
===================================================================
--- trunk/tiki-listpages.php 2015-10-08 16:00:15 UTC (rev 56444)
+++ trunk/tiki-listpages.php 2015-10-08 16:03:20 UTC (rev 56445)
@@ -71,7 +71,7 @@
$smarty->assign('all_langs', $all_langs);
$access->check_feature(array('feature_wiki', 'feature_listPages'));
-$access->check_permission('tiki_p_view');
+
/* mass-remove:
the checkboxes are sent as the array $_REQUEST["checked[]"], values are the wiki-PageNames,
e.g. $_REQUEST["checked"][3]="HomePage"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2015-10-10 13:34:35
|
Revision: 56455
http://sourceforge.net/p/tikiwiki/code/56455
Author: lindonb
Date: 2015-10-10 13:34:32 +0000 (Sat, 10 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56444 to 56451
Modified Paths:
--------------
trunk/lib/core/Tracker/Field/ItemLink.php
trunk/lib/core/Tracker/Field/ItemsList.php
trunk/lib/core/Tracker/Tabular/Schema/DateHelper.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2015-10-10 12:22:33 UTC (rev 56454)
+++ trunk 2015-10-10 13:34:32 UTC (rev 56455)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56444
+/branches/14.x:54079-56451
/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/core/Tracker/Field/ItemLink.php
===================================================================
--- trunk/lib/core/Tracker/Field/ItemLink.php 2015-10-10 12:22:33 UTC (rev 56454)
+++ trunk/lib/core/Tracker/Field/ItemLink.php 2015-10-10 13:34:32 UTC (rev 56455)
@@ -337,7 +337,7 @@
function getDocumentPart(Search_Type_Factory_Interface $typeFactory)
{
$item = $this->getValue();
- $label = $this->getItemLabel($item);
+ $label = $this->getItemLabel($item, ['list_mode' => 'csv']);
$baseKey = $this->getBaseKey();
$out = array(
Modified: trunk/lib/core/Tracker/Field/ItemsList.php
===================================================================
--- trunk/lib/core/Tracker/Field/ItemsList.php 2015-10-10 12:22:33 UTC (rev 56454)
+++ trunk/lib/core/Tracker/Field/ItemsList.php 2015-10-10 13:34:32 UTC (rev 56455)
@@ -197,7 +197,7 @@
->setLabel($name)
->setReadOnly(true)
->setRenderTransform(function ($value) {
- $labels = $this->getItemLabels($value, ['list_mode' => 'y']);
+ $labels = $this->getItemLabels($value, ['list_mode' => 'csv']);
return implode(';', $labels);
})
->setParseIntoTransform(function (& $info, $value) use ($permName) {
Modified: trunk/lib/core/Tracker/Tabular/Schema/DateHelper.php
===================================================================
--- trunk/lib/core/Tracker/Tabular/Schema/DateHelper.php 2015-10-10 12:22:33 UTC (rev 56454)
+++ trunk/lib/core/Tracker/Tabular/Schema/DateHelper.php 2015-10-10 13:34:32 UTC (rev 56455)
@@ -41,7 +41,7 @@
$this->setupCallbacks(
$column,
function ($value, array $extra) use ($format) {
- if (empty($value)) {
+ if (empty($value) || $value === '0000-00-00 00:00:00') { // empty dates are indexed as '0000-00-00 00:00:00'
return '';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <li...@us...> - 2015-10-10 13:59:49
|
Revision: 56457
http://sourceforge.net/p/tikiwiki/code/56457
Author: lindonb
Date: 2015-10-10 13:59:46 +0000 (Sat, 10 Oct 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56451 to 56456
Modified Paths:
--------------
trunk/templates/tiki-view_forum.tpl
Property Changed:
----------------
trunk/
trunk/templates/
Index: trunk
===================================================================
--- trunk 2015-10-10 13:59:16 UTC (rev 56456)
+++ trunk 2015-10-10 13:59:46 UTC (rev 56457)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x:45702-47762
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56451
+/branches/14.x:54079-56456
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Index: trunk/templates
===================================================================
--- trunk/templates 2015-10-10 13:59:16 UTC (rev 56456)
+++ trunk/templates 2015-10-10 13:59:46 UTC (rev 56457)
Property changes on: trunk/templates
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/11.x/templates:45702-47762
/branches/12.x/templates:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53463,53608,55301
/branches/13.x/templates:51407-53060,53145,53192
-/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382,56385-56387,56405-56411,56427-56429
+/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56117,56157-56185,56199-56224,56258-56264,56292-56311,56326-56328,56335-56339,56353-56357,56371-56382,56385-56387,56405-56411,56427-56429,56452-56456
/branches/3.0/templates:16998-18916
/branches/4.x/templates:22817-23908
/branches/5.x/templates:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/templates/tiki-view_forum.tpl
===================================================================
--- trunk/templates/tiki-view_forum.tpl 2015-10-10 13:59:16 UTC (rev 56456)
+++ trunk/templates/tiki-view_forum.tpl 2015-10-10 13:59:46 UTC (rev 56457)
@@ -609,7 +609,8 @@
{/if}
<td class="text">
- <a {if $comments_coms[ix].is_marked}class="forumnameread"{else}class="forumname"{/if} href="{$comments_coms[ix].threadId|sefurl:'forumthread'}{if $comments_threshold}&topics_threshold={$comments_threshold}{/if}{if $comments_offset or $smarty.section.ix.index}&topics_offset={math equation="x + y" x=$comments_offset y=$smarty.section.ix.index}{/if}{if $thread_sort_mode ne $forum_info.topicOrdering}&topics_sort_mode={$thread_sort_mode}{/if}{if isset($topics_find) and $topics_find}&topics_find={$comments_find}{/if}">
+ {if $prefs.feature_sefurl === 'y'}{$sep = '?'}{else}{$sep = '&'}{/if}
+ <a {if $comments_coms[ix].is_marked}class="forumnameread"{else}class="forumname"{/if} href="{$comments_coms[ix].threadId|sefurl:'forumthread'}{$sep}topics_offset={math equation="x + y" x=$comments_offset y=$smarty.section.ix.index}{if $comments_threshold}&topics_threshold={$comments_threshold}{/if}{if $thread_sort_mode ne $forum_info.topicOrdering}&topics_sort_mode={$thread_sort_mode}{/if}{if isset($topics_find) and $topics_find}&topics_find={$comments_find}{/if}">
{$comments_coms[ix].title|escape}
</a>
{if $forum_info.topic_summary eq 'y'}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X