bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'theme-refactoring' into homeV2

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-05-15 09:42:23 +02:00
parent 3a53525bf9 a1fd56580b
commit 79bd95aeec
436 changed files with 94582 additions and 10499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sites/all/modules/gui/materiobasemod/js/materio_flag.js
View File

@@ -58,7 +58,7 @@ MaterioFlag = function(){
case 'bookmarks':
var name = type;
$('h2 .listname', block).attr('name', name).bind('click', onClickShowPreview);
$('<i class="icon-remove"></i>').appendTo($('h2', block)).attr('name', name).bind('click', onClickClosePreview);
$('<i class="fi-x"></i>').appendTo($('h2', block)).attr('name', name).bind('click', onClickClosePreview);
// $('<span class="preview"><i class="icon-eye-open"></i></span>').appendTo($('h2', block)).bind('click', onClickShowPreview);
// if(!readCookie('materiobookmarkspreviewopened')){
// showPreview('bookmarks', block);
@@ -75,7 +75,7 @@ MaterioFlag = function(){
var name = $this.attr('class').match(/flag_lists_[^_]+_[0-9]+/);
// trace('MaterioFlag :: name', name);
$('<span class="preview"><i class="icon-eye-open"></i></span>').attr('name', name).insertAfter($this).bind('click', onClickShowPreview);
$('<span class="preview"><i class="fi-eye"></i></span>').attr('name', name).insertAfter($this).bind('click', onClickShowPreview);
});
$('a.edit-list:not(.ajax-processed)', '#block-materio-flag-materio-flag-mylists-nav')
@@ -91,7 +91,7 @@ MaterioFlag = function(){
// preview block
$('section.flag-list:not(.ajax-processed)', '#block-materio-flag-materio-flag-mylists').each(function(index){
var name = $(this).attr('class').match(/flag_lists_[^_]+_[0-9]+/);
$('<i class="icon-remove"></i>').appendTo($('h2.listname', this)).attr('name', name).bind('click', onClickClosePreview);
$('<i class="fi-x"></i>').appendTo($('h2.listname', this)).attr('name', name).bind('click', onClickClosePreview);
$('a.open-list', this).bind('click', onClickOpenLink);

742
sites/all/modules/gui/materiobasemod/js/materio_flag.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
sites/all/modules/gui/materiobasemod/materio_flag.module
View File

@@ -160,7 +160,7 @@ function materio_flag_block_view($delta = '') {
}
// TODO: put this title generation on a theme function
$subject = '<span class="listname">'.t('My bookmarks (@len) ', array("@len"=>count($userbookmarks))).'</span>';
$block['subject'] = $subject . l('<i class="icon-resize-full"></i>', 'bookmarks', array('html'=>true, 'attributes' => array('class' => array('open-list')),)); //
$block['subject'] = $subject . l('<i class="fi-arrows-expand"></i>', 'bookmarks', array('html'=>true, 'attributes' => array('class' => array('open-list')),)); //
$block['content'] = theme('materio_flag_mybookmarks_block', array("bookmarks"=>$userbookmarks, "viewmode"=>"bookmark"));
}else{
$block['subject'] = t('My bookmarks');
@@ -354,7 +354,7 @@ function materio_flag_get_entity_links($entity, $type, $view_mode = null){
#create new list
$link = l(
'<i class="icon-plus"></i>&nbsp;<span>' . t('New @name', array('@name' => t(variable_get('flag_lists_name', 'list')))) . '</span>',
'<i class="fi-plus"></i>&nbsp;<span>' . t('New @name', array('@name' => t(variable_get('flag_lists_name', 'list')))) . '</span>',
'flag-lists/add/' . $entity->type,
array(
'attributes' => array(
@@ -400,7 +400,7 @@ function _materio_flag_get_listpagetitle($flag){
if(flag_lists_is_owner('edit', $flag->fid)){
$cont .= l('<i class="icon-wrench"></i>',
$cont .= l('<i class="fi-wrench"></i>',
'flags/lists/edit/'.$flag->fid,
array(
'html'=>true,

2
sites/all/modules/gui/materiobasemod/templates/materio-flag-mylists-block.tpl.php
View File

@@ -8,7 +8,7 @@
</span>
<a class="open-list" href="<?php print $list['list']->path; ?>">
<?php //print t('open this @name', array('@name'=>variable_get('flag_lists_name', 'list'))) ;?>
<i class="icon-resize-full"></i>
<i class="fi-arrows-expand"></i>
</a>
</h2>
<?php $content = $list['content']; ?>

4
sites/all/modules/gui/materiobasemod/templates/materio-flag-mylists-nav-block.tpl.php
View File

@@ -7,7 +7,7 @@
<?php print l($flag->title . '<span class="count">('.count($flag->flaged_content).')</span>', 'lists/'.$flag->fid, array('html'=>true,'attributes'=>array('class'=>array('open-list', $flag->name)))); ?>
<?php if(flag_lists_is_owner('edit', $flag->fid)): ?>
<?php
print l('<i class="icon-wrench"></i>',
print l('<i class="fi-wrench"></i>',
'flags/lists/edit/'.$flag->fid,
array(
'html'=>true,
@@ -22,7 +22,7 @@
<?php
#create new list
$create_link = l(
'<i class="icon-plus"></i>&nbsp;<span>' . t('New @name', array('@name' => t(variable_get('flag_lists_name', 'list')))) . '</span>',
'<i class="fi-plus"></i>&nbsp;<span>' . t('New @name', array('@name' => t(variable_get('flag_lists_name', 'list')))) . '</span>',
'flag-lists/add/materiau',
array(
'attributes' => array(