Procházet zdrojové kódy

fixed compatibility with module flag_lists 3.x
converted materiobasemod js processor to gulp

Bachir Soussi Chiadmi před 9 roky
rodič
revize
2ed8b48636

+ 27 - 0
sites/all/modules/gui/materiobasemod/gulpfile.js

@@ -0,0 +1,27 @@
+'use strict';
+
+var gulp = require('gulp');
+var watch = require('gulp-watch');
+var jsmin = require('gulp-jsmin');
+var rename = require('gulp-rename');
+
+function handleError(err) {
+  console.log(err.toString());
+  // this.emit('end');
+}
+
+gulp.task('scripts', function () {
+    gulp.src('./js/*.js')
+        .pipe(jsmin())
+        .pipe(rename({suffix: '.min'}))
+        .pipe(gulp.dest('./js/dist/'));
+});
+
+
+gulp.task('default', function () {
+});
+
+// default gulp task
+gulp.task('default', ['scripts'], function() {
+  gulp.watch('./js/*.js', ['scripts']);
+});

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 22 - 0
sites/all/modules/gui/materiobasemod/js/dist/gui.min.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 9 - 0
sites/all/modules/gui/materiobasemod/js/dist/materio_flag.min.js


+ 4 - 0
sites/all/modules/gui/materiobasemod/js/dist/materio_page_title.min.js

@@ -0,0 +1,4 @@
+
+(function($){MaterioPageTitle=function(){function init(){$(document).bind('materio-page-title-refresh-block',onRefreshBlock).bind('list-edited',onListEdited);};function onRefreshBlock(event){trace('MaterioPageTitle :: onRefreshBlock',event);if(typeof event.title!=='undefined')
+$('#block-materio-page-title-materio-page-title h1').html(event.title);};function onListEdited(event){trace('MaterioPageTitle :: onListEdited',event);if($("#materio-page-title ."+event.name).length)
+$('a.open-list.'+event.name).eq(0).trigger('click');};init();};$(document).ready(function(){var materiopagetitle=new MaterioPageTitle();});})(jQuery);

+ 12 - 0
sites/all/modules/gui/materiobasemod/js/dist/materio_search_api_ajax.min.js

@@ -0,0 +1,12 @@
+
+(function($){MaterioSearchApiAjax=function(){var _isloadingresults=false;var _$content=$('#content');function init(){initSearchAjax();initViewMode();};function initSearchAjax(){$('#materio-search-api-search-form').bind('submit',function(event){setTimeout(function(){loadResults(getSearchKeys());},10);return false;});$("#edit-searchfield").bind('autocompleteSelect',function(event){setTimeout(function(){loadResults(getSearchKeys(),"taxonomy");},10);}).bind('focus',function(event){$(this).select();});$(document).bind('theme-ready',onThemeReady).bind('init-scroller-pager',onInitScrollerPager).bind('load-scroller-pager',onLoadScrollerPager).bind('view-mode-changed',onViewModeChanged).bind('history-state-change',onHistoryStateChange);};function onThemeReady(event){if(isActuality()||isExplore()){$.event.trigger({type:'resultschanged',container:isActuality()?'#content .actuality-items':'#content .search-results'});}};function getSearchKeys(){return $('#materio-search-api-search-form').find('input[name*="searchfield"]').val();};function loadResults(keys,searchmode){if(keys!==undefined&&keys!==''&&keys.length>=2){keys=keys.replace('/',' ');searchmode=searchmode||"fulltext";var types={},stringTypes=[];$('#edit-bundles-filter','#materio-search-api-search-form').find('input[type*="checkbox"]').each(function(i){$this=$(this);if($this.attr('checked'))
+stringTypes.push($this.val());types[$this.val()]=$this.attr('checked');});if(!_isloadingresults){$.event.trigger('loading-content');_isloadingresults=true;$('#materio-search-api-search-form').addClass('loading');$.getJSON(Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/search/',{'types':types,'current_path':document.location.href,'keys':keys,'searchmode':searchmode},function(json){$.event.trigger({type:"record-stat",categorie:'Search',action:keys,label:'filters : '+stringTypes.join(' ,'),value:json.count});if(json.redirect){window.location=json.redirect;}else{$.event.trigger('loaded-content');_isloadingresults=false;$('#materio-search-api-search-form').removeClass('loading');changeContent(json);}});}}};function loadActuality(){if(!_isloadingresults){$.event.trigger('loading-content');_isloadingresults=true;$('#materio-search-api-search-form').addClass('loading');var url=Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/actuality';$.getJSON(url,function(json){$.event.trigger('loaded-content');_isloadingresults=false;$('#materio-search-api-search-form').removeClass('loading');changeContent(json);});}};function changeContent(json){if(json.returned){$.event.trigger('loaded-content');$('.inner-content',_$content).html(json.returned).find('ul.pager').hide();triggerContentChanged();}else{}
+$.event.trigger({type:'new-history-page',path:Drupal.settings.basePath+Drupal.settings.pathPrefix+json.path,title:json.title,content:json.returned});for(language in Drupal.settings.materio_search_api_ajax.languages){var l=Drupal.settings.materio_search_api_ajax.languages[language];$('#block-locale-language li.'+language+' a').attr('href',Drupal.settings.basePath+l.prefix+'/'+json.search_path+'/'+json.keys)};};function triggerContentChanged(){$.event.trigger({type:'resultschanged',container:'#content .search-results, #content .actuality-items'});};function onInitScrollerPager(event){if(isActuality()||isExplore())
+event.pager.hide();};function onLoadScrollerPager(event){if(!_isloadingresults){if(isExplore())
+loadNextResultsPage(event.href);if(isActuality())
+loadNextActualityPage(event.href);}};function loadNextResultsPage(href){trace('loadNextResultsPage');var keys=href.match(/explore\/([^\/|\?]+)/);var page=href.match(/\?page=([0-9]+)/);var url=Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/search/'+page[1];loadNextPage(url,keys[1],$('.materiobase-results',_$content),'.search-results');};function loadNextActualityPage(href){var page=href.match(/\?page=([0-9]+)/);var url=Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/actuality/'+page[1];loadNextPage(url,'',$('.materiobase-actuality',_$content),'.actuality-items');};function loadNextPage(url,keys,$container,target){_isloadingresults=true;$container.addClass('loading');$.getJSON(url,{'keys':keys},function(json){$container.removeClass('loading');addNextpage(json,target);});};function addNextpage(json,container_class){if(json){var $newcontent=$(json.returned),$newitems=$(container_class,$newcontent).children('article'),$newpager=$('ul.pager',$newcontent);$(container_class,_$content).append($newitems);$('ul.pager',_$content).replaceWith($newpager.hide());$(container_class,_$content).children('.just-added').each(function(i){var $this=$(this);setTimeout(function(){$this.removeClass('just-added');},150*i);});$.event.trigger({type:'resultscompleted',container:$(container_class,_$content)});}
+_isloadingresults=false;};function addNextpageItemByItem($newcontent,container_class){$('ul.pager',_$content).remove();$(container_class,_$content).append($(container_class,$newcontent).children('article').eq(0));if($(container_class,$newcontent).children('article').length){setTimeout(function(){addNextpageItemByItem($newcontent,container_class);},200);}else{_isloadingresults=false;$('ul.pager',_$content).replaceWith($('ul.pager',$newcontent).hide());$.event.trigger({type:'resultscompleted',container:$(container_class,_$content)});}};function initViewMode(){$('.viewmode-link').click(function(event){event.preventDefault();if(!$(this).is('.active')){$(this).trigger({type:'vm-clicked'});changeViewMode($(this).attr('rel'),$(this));}else{$(this).trigger({type:'vm-clicked-active'});}
+return false;});};function changeViewMode(vm,$btn){if(!_isloadingresults){_isloadingresults=true;$.getJSON(Drupal.settings.basePath+'materio_search_api_ajax/viewmode/change/'+vm,function(json){_isloadingresults=false;if(json.statut=="saved"){$.event.trigger({type:"record-stat",categorie:'Viewmode',action:vm,label:isActuality()?'Actualities':'Search results'});$.event.trigger('view-mode-changed');$('.viewmode-link, .viewmode-link i').removeClass('active');$btn.addClass('active').find('i').addClass('active');}});}};function onViewModeChanged(event){if(isExplore())
+loadResults(getSearchKeys());if(isActuality())
+loadActuality();};function onHistoryStateChange(event){if(isExplore()||isActuality())
+triggerContentChanged();};function isExplore(){return $('.search-results','#content').length;};function isActuality(){return $('.actuality-items','#content').length;};init();};$(document).ready(function(){var materiosearchapiajax=new MaterioSearchApiAjax();});})(jQuery);

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 3 - 0
sites/all/modules/gui/materiobasemod/js/dist/materio_user.min.js


+ 0 - 163
sites/all/modules/gui/materiobasemod/js/materio_user.min.js → sites/all/modules/gui/materiobasemod/js/gui.js

@@ -366,166 +366,3 @@ function getElementAngle(x1, y1, x2, y2) {
 
 
 
-
-
-// @codekit-prepend "gui.js"
-// @koala-prepend "gui_ck_fw/gui.js"
-
-(function($) {
-
-MaterioUser = function(){
-
-  var _isAdhesion = $('body').is('.page-node-11187') || $('body').is('.page-node-11186');
-
-  function init() {
-    //trace('MaterioUser init compile test 3');
-    if(_isAdhesion)
-      initAdhesion();
-  };
-
-  function initAdhesion(){
-    // trace('initAdhesion');
-    $('.get-link a').bind('click', function(event) {
-      // trace('get-link click');
-
-      // do not show the registration form if already logged-in
-      if($('body').is('.logged-in'))
-        return true;
-
-      // else show the ajaxified registration form
-      event.preventDefault();
-
-      var  $this = $(this),
-             href = $this.attr("href"),
-             destination = href.match('/\?destination=([^,]+)');
-
-      destination = "/" + destination[1].replace('%23', '#');
-      destination = destination.replace('//', '/');
-      // trace('destination', destination);
-
-      if($this.parents('.gratos').size()){
-        loadRegisterBlock(destination);
-      }else{
-        loadLoginAndRegisterBlock(destination);
-      }
-      return false;
-    });
-  };
-
-  function loadRegisterBlock (destination) {
-    // trace("loadRegisterBlock :: dest = "+destination);
-    $.getJSON(Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_user/registerblock', function(json){formLoaded(json, destination);});
-  }
-
-  function loadLoginAndRegisterBlock(destination){
-    // trace('loadRegistrationBlock :: dest = '+destination);
-    $.getJSON(Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_user/loginandregisterblock', function(json){formLoaded(json, destination);});
-  };
-
-  function formLoaded(json, destination){
-    //trace('formLoaded | json', json);
-    var $modal = $('<div>').addClass('modal-content').append(json.block);
-
-    var id,label, description;
-    $('input.form-text', $modal).each(function(i) {
-      id = $(this).attr('id');
-      label = $('label[for='+id+']').hide().text();
-      description = $(this).parent().find('.description').hide().text();
-      $(this).attr('placeholder', label).attr('title', description);
-    });
-
-    // $('.homepage-textfield', $modal).hide();
-
-    $('body').append($('<div>').addClass('modal-wrapper').append($modal));
-
-    $('.modal-wrapper').bind('click', function(event) {
-      $(this).remove();
-    });
-
-    $('.modal-content').bind('click', function(event) {
-     event.stopPropagation();
-    });
-
-    // doesn't work
-    // Drupal.attachBehaviors('bodi>.modal-wrapper');
-
-    $.event.trigger('ajax-register-block-loaded');
-
-    $("#user-register-form #edit-submit, #user-register-form #edit-submit--2", $modal).click(function(event){
-      event.preventDefault();
-
-      // disable submit button to avoid duplicate user creation
-      // console.log('click', this);
-      $(this).attr('disabled', 'true');
-
-      $.ajax({
-        type: 'POST',
-        dataType:'json',
-        url: Drupal.settings.basePath+Drupal.settings.pathPrefix+"materio_user/register/submit",
-        data: $('#user-register-form', $modal).serialize(),
-        success: function(data) { onUserLoginRegisterSubmit($('#user-register-form'), data, destination);},
-        error: function(jqXHR, textStatus, errorThrown) { trace('error : '+textStatus+' | '+errorThrown); }
-      });
-      return false;
-    });
-
-     $("#user-login #edit-submit", $modal).click(function(event){
-      event.preventDefault();
-      $.ajax({
-        type: 'POST',
-        dataType:'json',
-        url: Drupal.settings.basePath+Drupal.settings.pathPrefix+"materio_user/login/submit",
-        data: $('#user-login', $modal).serialize(),
-        success: function(data){ onUserLoginRegisterSubmit($('#user-login'), data, destination); },
-        error: function(jqXHR, textStatus, errorThrown) { trace('error : '+textStatus+' | '+errorThrown); }
-      });
-      return false;
-    });
-
-    // google analytics
-    // $.event.trigger({
-    //   type : "record-stat",
-    //   categorie : 'Search',
-    //   action : keys,
-    //   label : 'filters : '+ stringTypes.join(' ,'),
-    //   value : json.count
-    // });
-
-
-  };
-
-  function onUserLoginRegisterSubmit($form, data, destination){
-    // console.log('data', data);
-    cleanModalErrors();
-    if(data.errors != null){
-      for(field in data.errors){
-        $('input[name='+field+']', $form).addClass('error');
-        $form.prepend($('<div>').addClass('message-error').html(data.errors[field]));
-      }
-
-      (function($form){
-        setTimeout(function(){
-          console.log('enabled');
-          $('input[type=submit]', $form).removeAttr('disabled');
-        }, 0.5*1000);
-      })($form);
-
-    }else{
-      // trace('destination = '+destination);
-      window.location.pathname = destination;
-    }
-  };
-
-  function cleanModalErrors() {
-    $('.message-error', '.modal-content').remove();
-    $('input', '.modal-content').removeClass('error');
-  }
-
-  init();
-};
-
-$(document).ready(function() {
-  var materiouser = new MaterioUser();
-});
-
-})(jQuery);

+ 22 - 15
sites/all/modules/gui/materiobasemod/js/materio_flag.js

@@ -270,7 +270,7 @@ MaterioFlag = function(){
   * onClickCreatLink(event)
   */
   function onClickCreatLink(event){
-    //trace('MaterioFlag :: onClickCreatLink | event', event);
+    // trace('MaterioFlag :: onClickCreatLink | event', event);
     event.preventDefault();
     var $link = $(event.currentTarget);
     var type = $link.attr('href').match(/[^\/]*$/);
@@ -285,7 +285,7 @@ MaterioFlag = function(){
   };
 
   function showCreateListForm(json, $link){
-    //trace('MaterioFlag :: showCreateListForm | json', json);
+    // trace('MaterioFlag :: showCreateListForm | json', json);
     // google analytics
     $.event.trigger({
       type:"record-stat",
@@ -317,20 +317,22 @@ MaterioFlag = function(){
             });
 
             break;
-          case 'create':
-            //trace('MaterioFlag :: create',event);
-            var title = $(this).parents('form').find('input[name*="flag-lists-name"]').val();
+          case 'op':
+            trace('MaterioFlag :: create',event);
+            var name = $(this).parents('form').find('input[name*="title"]').val();
+            // name = encodeURIComponent(name);
             var type = $(this).parents('form').find('input[name*="type"]').val();
+            var token = $(this).parents('form').find('input[name*="form_token"]').val();
 
             // google analytics
             $.event.trigger({
               type : "record-stat",
               categorie : "flagLists",
               action : "submit create form",
-              label : 'title : '+title
+              label : 'title : '+name
             });
 
-            createList($modal, type, title, $link);
+            createList($modal, type, name, token, $link);
             break;
         }
 
@@ -340,20 +342,20 @@ MaterioFlag = function(){
       // TODO:  esc keypressed close the form
   };
 
-  function createList($modal, type, title, $link){
-    //trace('materioflag :: createList | title', title);
+  function createList($modal, type, name, token, $link){
+    // trace('materioflag :: createList | title', name);
     $('.flag-lists-create').addClass('loading');
 
     var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'flag-lists/add/'+type+'/js';
-    $.getJSON(url, {name:title}, function(data) {
+    $.getJSON(url, {form_token:token,name:name}, function(data) {
       if (data.error) {
-        //trace(data.error);
+        trace("MaterioFlag :: created list : data.error", data.error);
       }
       else {
         // select.append('<option value="'+data.flag.fid+'">'+data.flag.title+'</option>');
         // $('input.name', $(this)).val('');
         // dialog.dialog('close');
-        //trace('MaterioFlag :: created list : data', data);
+        // trace('MaterioFlag :: created list : data', data);
         if($link.attr('nid') && $link.attr('token')){
           flagEntityWithList(data.flag.name, $link.attr('nid'), $link.attr('token'));
         }else{
@@ -566,12 +568,17 @@ MaterioFlag = function(){
           alert(data.message);
       }
       else {
-        //trace('MaterioFlag :: deleted list : data', data);
+        trace('MaterioFlag :: deleted list : data', data);
 
         refreshBlocks();
         refreshNodeLinks();
-        // TODO:  if the deleted list was the current displayed list ??
         $modal.remove();
+
+        // TODO:  if the deleted list was the current displayed list ??
+        trace("MaterioFlag :: deleted list : document.location.href", document.location.href);
+        if(document.location.href.indexOf("/lists/"+data.fid) !== -1){
+          window.location = Drupal.settings.basePath + Drupal.settings.pathPrefix +"actuality";
+        }
       }
     });
   };
@@ -710,4 +717,4 @@ $(document).ready(function() {
   var materioflag = new MaterioFlag();
 });
 
-})(jQuery);
+})(jQuery);

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 130
sites/all/modules/gui/materiobasemod/js/materio_flag.min.js


+ 0 - 44
sites/all/modules/gui/materiobasemod/js/materio_page_title.min.js

@@ -1,44 +0,0 @@
-// @codekit-prepend "gui.js"
-// @koala-prepend "gui.js"
-
-(function($) {
-
-MaterioPageTitle = function(){
-  
-  function init(){
-    $(document)
-      .bind('materio-page-title-refresh-block', onRefreshBlock)
-      .bind('list-edited', onListEdited);
-
-  };
-
-  function onRefreshBlock(event){
-    trace('MaterioPageTitle :: onRefreshBlock', event);
-    // var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_page_title/refresh/block';
-    // $.getJSON(url, function(json){
-    //   trace('page title json', json);
-    //   $('#block-materio-page-title-materio-page-title').replaceWith(json.block);
-    // });
-    if(typeof event.title !== 'undefined')
-      $('#block-materio-page-title-materio-page-title h1').html(event.title);
-  };
-
-  function onListEdited(event){
-    trace('MaterioPageTitle :: onListEdited', event);
-
-    // this is for refreshing page title when list title was just edited AND this list is the cirreunt list
-    if($("#materio-page-title ."+event.name).length)
-      $('a.open-list.'+event.name).eq(0).trigger('click');
-  
-  };
-
-
-  init();
-};
-
-$(document).ready(function() {
-  var materiopagetitle = new MaterioPageTitle();
-});
-
-  
-})(jQuery);

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 130
sites/all/modules/gui/materiobasemod/js/materio_search_api_ajax.min.js


+ 1 - 1
sites/all/modules/gui/materiobasemod/materio_display.module

@@ -5,7 +5,7 @@
  * Implements hook_init().
  */
 // function materio_user_init() {
-//   drupal_add_js(drupal_get_path('module', 'materio_user').'/js/materio_user.min.js');
+//   drupal_add_js(drupal_get_path('module', 'materio_user').'/js/dist/materio_user.min.js');
 // }
 
 

+ 3 - 4
sites/all/modules/gui/materiobasemod/materio_flag.module

@@ -166,7 +166,7 @@ function materio_flag_block_view($delta = '') {
         	$block['subject'] = t('My bookmarks');
         	$block['content'] = t('No bookmarks yet. Add bookmarks on clicking on results star');
         }
-        drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/materio_flag.min.js');
+        drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/dist/materio_flag.min.js');
       }
       break;
     case 'materio_flag_mylists':
@@ -207,7 +207,7 @@ function materio_flag_block_view($delta = '') {
           $block['subject'] = t('My '. variable_get('flag_lists_name', 'list') .'s');
           $block['content'] = t('No !listname yet. Add !listname on clicking on results star', array('!listname'=>variable_get('flag_lists_name', 'list')));
         }
-        drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/materio_flag.min.js');
+        drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/dist/materio_flag.min.js');
       }
       break;
     case 'materio_flag_mylists_nav':
@@ -386,7 +386,7 @@ function materio_flag_get_entity_links($entity, $type, $view_mode = null){
 
   if(isset($ops)){
     // dsm($ops, 'ops');
-    drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/materio_flag.min.js');
+    drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/dist/materio_flag.min.js');
     $ops['#theme'] = "materio_flag_mylists_entity_links";
     return $ops;
   }
@@ -499,4 +499,3 @@ function template_preprocess_materio_flag_mylists_list(&$vars) {
 
   // dsm($vars, '$vars');
 }
-

+ 27 - 6
sites/all/modules/gui/materiobasemod/materio_flag.pages.inc

@@ -71,9 +71,12 @@ function materio_flag_createlist_form($type){
   // } elseif (isset($return)) {
 
   // $form_state['build_info']['args'] = array(NULL, 'breve');
-  // $f = drupal_get_form('flag_lists_form', $form_state);
+  // $f = drupal_get_form('flag_lists_form', $form, $form_state, variable_get('flag_lists_name', 'list'), $type);
   // dsm($f);
 
+	// flag_lists_form($form, $form_state, $name = NULL, $type = NULL)
+
+	/*
   $form = array(
     '#type' => 'form',
     '#id' => 'materio-flag-create-list-form',
@@ -111,14 +114,31 @@ function materio_flag_createlist_form($type){
     '#value' => t('cancel'),
     '#name' => 'cancel',
   );
+  // dsm($form, 'form');
 
+*/
+	module_load_include('inc', 'flag_lists', 'flag_lists.admin');
+	$form = drupal_get_form('flag_lists_form', null, $type);
 
-  // dsm($form, 'form');
+	$form['title']['#title'] = t('Create new @name', array('@name'=>variable_get('flag_lists_name', 'list')));
+	$form['submit']['#value'] = 'create';
+
+	$form['form_token']['#value'] = drupal_get_token(variable_get('flag_lists_name','list'));
 
-  $return = drupal_render($form);
+	$form['cancel'] = array(
+		'#type' => 'button',
+		'#value' => t('cancel'),
+		'#name' => 'cancel',
+	);
+
+	$rendered_form = drupal_render($form);
+
+	$token = drupal_get_token(variable_get('flag_lists_name', 'list'));
 
   $rep = array(
-    'rendered_form'=>$return,
+		'form'=>$form,
+    'rendered_form'=>$rendered_form,
+		'token'=>$token
   );
 
   if ($debug) {
@@ -303,7 +323,8 @@ function materio_flag_delete_list($fid){
     flag_lists_fl_delete($flag);
 
     $rep = array(
-      'status' => 'saved',
+			'fid' => $fid,
+      'status' => 'deleted',
     );
   }
 
@@ -494,4 +515,4 @@ function materio_flag_ajax_list($fid, $page = 0){
       drupal_json_output($rep);
     }
   }
-}
+}

+ 1 - 1
sites/all/modules/gui/materiobasemod/materio_page_title.module

@@ -80,7 +80,7 @@ function materio_page_title_block_view($delta = '') {
     case 'materio_page_title':
       $block['subject'] = t('Page title');
       $block['content'] = theme('materio_page_title', array('title' => materio_page_title_get_title()));
-      drupal_add_js(drupal_get_path('module', 'materio_page_title').'/js/materio_page_title.min.js');
+      drupal_add_js(drupal_get_path('module', 'materio_page_title').'/js/dist/materio_page_title.min.js');
       break;
   }
   return $block;

+ 1 - 1
sites/all/modules/gui/materiobasemod/materio_search_api_ajax.module

@@ -24,7 +24,7 @@ function materio_search_api_ajax_init() {
     // ),
     'languages' => isset($languages) ? $languages[1] : array(),
   )), 'setting');
-  drupal_add_js(drupal_get_path('module', 'materio_search_api_ajax').'/js/materio_search_api_ajax.js');
+  drupal_add_js(drupal_get_path('module', 'materio_search_api_ajax').'/js/dist/materio_search_api_ajax.min.js');
 }
 
 /**

+ 16 - 0
sites/all/modules/gui/materiobasemod/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "materiobasemod",
+  "version": "1.0.0",
+  "description": "A Materio module for drupal.",
+  "main": "gulpfile.js",
+  "author": "Bachir Soussi Chiadmi",
+  "license": "GPLv3",
+  "homepage": "https://materio.com",
+  "devDependencies": {
+    "gulp": "latest",
+    "gulp-jsmin": "latest",
+    "gulp-rename": "latest",
+    "gulp-strip-debug": "latest",
+    "gulp-watch": "latest"
+  }
+}

+ 1 - 1
sites/all/themes/gui/materiobasetheme/css/styles.css

@@ -5953,7 +5953,7 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull {
           color: #333333; }
   #modal > * {
     padding: 10px; }
-  #modal .form-item-flag-lists-name input {
+  #modal #flag-lists-form .form-item-title input {
     width: 95%; }
   #modal .actions {
     text-align: right; }

+ 7 - 4
sites/all/themes/gui/materiobasetheme/scss/styles.scss

@@ -1868,15 +1868,18 @@ body.print-body-materiau{
 #modal{
   @include mat_modal();
   >*{padding: 10px;}
-  .form-item-flag-lists-name{
-    // label, input{.inlineblock();}
-    // label{width:38%;}
-    input{width:95%;}
+  #flag-lists-form{
+    .form-item-title{
+      // label, input{.inlineblock();}
+      // label{width:38%;}
+      input{width:95%;}
 
+    }
   }
   .actions{
     text-align: right;
   }
+
 }
 
 /**

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů