From: <jon...@us...> - 2015-09-01 12:17:45
|
Revision: 56118 http://sourceforge.net/p/tikiwiki/code/56118 Author: jonnybradley Date: 2015-09-01 12:17:43 +0000 (Tue, 01 Sep 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 56093 to 56117 Modified Paths: -------------- trunk/lib/core/Services/Tracker/Controller.php trunk/lib/core/Tracker/Item.php trunk/templates/fgal_context_menu.tpl trunk/templates/tiki-view_tracker.tpl trunk/templates/tracker/clone_item.tpl trunk/themes/base_files/css/tiki_base.css trunk/themes/base_files/less/tiki-miscellaneous_global.less Property Changed: ---------------- trunk/ trunk/templates/ Index: trunk =================================================================== --- trunk 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk 2015-09-01 12:17:43 UTC (rev 56118) 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-56093 +/branches/14.x:54079-56117 /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/Controller.php =================================================================== --- trunk/lib/core/Services/Tracker/Controller.php 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk/lib/core/Services/Tracker/Controller.php 2015-09-01 12:17:43 UTC (rev 56118) @@ -599,6 +599,13 @@ throw new Services_Exception_Denied(tr('Not allowed to create new items')); } + global $prefs; + if ($prefs['feature_jquery_validation'] === 'y') { + $_REQUEST['itemId'] = 0; // let the validation code know this will be a new item + $validationjs = TikiLib::lib('validators')->generateTrackerValidateJS($definition->getFields()); + TikiLib::lib('header')->add_jq_onready('$("#cloneItemForm' . $trackerId . '").validate({' . $validationjs . $this->get_validation_options()); + } + $itemObject->asNew(); $itemData = $itemObject->getData($input); @@ -646,6 +653,7 @@ } return array( + 'title' => tr('Duplicate Item'), 'trackerId' => $trackerId, 'itemId' => $itemId, 'created' => $id, Modified: trunk/lib/core/Tracker/Item.php =================================================================== --- trunk/lib/core/Tracker/Item.php 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk/lib/core/Tracker/Item.php 2015-09-01 12:17:43 UTC (rev 56118) @@ -471,7 +471,7 @@ $permName = $field['permName']; $out[$permName] = $field['value']; - if (isset($input->fields[$permName])) { + if (isset($input->fields) && isset($input->fields[$permName])) { $out[$permName] = $input->fields->$permName->none(); } } Index: trunk/templates =================================================================== --- trunk/templates 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk/templates 2015-09-01 12:17:43 UTC (rev 56118) 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-56093 +/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 /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/fgal_context_menu.tpl =================================================================== --- trunk/templates/fgal_context_menu.tpl 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk/templates/fgal_context_menu.tpl 2015-09-01 12:17:43 UTC (rev 56118) @@ -58,7 +58,7 @@ {/if} {/if} - {if $files[$changes].type|truncate:6:'':true eq 'image/'} + {if $files[$changes].type|truncate:6:'':true eq 'image/' and $files[$changes].perms.tiki_p_download_files eq 'y'} <a href="{$files[$changes].id|sefurl:display}"> {icon name='view' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Display{/tr}"} </a> Modified: trunk/templates/tiki-view_tracker.tpl =================================================================== --- trunk/templates/tiki-view_tracker.tpl 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk/templates/tiki-view_tracker.tpl 2015-09-01 12:17:43 UTC (rev 56118) @@ -248,6 +248,13 @@ {icon name="post" _menu_text='y' _menu_icon='y' alt="{tr}View/Edit{/tr}"} </a>{$liend} {/if} + {if $tiki_p_create_tracker_items eq 'y'} + {$libeg}<a href="{bootstrap_modal controller=tracker action=clone_item trackerId=$trackerId itemId=$items[user].itemId}" + onclick="$('[data-toggle=popover]').popover('hide');" + > + {icon name="copy" _menu_text='y' _menu_icon='y' alt="{tr}Duplicate{/tr}"} + </a>{$liend} + {/if} {$libeg}<a href="{bootstrap_modal controller=tracker action=remove_item trackerId=$trackerId itemId=$items[user].itemId}" onclick="$('[data-toggle=popover]').popover('hide');" > Modified: trunk/templates/tracker/clone_item.tpl =================================================================== --- trunk/templates/tracker/clone_item.tpl 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk/templates/tracker/clone_item.tpl 2015-09-01 12:17:43 UTC (rev 56118) @@ -5,7 +5,7 @@ {/block} {block name="content"} -<form class="simple" method="post" action="{service controller=tracker action=clone_item}"> +<form class="simple" method="post" action="{service controller=tracker action=clone_item}" id="cloneItemForm{$trackerId|escape}"> {trackerfields trackerId=$trackerId fields=$fields itemId=$itemId} <div class="submit"> <input type="hidden" name="itemId" value="{$itemId|escape}"> Modified: trunk/themes/base_files/css/tiki_base.css =================================================================== --- trunk/themes/base_files/css/tiki_base.css 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk/themes/base_files/css/tiki_base.css 2015-09-01 12:17:43 UTC (rev 56118) @@ -750,7 +750,24 @@ display: block; font-weight: bold; } -p { +address, +blockquote, +dd, +dl, +dt, +h1, +h2, +h3, +h4, +h5, +h6, +li, +nav, +noscript, +ol, +p, +pre, +ul { widows: 3; orphans: 3; } Modified: trunk/themes/base_files/less/tiki-miscellaneous_global.less =================================================================== --- trunk/themes/base_files/less/tiki-miscellaneous_global.less 2015-09-01 12:15:55 UTC (rev 56117) +++ trunk/themes/base_files/less/tiki-miscellaneous_global.less 2015-09-01 12:17:43 UTC (rev 56118) @@ -57,8 +57,21 @@ // color: @input-color !important; /* the Google guys forgot the number-one rule... when they specify background they should specify forgeround color too ;) */ // } -// Support for orphans & widows on paragraphs of text (useful when printing or using columns of text) -p { +// Support for orphans & widows on block level elements (useful when printing or when using columns of text) +// More info at https://css-tricks.com/almanac/properties/w/widows/ +address, +blockquote, +dd, +dl, +dt, +h1, h2, h3, h4, h5, h6, +li, +nav, +noscript, +ol, +p, +pre, +ul { widows: 3; orphans: 3; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |