Dotclear

Changeset 3906:67f6a46a8802


Ignore:
Timestamp:
10/23/18 12:10:59 (7 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Message:

Drag'n'drop of dashboard areas is no more activated by default after 5 seconds. The user must activate (new button) it before moving them.

Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • admin/index.php

    r3874 r3906  
    145145        } 
    146146    } 
     147} 
     148 
     149# Dashboard drag'n'drop switch for its elements 
     150$core->auth->user_prefs->addWorkspace('accessibility'); 
     151$dragndrop = ''; 
     152if (!$core->auth->user_prefs->accessibility->nodragdrop) { 
     153    $dragndrop = 
     154        '<script type="text/javascript">' . "\n" . 
     155            dcPage::jsVar('dotclear.dragndrop_off', __('Dashboard area\'s drag and drop is disabled')) . "\n" . 
     156            dcPage::jsVar('dotclear.dragndrop_on', __('Dashboard area\'s drag and drop is enabled')) . "\n" . 
     157        "</script>\n". 
     158        '<input type="checkbox" id="dragndrop" title="' . __('Dashboard area\'s drag and drop is disabled') . '" />'; 
    147159} 
    148160 
    … …  
    398410$dashboardMain = $composeItems($main_order, $__dashboard_main, true); 
    399411 
    400 # Dashboard elements 
    401 echo '<div id="dashboard-main">' . $dashboardMain . '</div>'; 
     412echo $dragndrop . '<div id="dashboard-main">' . $dashboardMain . '</div>'; 
    402413 
    403414dcPage::helpBlock('core_dashboard'); 

  • admin/js/_index.js

    r3905 r3906  
    237237      }); 
    238238    }; 
    239     // Wait 5 seconds before activating ordering capabilities on dashboard 
    240     setTimeout(function() { 
    241       init_positions('#dashboard-main', 'main_order'); 
    242       init_positions('#dashboard-boxes', 'boxes_order'); 
    243       init_positions('#db-items', 'boxes_items_order'); 
    244       init_positions('#db-contents', 'boxes_contents_order'); 
    245     }, 5000); 
     239    const reset_positions = function(sel) { 
     240      $(sel).sortable('destroy'); 
     241    }; 
     242    // List of sortable areas 
     243    const areas = [ 
     244      ['#dashboard-main', 'main_order'], 
     245      ['#dashboard-boxes', 'boxes_order'], 
     246      ['#db-items', 'boxes_items_order'], 
     247      ['#db-contents', 'boxes_contents_order'] 
     248    ]; 
     249    // Set or reset sortable depending on #dragndrop checbkox value 
     250    $('#dragndrop').click(function() { 
     251      if ($(this).is(':checked')) { 
     252        // Activate sorting feature 
     253        areas.forEach(element => init_positions(element[0], element[1])); 
     254        $(this).prop('title', dotclear.dragndrop_on); 
     255      } else { 
     256        // Deactivate sorting feature 
     257        areas.forEach(element => reset_positions(element[0])); 
     258        $(this).prop('title', dotclear.dragndrop_off); 
     259      } 
     260    }); 
    246261  } 
    247262}); 

  • admin/style/default-dark.css

    r3877 r3906  
    2121 
    2222a { 
    23   background: transparent; 
    24   } 
     23  background: transparent; } 
    2524  a:focus { 
    2625    outline: thin dotted; } 
    … …  
    751750  margin: 0 -1em 1em -1em; 
    752751  background: #272b30; 
    753   border-bottom: 1px solid #86888c; 
    754   } 
     752  border-bottom: 1px solid #86888c; } 
    755753 
    756754/* page courante dans le fil d'ariane */ 
    … …  
    22312229    margin: 0.2em 0 0 0; } 
    22322230 
     2231#dragndrop { 
     2232  position: absolute; 
     2233  width: 2em; 
     2234  height: 1.5em; 
     2235  -webkit-mask-image: url(dragndrop.svg); 
     2236  mask-image: url(dragndrop.svg); } 
     2237  #dragndrop:before { 
     2238    content: ""; 
     2239    display: inline-block; 
     2240    width: 2em; 
     2241    height: 1.5em; 
     2242    background: #86888c; } 
     2243  #dragndrop:checked:before { 
     2244    background: #bee74b; } 
     2245 
    22332246#media_img_title_pattern { 
    22342247  margin-right: 1em; } 

  • admin/style/default.css

    r3876 r3906  
    22292229    margin: 0.2em 0 0 0; } 
    22302230 
     2231#dragndrop { 
     2232  position: absolute; 
     2233  width: 2em; 
     2234  height: 1.5em; 
     2235  -webkit-mask-image: url(dragndrop.svg); 
     2236  mask-image: url(dragndrop.svg); } 
     2237  #dragndrop:before { 
     2238    content: ""; 
     2239    display: inline-block; 
     2240    width: 2em; 
     2241    height: 1.5em; 
     2242    background: #868686; } 
     2243  #dragndrop:checked:before { 
     2244    background: #137bbb; } 
     2245 
    22312246#media_img_title_pattern { 
    22322247  margin-right: 1em; } 

  • admin/style/scss/partials/_index.scss

    r3839 r3906  
    11#dashboard-main { 
    22  text-align: center; 
    3   & > *:last-child { 
     3  &>*:last-child { 
    44    margin-bottom: 1em; 
    55  } 
    … …  
    141141  } 
    142142} 
     143// Drag'n'drop of dashboard areas 
     144#dragndrop { 
     145  position: absolute; 
     146  width: 2em; 
     147  height: 1.5em; 
     148  -webkit-mask-image: url(dragndrop.svg); 
     149  mask-image: url(dragndrop.svg); 
     150  &:before { 
     151    content: ""; 
     152    display: inline-block; 
     153    width: 2em; 
     154    height: 1.5em; 
     155    background: $drag-n-drop-off; 
     156  } 
     157  &:checked:before { 
     158    background: $drag-n-drop-on; 
     159  } 
     160} 

  • admin/style/scss/themes/_dark.scss

    r3871 r3906  
    313313$index-box-border:                tint($gray-dark, 66%); 
    314314 
     315$drag-n-drop-off:                 $gray-semi-dark; 
     316$drag-n-drop-on:                  $success; 
     317 
    315318// - Blog params 
    316319 

  • admin/style/scss/themes/_light.scss

    r3871 r3906  
    313313$index-box-border:                tint($gray-dark, 66%);              // #c5c5c5 
    314314 
     315$drag-n-drop-off:                 $gray-semi-dark; 
     316$drag-n-drop-on:                  $blue; 
     317 
    315318// - Blog params 
    316319 

  • locales/fr/main.po

    r3836 r3906  
    960960msgstr "Tableau de bord" 
    961961 
     962msgid "Dashboard area's drag and drop is disabled" 
     963msgstr "L'ordonnancement par glisser-déposer des zones du tableau de bord est désactivé" 
     964 
     965msgid "Dashboard area's drag and drop is enabled" 
     966msgstr "L'ordonnancement par glisser-déposer des zones du tableau de bord est activé" 
     967 
    962968msgid "Make this blog my default blog" 
    963969msgstr "Définir comme blog par défaut" 
Note: See TracChangeset for help on using the changeset viewer.

Sites map