Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[29958] branches/experimental/coe_fgal_relook2
|
From: <ny...@us...> - 2010-10-11 22:47:04
|
Revision: 29958
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=29958&view=rev
Author: nyloth
Date: 2010-10-11 22:46:56 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
[FIX] filegal manager : do not allow massive actions + hide checkboxes + make a first upload dialog that works + remove buttons in upload dialog + fix basic column sorting + remove some useless comments
Modified Paths:
--------------
branches/experimental/coe_fgal_relook2/lib/filegals/file_gallery.js
branches/experimental/coe_fgal_relook2/lib/jquery_tiki/tiki-jquery.js
branches/experimental/coe_fgal_relook2/templates/browse_file_gallery.tpl
branches/experimental/coe_fgal_relook2/templates/list_file_gallery.tpl
branches/experimental/coe_fgal_relook2/templates/list_file_gallery2.tpl
branches/experimental/coe_fgal_relook2/templates/list_file_gallery_content.tpl
branches/experimental/coe_fgal_relook2/templates/tiki-upload_file.tpl
Modified: branches/experimental/coe_fgal_relook2/lib/filegals/file_gallery.js
===================================================================
--- branches/experimental/coe_fgal_relook2/lib/filegals/file_gallery.js 2010-10-11 22:27:26 UTC (rev 29957)
+++ branches/experimental/coe_fgal_relook2/lib/filegals/file_gallery.js 2010-10-11 22:46:56 UTC (rev 29958)
@@ -191,11 +191,15 @@
});
},
show: function(gallery, fm) {
+ jQuery("#tbFilegalManagerSub").dialog('open');
+ displayDialog('', 2, 'edit', 'tiki-upload_file.php?galleryId='+gallery+'&filegals_manager='+fm+'&fgspecial=1', 'Upload file');
+/*
this.dialog();
jQuery("#fg-jquery-upload-dialog").load("tiki-upload_file.php?galleryId="+gallery+"&filegals_manager="+fm+"&fgspecial=1", function() {
jQuery("#fg-jquery-upload-dialog").dialog("option", "height", "auto");
jQuery("#fg-jquery-upload-dialog").dialog("open")
});
+*/
},
edit: function(url) {
this.dialog();
Modified: branches/experimental/coe_fgal_relook2/lib/jquery_tiki/tiki-jquery.js
===================================================================
--- branches/experimental/coe_fgal_relook2/lib/jquery_tiki/tiki-jquery.js 2010-10-11 22:27:26 UTC (rev 29957)
+++ branches/experimental/coe_fgal_relook2/lib/jquery_tiki/tiki-jquery.js 2010-10-11 22:46:56 UTC (rev 29958)
@@ -1128,15 +1128,15 @@
var dialogDiv;
var dialogDivSub;
-function displayDialog( ignored, list, area_id, isSub ) {
+function displayDialog( ignored, list, area_id, subUrl, subTitle ) {
var i, item, el, obj, tit = "";
$is_cked = $('#cke_contents_' + area_id).length !== 0;
// 2nd version fix for Firefox 3.5 losing selection on changes to DOM
- saveTASelection(area_id);
+ // saveTASelection(area_id);
- if (isSub) {
+ if (subUrl) {
if (!dialogDivSub) {
dialogDivSub = document.createElement('div');
document.body.appendChild( dialogDivSub );
@@ -1150,9 +1150,7 @@
$(dialogDiv).empty();
}
-// $(dialogDiv).empty();
-
- if ( ! isSub ) {
+ if ( ! subUrl ) {
for( i = 0; i < window.dialogData[list].length; i++ ) {
item = window.dialogData[list][i];
if (item.indexOf("<") === 0) { // form element
@@ -1173,6 +1171,8 @@
tit = item;
}
}
+ } else {
+ tit = subTitle;
}
if (!obj) { obj = {}; }
@@ -1181,14 +1181,9 @@
obj.autoOpen = false;
// obj.stack = true; ///FIXME
// obj.zIndex = 10000;
-// $(dialogDiv).dialog('destroy').dialog(obj).dialog('option', 'title', tit).dialog('open');
- if (isSub) {
-/// $(dialogDivSub).dialog('destroy').dialog(obj).dialog('option', 'title', tit);
-/// $(dialogDivSub).load(isSub);
-/// $(dialogDivSub).dialog({modal : true}).dialog('open');
-/*N*/
- $(dialogDivSub).dialog('destroy').load(isSub).dialog({
+ if (subUrl) {
+ $(dialogDivSub).dialog('destroy').load(subUrl).dialog({
modal: true,
width: '700px',
autoOpen: true,
@@ -1196,24 +1191,14 @@
stack: true,
title: tit
});
-/*N*/
} else {
-/*N*/
obj.modal = true;
obj.width = '700px';
obj.title = tit;
-/// $(dialogDiv).dialog('destroy').dialog(obj);
-/// $(dialogDiv).dialog('open');
-/*N*/
-// $(dialogDiv).dialog('destroy').dialog(obj).dialog('option', 'title', tit).dialog('open');
/// $(dialogDiv).dialog({modal : true}).dialog(obj).dialog('open');
$(dialogDiv).dialog(obj).dialog('open'); // TODO: the parent should be modal too
}
- // 2nd version fix for Firefox 3.5 losing selection on changes to popup
- //restoreTASelection(area_id);
- // don't restore here - dialog will do it
-
return false;
}
Modified: branches/experimental/coe_fgal_relook2/templates/browse_file_gallery.tpl
===================================================================
--- branches/experimental/coe_fgal_relook2/templates/browse_file_gallery.tpl 2010-10-11 22:27:26 UTC (rev 29957)
+++ branches/experimental/coe_fgal_relook2/templates/browse_file_gallery.tpl 2010-10-11 22:46:56 UTC (rev 29958)
@@ -93,7 +93,7 @@
<div class="thumbimagecontener" style="width:{$thumbnail_size}px;height:{$thumbnailcontener_size}px{if $show_infos neq 'y'};margin-bottom:4px{/if}">
<div class="thumbimage">
<div class="thumbimagesub" style="width:{$thumbnail_size}px;">{assign var=key_type value=$files[changes].type|truncate:9:'':true}
- <a {$link}{if $prefs.feature_shadowbox eq 'y' && $filegals_manager eq ''} rel="shadowbox[gallery];type={if $key_type eq 'image/png' or $key_type eq 'image/jpe' or $key_type eq 'image/gif'}img{else}iframe{/if}"{/if}{if $over_infos neq ''} {popup fullhtml="1" text=$over_infos|escape:"javascript"|escape:"html"}{else} title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} ({$files[changes].description|escape}){/if}"{/if}>
+ <a class="{if $files[changes].isgal eq 1}fgalgal{else}fgalfile{/if}" {$link}{if $prefs.feature_shadowbox eq 'y' && $filegals_manager eq ''} rel="shadowbox[gallery];type={if $key_type eq 'image/png' or $key_type eq 'image/jpe' or $key_type eq 'image/gif'}img{else}iframe{/if}"{/if}{if $over_infos neq ''} {popup fullhtml="1" text=$over_infos|escape:"javascript"|escape:"html"}{else} title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} ({$files[changes].description|escape}){/if}"{/if}>
<img src="{$files[changes].id|sefurl:thumbnail}" alt="" />
</a>
</div>
@@ -166,7 +166,7 @@
<div class="thumbactions" style="float:right; width:{$thumbnail_size}px">
- {if $gal_info.show_checked neq 'n' and $tiki_p_admin_file_galleries eq 'y'}
+ {if $gal_info.show_checked neq 'n' and $tiki_p_admin_file_galleries eq 'y' and $filegals_manager eq ''}
<label style="float:left"><input type="checkbox" onclick="flip_thumbnail_status('{$checkname}_{$files[changes].id}')" name="{$checkname}[]" value="{$files[changes].id|escape}" {if $is_checked eq 'y'}checked="checked"{/if} />{if isset($checkbox_label)}{$checkbox_label}{/if}</label>
{/if}
@@ -195,6 +195,6 @@
</div>
<br clear="all" />
-{if $gal_info.show_checked neq 'n' and $tiki_p_admin_file_galleries eq 'y' and ( !isset($show_selectall) or $show_selectall eq 'y' )}
+{if $gal_info.show_checked neq 'n' and $tiki_p_admin_file_galleries eq 'y' and ( !isset($show_selectall) or $show_selectall eq 'y' ) and $filegals_manager eq ''}
{select_all checkbox_names='file[],subgal[]' label="{tr}Select All{/tr}"}
{/if}
Modified: branches/experimental/coe_fgal_relook2/templates/list_file_gallery.tpl
===================================================================
--- branches/experimental/coe_fgal_relook2/templates/list_file_gallery.tpl 2010-10-11 22:27:26 UTC (rev 29957)
+++ branches/experimental/coe_fgal_relook2/templates/list_file_gallery.tpl 2010-10-11 22:46:56 UTC (rev 29958)
@@ -75,7 +75,7 @@
{include file='list_file_gallery_content.tpl'}
{/if}
- {if $files and $gal_info.show_checked neq 'n' and ($tiki_p_admin_file_galleries eq 'y' or $tiki_p_upload_files eq 'y' or $tiki_p_assign_perm_file_gallery eq 'y')}
+ {if $files and $gal_info.show_checked neq 'n' and ($tiki_p_admin_file_galleries eq 'y' or $tiki_p_upload_files eq 'y' or $tiki_p_assign_perm_file_gallery eq 'y') and $filegals_manager eq ''}
<div id="sel">
<div>
{tr}Perform action with checked:{/tr}
Modified: branches/experimental/coe_fgal_relook2/templates/list_file_gallery2.tpl
===================================================================
--- branches/experimental/coe_fgal_relook2/templates/list_file_gallery2.tpl 2010-10-11 22:27:26 UTC (rev 29957)
+++ branches/experimental/coe_fgal_relook2/templates/list_file_gallery2.tpl 2010-10-11 22:46:56 UTC (rev 29958)
@@ -31,53 +31,6 @@
{/if}
</div>
- {if $files and $gal_info.show_checked neq 'n' and ($tiki_p_admin_file_galleries eq 'y' or $tiki_p_upload_files eq 'y' or $tiki_p_assign_perm_file_gallery eq 'y')}
- {if $smarty.request.movesel_x eq '' or isset($file_info) or $perms}
- <div class="fg-actions">
- <span>{tr}Perform action with checked:{/tr}</span>
- {if !isset($file_info)}
- {if $offset}<input type="hidden" name="offset" value="{$offset}" />{/if}
- {if $tiki_p_admin_file_galleries eq 'y'}
- <a class="fg-actions-icon">{icon _id='arrow_right' _tag='input_image' name='movesel' alt='{tr}Move{/tr}' title='{tr}Move Selected Files{/tr}' style='vertical-align: middle;' onclick='document.forms.fgalformid.action+=(document.forms.fgalformid.action.indexOf("?")>0?"&":"?")+"movesel_x=1"'}</a>
- {/if}
- {/if}
- {if $tiki_p_admin_file_galleries eq 'y'}
- <a class="fg-actions-icon">{icon _id='cross' _tag='input_image' ____confirm='{tr}Are you sure you want to delete the selected files?{/tr}' name='delsel' alt='{tr}Delete{/tr}' style='vertical-align: middle;' onclick='if(!confirm("{tr}Are you sure you want to delete the selected files?{/tr}"))return false;document.forms.fgalformid.action+=(document.forms.fgalformid.action.indexOf("?")>0?"&":"?")+"delsel_x=1"'}</a>
- {/if}
- <a class="fg-actions-icon">{icon _id='pics/icons/mime/zip.png' _tag='input_image' name='zipsel' alt='{tr}Download the zip{/tr}' style='vertical-align: middle;'}</a>
- {if $tiki_p_assign_perm_file_gallery eq 'y'}
- <a class="fg-actions-icon">{icon _id='key' _tag='input_image' name='permsel' alt="{tr}Assign Permissions{/tr}" title="{tr}Assign Permissions{/tr}" style='vertical-align: middle;' onclick='document.forms.fgalformid.action+=(document.forms.fgalformid.action.indexOf("?")>0?"&":"?")+"permsel_x=1"'}</a>
- {/if}
- </div>
- {/if}
- {if $smarty.request.movesel_x and !isset($file_info)}
- <div class="fg-actions">
- {tr}Move to{/tr}:
- <select name="moveto">
- {section name=ix loop=$all_galleries}
- <option value="{$all_galleries[ix].id}">{$all_galleries[ix].label|escape}</option>
- {/section}
- </select>
- <input type='submit' name='movesel' value='{tr}Move{/tr}' />
- </div>
- {/if}
- {if $perms}
- <div class="fg-actions">
- {tr}Assign Permissions{/tr}
- <select name="perms[]" multiple="multiple" size="5"}
- {foreach from=$perms item=perm}
- <option value="{$perm.permName|escape}">{$perm.permName|escape}</option>
- {/foreach}
- </select>
- <select name="groups[]" multiple="multiple" size="5"}
- {section name=grp loop=$groups}
- <option value="{$groups[grp].groupName|escape}" {if $groupName eq $groups[grp].groupName }selected="selected"{/if}>{$groups[grp].groupName|escape}</option>
- {/section}
- </select>
- <input type="submit" name="permsel" value="{tr}Assign{/tr}" />
- </div>
- {/if}
- {/if}
</div>
</form>
Modified: branches/experimental/coe_fgal_relook2/templates/list_file_gallery_content.tpl
===================================================================
--- branches/experimental/coe_fgal_relook2/templates/list_file_gallery_content.tpl 2010-10-11 22:27:26 UTC (rev 29957)
+++ branches/experimental/coe_fgal_relook2/templates/list_file_gallery_content.tpl 2010-10-11 22:46:56 UTC (rev 29958)
@@ -2,7 +2,7 @@
{if empty($sort_arg)}{assign var='sort_arg' value='sort_mode'}{/if}
<table class="normal">
<tr>
- {if $gal_info.show_checked ne 'n' and ($tiki_p_admin_file_galleries eq 'y' or $tiki_p_upload_files eq 'y')}
+ {if $gal_info.show_checked ne 'n' and ($tiki_p_admin_file_galleries eq 'y' or $tiki_p_upload_files eq 'y') and $filegals_manager eq ''}
{assign var=nbCols value=`$nbCols+1`}
<th style="width:1%"> </th>
{/if}
@@ -14,7 +14,7 @@
{if $show_parentName eq 'y'}
<th>
- {self_link _sort_arg=$sort_arg _sort_field='parentName'}{tr}Gallery{/tr}{/self_link}
+ {self_link _class='fgalaction' _sort_arg=$sort_arg _sort_field='parentName'}{tr}Gallery{/tr}{/self_link}
</th>
{/if}
@@ -55,14 +55,14 @@
{if $propname eq 'name' and ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'f' ) }
{assign var=nbCols value=`$nbCols+1`}
<th{$td_args}>
- {self_link _sort_arg=$sort_arg _sort_field='filename'}{tr}Filename{/tr}{/self_link}
+ {self_link _class='fgalaction' _sort_arg=$sort_arg _sort_field='filename'}{tr}Filename{/tr}{/self_link}
</th>
{/if}
{if !($galleryId eq 0 and $propname eq 'lockedby') and ($propname neq 'name' or ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'n' )) }
{assign var=nbCols value=`$nbCols+1`}
<th{$td_args}>
- {self_link _sort_arg=$sort_arg _sort_field=$propname _title=$link_title}
+ {self_link _class='fgalaction' _sort_arg=$sort_arg _sort_field=$propname _title=$link_title}
{if $propicon}{icon _id=$propicon alt=$link_title}{else}{$propval}{/if}
{/self_link}
</th>
@@ -77,7 +77,7 @@
<div class='box-title'>{tr}Other Sorts{/tr}</div>
<div class='box-data'>
{if $other_columns_selected neq ''}
- {self_link sort_mode='NULL'}{tr}No Additionnal Sort{/tr}{/self_link}
+ {self_link _class='fgalaction' sort_mode='NULL'}{tr}No Additionnal Sort{/tr}{/self_link}
<hr />
{/if}
{$other_columns}
@@ -90,7 +90,7 @@
{if $other_columns_selected neq ''}
{assign var=nbCols value=`$nbCols+1`}
<th>
- {self_link _sort_arg=$sort_arg _sort_field=$other_columns_selected _title=$fgal_listing_conf.$other_columns_selected.name}
+ {self_link _class='fgalaction' _sort_arg=$sort_arg _sort_field=$other_columns_selected _title=$fgal_listing_conf.$other_columns_selected.name}
{$fgal_listing_conf.$other_columns_selected.name}
{/self_link}
</th>
@@ -196,7 +196,7 @@
{/if}
<tr class="{cycle}">
- {if $gal_info.show_checked neq 'n' and ($tiki_p_admin_file_galleries eq 'y' or $tiki_p_upload_files eq 'y')}
+ {if $gal_info.show_checked neq 'n' and ($tiki_p_admin_file_galleries eq 'y' or $tiki_p_upload_files eq 'y') and $filegals_manager eq ''}
<td style="text-align:center;">
{if $files[changes].isgal eq 1}
{assign var='checkname' value='subgal'}
@@ -346,7 +346,7 @@
</tr>
{/section}
- {if $gal_info.show_checked ne 'n' and $tiki_p_admin_file_galleries eq 'y' and $prefs.javascript_enabled eq 'y'}
+ {if $gal_info.show_checked ne 'n' and $tiki_p_admin_file_galleries eq 'y' and $prefs.javascript_enabled eq 'y' and $filegals_manager eq ''}
<tr>
<td colspan="{$nbCols}">
{select_all checkbox_names='file[],subgal[]' label="{tr}Select All{/tr}"}
Modified: branches/experimental/coe_fgal_relook2/templates/tiki-upload_file.tpl
===================================================================
--- branches/experimental/coe_fgal_relook2/templates/tiki-upload_file.tpl 2010-10-11 22:27:26 UTC (rev 29957)
+++ branches/experimental/coe_fgal_relook2/templates/tiki-upload_file.tpl 2010-10-11 22:46:56 UTC (rev 29958)
@@ -8,19 +8,14 @@
{title help="File+Galleries" admpage="fgal"}{if $editFileId}{tr}Edit File:{/tr} {$fileInfo.filename}{else}{tr}Upload File{/tr}{/if}{/title}
-{if !empty($galleryId) or (count($galleries) > 0 and $tiki_p_list_file_galleries eq 'y') or count($uploads) > 0}
+{if $filegals_manager eq '' and ( !empty($galleryId) or (count($galleries) > 0 and $tiki_p_list_file_galleries eq 'y') or count($uploads) > 0 )}
<div class="navbar">
{if !empty($galleryId)}
{button galleryId="$galleryId" href="tiki-list_file_gallery.php" _text="{tr}Browse Gallery{/tr}"}
{/if}
{if count($galleries) > 0 and $tiki_p_list_file_galleries eq 'y'}
- {if $filegals_manager neq ''}
- {assign var=fgmanager value=$filegals_manager|escape}
- {button href="tiki-list_file_gallery.php?filegals_manager=$fgmanager" _text="{tr}List Galleries{/tr}"}
- {else}
- {button href="tiki-list_file_gallery.php" _text="{tr}List Galleries{/tr}"}
- {/if}
+ {button href="tiki-list_file_gallery.php" _text="{tr}List Galleries{/tr}"}
{/if}
{if count($uploads) > 0}
{button href="#upload" _text="{tr}Upload File{/tr}"}
@@ -70,7 +65,7 @@
</td>
<td>
{if $filegals_manager neq ''}
- <a href="#" onclick="window.opener.insertAt('{$filegals_manager}','{$files[changes].wiki_syntax|escape}');checkClose();return false;" title="{tr}Click Here to Insert in Wiki Syntax{/tr}">{$uploads[ix].name} ({$uploads[ix].size|kbsize})</a>
+ <a href="#" onclick="insertAt('{$filegals_manager}','{$files[changes].wiki_syntax|escape}');checkClose();return false;" title="{tr}Click Here to Insert in Wiki Syntax{/tr}">{$uploads[ix].name} ({$uploads[ix].size|kbsize})</a>
{else}
<b>{$uploads[ix].name} ({$uploads[ix].size|kbsize})</b>
{/if}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|