Changeset 240:dfb7345d0e97

Timestamp:

05/11/11 15:45:12 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Message:

Mise en place de la préférence d'activation de l'interface avancée du gestionnaire de média
Reste l'activation auto à mettre en place

Files:

• admin/install/index.php (modified) (1 diff)
• admin/media.php (modified) (1 diff)
• admin/preferences.php (modified) (6 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/install/index.php

@@ -191 +191 @@
           $core->auth->user_prefs->dashboard->put('dcnews',true,'boolean','',null,true);
           $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true);
-          
+
+          # Add accessibility options
+          $core->auth->user_prefs->addWorkspace('accessibility');
+          $core->auth->user_prefs->accessibility->put('nodragdrop',false,'boolean','',null,true);
+
+          # Add user interface options
+          $core->auth->user_prefs->addWorkspace('interface');
+          $core->auth->user_prefs->interface->put('enhanceduploader',false,'boolean','',null,true);
+
           # Add default favorites
           $core->auth->user_prefs->addWorkspace('favorites');

admin/media.php

@@ -242 +242 @@
 /* DISPLAY Main page
 -------------------------------------------------------- */
+$core->auth->user_prefs->addWorkspace('interface');
+$user_ui_enhanceduploader = $core->auth->user_prefs->interface->enhanceduploader;
+
 call_user_func($open_f,__('Media manager'),
      dcPage::jsLoad('js/_media.js').
-     ($core_media_writable ? dcPage::jsCandyUpload(array('d='.$d)) : ''));
+     (($user_ui_enhanceduploader && $core_media_writable) ? dcPage::jsCandyUpload(array('d='.$d)) : '')
+     );
 
 if (!empty($_GET['mkdok'])) {

admin/preferences.php

@@ -34 +34 @@
 
 $core->auth->user_prefs->addWorkspace('accessibility');
-$user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop;
+$user_acc_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop;
+
+$core->auth->user_prefs->addWorkspace('interface');
+$user_ui_enhanceduploader = $core->auth->user_prefs->interface->enhanceduploader;
 
 $default_tab = 'user-profile';
@@ -144 +147 @@
           $core->auth->user_prefs->dashboard->put('dcnews',!empty($_POST['user_dm_dcnews']),'boolean');
           $core->auth->user_prefs->dashboard->put('quickentry',!empty($_POST['user_dm_quickentry']),'boolean');
-          $core->auth->user_prefs->accessibility->put('nodragdrop',!empty($_POST['user_dm_nodragdrop']),'boolean');
+          $core->auth->user_prefs->accessibility->put('nodragdrop',!empty($_POST['user_acc_nodragdrop']),'boolean');
+          $core->auth->user_prefs->interface->put('enhanceduploader',!empty($_POST['user_ui_enhanceduploader']),'boolean');
           
           # Udate user
@@ -292 +296 @@
 dcPage::open($page_title,
      dcPage::jsLoad('js/_preferences.js').
-     ($user_dm_nodragdrop ? '' : dcPage::jsLoad('js/_preferences-dragdrop.js')).
+     ($user_acc_nodragdrop ? '' : dcPage::jsLoad('js/_preferences-dragdrop.js')).
      dcPage::jsLoad('js/jquery/jquery-ui-1.8.12.custom.min.js').
      dcPage::jsPageTabs($default_tab).
@@ -407 +411 @@
 form::checkbox('user_wysiwyg',1,$user_options['enable_wysiwyg'],'',12).' '.
 __('Enable WYSIWYG mode').'</label></p>'.
+
+'<p><label for="user_ui_enhanceduploader" class="classic">'.
+form::checkbox('user_ui_enhanceduploader',1,$user_ui_enhanceduploader,'',13).' '.
+__('Activate enhanced uploader in media manager').'</label></p>'.
+
 '<br class="clear" />'. //Opera sucks
 '</fieldset>';
@@ -413 +422 @@
 '<fieldset><legend>'.__('Accessibility options').'</legend>'.
 
-'<p><label for="user_dm_nodragdrop" class="classic">'.
-form::checkbox('user_dm_nodragdrop',1,$user_dm_nodragdrop,'',13).' '.
+'<p><label for="user_acc_nodragdrop" class="classic">'.
+form::checkbox('user_acc_nodragdrop',1,$user_acc_nodragdrop,'',14).' '.
 __('Disable javascript powered drag and drop for ordering items').'</label></p>'.
 
@@ -424 +433 @@
 
 '<p><label for="user_dm_doclinks" class="classic">'.
-form::checkbox('user_dm_doclinks',1,$user_dm_doclinks,'',14).' '.
+form::checkbox('user_dm_doclinks',1,$user_dm_doclinks,'',15).' '.
 __('Display documentation links').'</label></p>'.
 
 '<p><label for="user_dm_dcnews" class="classic">'.
-form::checkbox('user_dm_dcnews',1,$user_dm_dcnews,'',15).' '.
+form::checkbox('user_dm_dcnews',1,$user_dm_dcnews,'',16).' '.
 __('Display Dotclear news').'</label></p>'.
 
 '<p><label for="user_dm_quickentry" class="classic">'.
-form::checkbox('user_dm_quickentry',1,$user_dm_quickentry,'',16).' '.
+form::checkbox('user_dm_quickentry',1,$user_dm_quickentry,'',17).' '.
 __('Display quick entry form').'</label></p>'.
 

locales/fr/main.po

@@ -2804 +2804 @@
 #~ msgid "Modify numbers in fields to change favorites order."
 #~ msgstr "Modifiez les nombres dans les champs pour changer l'ordre des favoris."
+
+msgid "Activate enhanced uploader in media manager"
+msgstr "Activer l'interface avancée du gestionnaire de média"