From: <rob...@us...> - 2011-12-28 22:36:19
|
Revision: 39344 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39344&view=rev Author: robertplummer Date: 2011-12-28 22:36:12 +0000 (Wed, 28 Dec 2011) Log Message: ----------- [FIX] Added translation of title [NEW] Added fullscreen & modal option to $.fn.serviceDialog [ENH] Added draw edits to tracker file handler and wikiplugin_img Modified Paths: -------------- trunk/lib/core/Tracker/Field/Files.php trunk/lib/jquery_tiki/tiki-jquery.js trunk/lib/wiki-plugins/wikiplugin_img.php trunk/templates/fgal_context_menu.tpl Modified: trunk/lib/core/Tracker/Field/Files.php =================================================================== --- trunk/lib/core/Tracker/Field/Files.php 2011-12-28 22:35:54 UTC (rev 39343) +++ trunk/lib/core/Tracker/Field/Files.php 2011-12-28 22:36:12 UTC (rev 39344) @@ -142,7 +142,9 @@ function renderOutput($context = array()) { - global $prefs, $mimetypes, $tiki_p_upload_files; + global $prefs, $tiki_p_upload_files; + global $mimetypes; include ('lib/mime/mimetypes.php'); + if (!isset($context['list_mode'])) { $context['list_mode'] = 'n'; } @@ -177,10 +179,10 @@ $smarty = TikiLib::lib('smarty'); $smarty->loadPlugin('smarty_function_object_link'); $ret = '<ol>'; + foreach ($this->getConfiguration('files') as $fileId => $file) { - include_once ('lib/mime/mimetypes.php'); $ret .= '<li>'; - $ret .= smarty_function_object_link(array('type' => 'file', 'id' => $fileId, 'title' => $file['name']), $smarty); + $ret .= smarty_function_object_link(array('type' => 'file', 'id' => $fileId, 'title' => $file['name']), $smarty); if ( $prefs['feature_draw'] == 'y' && @@ -191,7 +193,9 @@ $file['filetype'] == $mimetypes["png"] || $file['filetype'] == $mimetypes["tiff"]) ) { - $ret .= " <a href='tiki-edit_draw.php?fileId=" . $file['fileId'] . "'><img width='16' height='16' class='icon' alt='Edit' src='pics/icons/page_edit.png' /></a>"; + $ret .= " <a href='tiki-edit_draw.php?fileId=" . $file['fileId'] . "' onclick='return $(this).ajaxEditDraw();' title='Edit: ".$file['name']."' data-fileid='".$file['fileId']."' data-galleryid='".$file['galleryId']."'> + <img width='16' height='16' class='icon' alt='Edit' src='pics/icons/page_edit.png' /> + </a>"; } $ret .= '</li>'; Modified: trunk/lib/jquery_tiki/tiki-jquery.js =================================================================== --- trunk/lib/jquery_tiki/tiki-jquery.js 2011-12-28 22:35:54 UTC (rev 39343) +++ trunk/lib/jquery_tiki/tiki-jquery.js 2011-12-28 22:36:12 UTC (rev 39344) @@ -2181,14 +2181,16 @@ $dialog.dialog({ title: options.title, minWidth: 500, - height: 600, + height: (options.fullscreen ? $(window).height() - 20 : 600), + width: (options.fullscreen ? $(window).width() - 20 : null), close: function () { if (options.close) { options.close.apply([], this); } $(this).dialog('destroy'); }, - buttons: buttons + buttons: buttons, + modal: options.modal }); $dialog.loadService(options.data, $.extend(options, {origin: origin})); @@ -2891,8 +2893,9 @@ action: 'edit', fileId: me.data('fileid'), galleryId: me.data('galleryid'), - modal: true }, + modal: true, + fullscreen: true, load: function () { if (me.data('drawLoaded')) return false; Modified: trunk/lib/wiki-plugins/wikiplugin_img.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_img.php 2011-12-28 22:35:54 UTC (rev 39343) +++ trunk/lib/wiki-plugins/wikiplugin_img.php 2011-12-28 22:36:12 UTC (rev 39344) @@ -1351,7 +1351,7 @@ } if ($prefs['feature_draw'] == 'y' && $tiki_p_upload_files == 'y') { - $repl .= $ret .= " <a href='tiki-edit_draw.php?fileId=" . $imgdata['fileId'] . "'><img width='16' height='16' class='icon' alt='Edit' src='pics/icons/page_edit.png' /></a>"; + $repl .= $ret .= " <a href='tiki-edit_draw.php?fileId=" . $imgdata['fileId'] . "' onclick='return $(this).ajaxEditDraw();' title='".tr("Edit: Image")."' data-fileid='".$imgdata['fileId']."' data-galleryid='".$imgdata['galleryId']."'><img width='16' height='16' class='icon' alt='Edit' src='pics/icons/page_edit.png' /></a>"; } return '~np~' . $repl. "\r" . '~/np~'; Modified: trunk/templates/fgal_context_menu.tpl =================================================================== --- trunk/templates/fgal_context_menu.tpl 2011-12-28 22:35:54 UTC (rev 39343) +++ trunk/templates/fgal_context_menu.tpl 2011-12-28 22:36:12 UTC (rev 39344) @@ -61,7 +61,7 @@ $files[$changes].type eq 'image/png' or $files[$changes].type eq 'image/tiff' } - <a class="draw dialog" data-name="{$files[$changes].filename}" title="Edit: {$files[$changes].filename}" href="tiki-edit_draw.php?fileId={$files[$changes].id}&galleryId={$files[$changes].galleryId}" data-fileid='{$files[$changes].id}' data-galleryid='{$files[$changes].galleryId}' onclick='return $(this).ajaxEditDraw();'> + <a class="draw dialog" data-name="{$files[$changes].filename}" title="{tr}Edit: {tr}{$files[$changes].filename}" href="tiki-edit_draw.php?fileId={$files[$changes].id}&galleryId={$files[$changes].galleryId}" data-fileid='{$files[$changes].id}' data-galleryid='{$files[$changes].galleryId}' onclick='return $(this).ajaxEditDraw();'> {icon _id='page_edit' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Edit{/tr}"} </a> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |