mirror of
https://github.com/e107inc/e107.git
synced 2025-04-16 10:32:08 +02:00
Media-Manager fixes and enhancements. Glyphs are now searchable.
This commit is contained in:
Cameron
parent
0df0f49cc0
commit
dc542c58d8
@ -46,12 +46,6 @@ if(isset($_POST['submit_cancel_show']))
|
||||
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
|
||||
|
||||
|
||||
if(vartrue($_GET['action']) == 'youtube' && e_AJAX_REQUEST) //XXX Doesn't work correctly inside the class for some reason
|
||||
{
|
||||
//echo "it works";
|
||||
//exit;
|
||||
|
||||
}
|
||||
|
||||
if(vartrue($_GET['action']) == 'nav' && e_AJAX_REQUEST) //XXX Doesn't work correctly inside the class for some reason
|
||||
{
|
||||
@ -196,7 +190,7 @@ class media_cat_ui extends e_admin_ui
|
||||
"download" => "download"
|
||||
);
|
||||
|
||||
// FIXME lan
|
||||
// FIXME LAN
|
||||
$this->fields['media_cat_type']['writeParms'] = array('image' => 'Image', 'file' => 'File', 'video' => 'Video');
|
||||
|
||||
if($this->getAction() == 'list')
|
||||
@ -253,7 +247,7 @@ class media_cat_ui extends e_admin_ui
|
||||
// XXX temporary disable when there is no owners, discuss
|
||||
if(!$new_data['media_cat_owner'])
|
||||
{
|
||||
e107::getMessage()->addError('No media owner found.'); // FIXME lan
|
||||
e107::getMessage()->addError('No media owner found.'); // FIXME LAN
|
||||
return false;
|
||||
}
|
||||
//$replace = array("_"," ","'",'"',"."); //FIXME Improve
|
||||
@ -837,21 +831,26 @@ class media_admin_ui extends e_admin_ui
|
||||
|
||||
$this->prefs['watermark_pos']['writeParms'] = $wm_pos;
|
||||
$this->prefs['watermark_pos']['readParms'] = $wm_pos;
|
||||
|
||||
//FIXME TODO - clear thumbnail cache when prefs are saved/updated.
|
||||
// e107::getCache()->clearAll('image');
|
||||
|
||||
e107::getCache()->clearAll('image');
|
||||
|
||||
// print_a($_GET);
|
||||
|
||||
if($this->getAction() == 'youtube')
|
||||
{
|
||||
$parm = array('search'=>$_GET['search']);
|
||||
echo $this->videotab($parm);
|
||||
echo $this->videoTab($parm);
|
||||
exit;
|
||||
}
|
||||
|
||||
if($this->getAction() == 'glyph')
|
||||
{
|
||||
$parm = array('search'=>$_GET['search']);
|
||||
echo $this->glyphTab($parm);
|
||||
exit;
|
||||
}
|
||||
|
||||
if($_GET['action'] == 'nav' )
|
||||
if($this->getAction() == 'nav' )
|
||||
{
|
||||
//echo $this->navPage();\
|
||||
// $this->getResponse()->setIframeMod(); // disable header/footer menus etc.
|
||||
@ -908,17 +907,7 @@ class media_admin_ui extends e_admin_ui
|
||||
|
||||
|
||||
}
|
||||
//
|
||||
// if($this->getQuery('for') && $this->getMediaCategory($this->getQuery('for')))
|
||||
// {
|
||||
//
|
||||
// $this->setPosted('media_category', $this->getQuery('for'));
|
||||
// if(!$this->getId())
|
||||
// {
|
||||
// $this->getModel()->set('media_category', $this->getQuery('for'));
|
||||
// }
|
||||
// }
|
||||
//
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -953,7 +942,8 @@ class media_admin_ui extends e_admin_ui
|
||||
$mes->addDebug("For:".$cat);
|
||||
$mes->addDebug("Bbcode: ".$this->getQuery('bbcode'));
|
||||
|
||||
|
||||
|
||||
|
||||
$this->processUploadUrl(true, $cat);
|
||||
|
||||
if($file)
|
||||
@ -991,13 +981,11 @@ class media_admin_ui extends e_admin_ui
|
||||
|
||||
|
||||
|
||||
function uploadPage()
|
||||
function uploadTab()
|
||||
{
|
||||
if(!ADMIN){ exit; } //TODO check for upload-access in perms.
|
||||
|
||||
|
||||
|
||||
|
||||
// if 'for' has no value, files are placed in /temp and not added to the db.
|
||||
$text = '<div id="uploader" rel="'.e_JS.'plupload/upload.php?for='.$this->getQuery('for').'">
|
||||
<p>No HTML5 support.</p>
|
||||
@ -1011,8 +999,9 @@ class media_admin_ui extends e_admin_ui
|
||||
$text .= "<input type='text' name='upload_url' size='255' style='width:70%' placeholder='eg. http://website.com/some-image.jpg' />";
|
||||
$text .= $frm->admin_button('upload_remote_url',1,'create','Start Upload');
|
||||
$text .= "</div>";
|
||||
$text .= "</div>\n\n";
|
||||
|
||||
$text .= "</div>";
|
||||
$text .= $frm->close();
|
||||
|
||||
return $text;
|
||||
}
|
||||
@ -1067,7 +1056,7 @@ class media_admin_ui extends e_admin_ui
|
||||
</ul>
|
||||
<div class='tab-content'>
|
||||
<div class='tab-pane active' id='core-media-select'>
|
||||
<legend>Library</legend>
|
||||
|
||||
<div class='table' style='display:block'>
|
||||
|
||||
";
|
||||
@ -1095,13 +1084,13 @@ class media_admin_ui extends e_admin_ui
|
||||
</div>
|
||||
|
||||
<div class='tab-pane' id='core-media-upload'>
|
||||
<legend>Upload</legend>";
|
||||
";
|
||||
|
||||
$this->fields['media_category']['readonly'] = TRUE;
|
||||
$this->fields['media_url']['noedit'] = TRUE;
|
||||
$this->fields['media_userclass']['noedit'] = TRUE;
|
||||
|
||||
$text .= $this->uploadPage(); // To test upload script with plupload
|
||||
$text .= $this->uploadTab(); // To test upload script with plupload
|
||||
// $text .= $this->CreatePage(); // comment me out to test plupload
|
||||
|
||||
$text .= "
|
||||
@ -1116,7 +1105,7 @@ class media_admin_ui extends e_admin_ui
|
||||
if($options['bbcode'])
|
||||
{
|
||||
$text .= "<div class='tab-pane' id='core-media-style'>
|
||||
<legend>Appearance</legend>
|
||||
|
||||
<div class='row'>
|
||||
<div class='span6'>
|
||||
<table class='table'>
|
||||
@ -1175,15 +1164,8 @@ class media_admin_ui extends e_admin_ui
|
||||
{
|
||||
//TODO
|
||||
$text .= "<div class='tab-pane clearfix' id='core-media-glyphs' style='font-size:24px'>";
|
||||
$glyphs = e107::getMedia()->getGlyphs();
|
||||
|
||||
foreach($glyphs as $val)
|
||||
{
|
||||
$text .= "<a data-toggle='context' class='e-media-select e-dialog-close e-tip' data-id='{$im['media_id']}' data-width='32' data-height='32' data-src='{$val}' data-type='glyph' data-bbcode='{$data_bb}' data-target='".$this->getQuery('tagid')."' data-path='{$val}.glyph' data-preview='{$val}.glyph' title='".$val."' style='float:left' href='#' >";
|
||||
$text .= "<span style='margin:7px;display:inline-block'><i class='".$val."' style='color:white' ></i></span>";
|
||||
$text .= "</a>\n\n";
|
||||
}
|
||||
|
||||
|
||||
$text .= $this->glyphTab();
|
||||
|
||||
$text .= "</div>
|
||||
";
|
||||
@ -1194,10 +1176,10 @@ class media_admin_ui extends e_admin_ui
|
||||
if($this->getQuery('video'))
|
||||
{
|
||||
$text .= "<div class='tab-pane clearfix' id='core-media-video' >";
|
||||
$text .= "<div style='padding:20px'>";
|
||||
// $text .= "<div class='row-fluid'>";
|
||||
$text .= $this->videoTab();
|
||||
$text .= "</div>";
|
||||
$text .= "</div>";
|
||||
// $text .= "</div>";
|
||||
}
|
||||
|
||||
|
||||
@ -1222,29 +1204,104 @@ class media_admin_ui extends e_admin_ui
|
||||
<span>Cancel</span>
|
||||
</button>
|
||||
</div>";
|
||||
|
||||
// TODO to eventually be hidden.
|
||||
|
||||
|
||||
$type = (E107_DEBUG_LEVEL > 0) ? "text" : "hidden";
|
||||
$br = (E107_DEBUG_LEVEL > 0) ? "<br />" : "";
|
||||
|
||||
$text .= "
|
||||
".$br."<input title='bbcode' type='{$type}' readonly='readonly' class='span11' id='bbcode_holder' name='bbcode_holder' value='' />
|
||||
".$br."<input title='html' type='{$type}' class='span11' readonly='readonly' id='html_holder' name='html_holder' value='' />
|
||||
".$br."<input title='src' type='{$type}' class='span11' readonly='readonly' id='src' name='src' value='' />
|
||||
".$br."<input title='path' type='{$type}' class='span11' readonly='readonly' id='path' name='path' value='' />
|
||||
".$br."<input title='(preview) src' type='{$type}' class='span11' readonly='readonly' id='src' name='src' value='' />
|
||||
".$br."<input title='path (saved to db)' type='{$type}' class='span11' readonly='readonly' id='path' name='path' value='' />
|
||||
";
|
||||
|
||||
}
|
||||
|
||||
return $text;
|
||||
}
|
||||
|
||||
|
||||
function glyphTab($parm='')
|
||||
{
|
||||
|
||||
$parms = array(
|
||||
'width' => 32,
|
||||
'height' => 32,
|
||||
'type' =>'glyph',
|
||||
'tagid' => $this->getQuery('tagid'),
|
||||
'action' =>'glyph', // Used by AJAX to identify correct function.
|
||||
'perPage' => 90,
|
||||
'gridClass' => 'media-carousel-item-glyph pull-left',
|
||||
|
||||
|
||||
);
|
||||
|
||||
//TODO FIXME Upgrade to bs3 when Bootstrap3 Admin is ready.
|
||||
$bs2 = e107::getMedia()->getGlyphs('bs2','icon-');
|
||||
|
||||
foreach($bs2 as $val)
|
||||
{
|
||||
$items[] = array(
|
||||
'previewUrl' => $val,
|
||||
'saveValue' => $val.'.glyph',
|
||||
'thumbUrl' => $val,
|
||||
'title' => $val,
|
||||
'slideCaption' => 'Bootstrap',
|
||||
'slideCategory' => 'bootstrap'
|
||||
);
|
||||
|
||||
|
||||
|
||||
$text .= "<a data-toggle='context' class='e-media-select e-dialog-close e-tip' data-id='{$im['media_id']}' data-width='32' data-height='32' data-src='{$val}' data-type='glyph' data-bbcode='{$data_bb}' data-target='".$this->getQuery('tagid')."' data-path='{$val}.glyph' data-preview='{$val}.glyph' title='".$val."' style='float:left' href='#' >";
|
||||
$text .= "<span style='margin:7px;display:inline-block'><i class='".$val."' style='color:white' ></i></span>";
|
||||
$text .= "</a>\n\n";
|
||||
}
|
||||
|
||||
$fa4 = e107::getMedia()->getGlyphs('fa4');
|
||||
e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css");
|
||||
|
||||
foreach($fa4 as $val)
|
||||
{
|
||||
$items[] = array(
|
||||
'previewUrl' => $val,
|
||||
'saveValue' => $val.'.glyph',
|
||||
'thumbUrl' => $val,
|
||||
'title' => $val,
|
||||
'slideCaption' => 'Font-Awesome 4',
|
||||
'slideCategory' => 'font-awesome'
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
if(vartrue($parm['search']))
|
||||
{
|
||||
$filtered = array();
|
||||
foreach($items as $v)
|
||||
{
|
||||
if(strpos($v['title'], $parm['search'])!==false)
|
||||
{
|
||||
$v['slideCaption'] = '';
|
||||
$filtered[] = $v;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
$items = $filtered;
|
||||
}
|
||||
|
||||
return e107::getMedia()->browserCarousel($items, $parms);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function videoTab($parm='')
|
||||
{
|
||||
|
||||
// $feed = "https://gdata.youtube.com/feeds/base/users/e107inc/uploads";
|
||||
|
||||
|
||||
// @see https://developers.google.com/youtube/2.0/developers_guide_protocol_api_query_parameters
|
||||
|
||||
if($search = vartrue($this->getQuery('search')))
|
||||
{
|
||||
$feed = "http://gdata.youtube.com/feeds/api/videos?orderby=relevance&vq=".urlencode($search)."&max-results=50"; // maximum is 50.
|
||||
@ -1742,7 +1799,7 @@ class media_admin_ui extends e_admin_ui
|
||||
$mes->add("No media Found! Please upload some files.", E_MESSAGE_INFO);
|
||||
}
|
||||
|
||||
$text = $this->uploadPage();
|
||||
$text = $this->uploadTab();
|
||||
echo $mes->render().$text;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1936,7 +1936,7 @@ class e_parse extends e_parser
|
||||
|
||||
$baseurl = ($full ? SITEURL : e_HTTP).'thumb.php?';
|
||||
|
||||
$thurl = 'src='.$url.'&';
|
||||
$thurl = 'src='.urlencode($url).'&';
|
||||
|
||||
if(vartrue($options['aw']) || vartrue($options['ah']) || $this->thumbCrop == 1)
|
||||
{
|
||||
@ -2671,25 +2671,14 @@ class e_parser
|
||||
}
|
||||
|
||||
// Bootstrap 3 Glyph names.
|
||||
$bs3 = array(
|
||||
'adjust','align-center','align-justify','align-left','align-right','arrow-down','arrow-left','arrow-right','arrow-up','asterisk','backward','ban-circle','barcode','bell','bold','book
|
||||
','bookmark','briefcase','bullhorn','calendar','camera','certificate','check','chevron-down','chevron-left','chevron-right','chevron-up','circle-arrow-down','circle-arrow-left','circle-arrow-right
|
||||
','circle-arrow-up','cloud','cloud-download','cloud-upload','cog','collapse-down','collapse-up','comment','compressed','copyright-mark','credit-card','cutlery','dashboard','download','download-alt
|
||||
','earphone','edit','eject','envelope','euro','exclamation-sign','expand','export','eye-close','eye-open','facetime-video','fast-backward','fast-forward','file','film','filter','fire','flag
|
||||
','flash','floppy-disk','floppy-open','floppy-remove','floppy-save','floppy-saved','folder-close','folder-open','font','forward','fullscreen','gbp','gift
|
||||
','glass','globe','hand-down','hand-left','hand-right','hand-up','hd-video','hdd','header','headphones','heart','heart-empty','home','import','inbox','indent-left','indent-right','info-sign','italic','leaf','link','list
|
||||
','list-alt','lock','log-in','log-out','magnet','map-marker','minus','minus-sign','move','music','new-window','off','ok','ok-circle','ok-sign','open','paperclip','pause','pencil','phone','phone-alt','picture
|
||||
','plane','play','play-circle','plus','plus-sign','print','pushpin','qrcode','question-sign','random','record','refresh','registration-mark','remove','remove-circle','remove-sign','repeat','resize-full','resize-horizontal
|
||||
','resize-small','resize-vertical','retweet','road','save','saved','screenshot','sd-video','search','send','share','share-alt','shopping-cart','signal','sort','sort-by-alphabet','sort-by-alphabet-alt
|
||||
','sort-by-attributes','sort-by-attributes-alt','sort-by-order','sort-by-order-alt','sound-5-1','sound-6-1','sound-7-1','sound-dolby','sound-stereo','star','stats','step-backward','step-forward','stop
|
||||
','subtitles','tag','tags','tasks','text-height','text-width','th','th-large','th-list','thumbs-down','thumbs-up','time','tint','tower','transfer','trash','tree-conifer','tree-deciduous','unchecked','upload
|
||||
','usd','user','volume-down','volume-off','volume-up','warning-sign','wrench','zoom-in','zoom-out'
|
||||
);
|
||||
$bs3 = e107::getMedia()->getGlyphs('bs3','');
|
||||
|
||||
|
||||
if(substr($text,-6) == '.glyph' || strpos($text,".")==false) // Bootstrap or Font-Awesome.
|
||||
{
|
||||
list($cls,$tmp) = explode('.glyph',$text);
|
||||
list($type, $tmp2) = explode("-",$text,2);
|
||||
|
||||
$id = str_replace("icon-","",$cls);
|
||||
|
||||
if(deftrue('FONTAWESOME') == 4 && !in_array($id ,$bs3)) // Convert FontAwesome 3 to 4.
|
||||
@ -2701,6 +2690,12 @@ class e_parser
|
||||
$cls = str_replace('icon-', 'glyphicon glyphicon-', $cls);
|
||||
}
|
||||
|
||||
if($type == 'fa')
|
||||
{
|
||||
$cls = str_replace('fa-', 'fa fa-', $cls);
|
||||
}
|
||||
|
||||
|
||||
$text = (deftrue('BOOTSTRAP') === 3) ? "<span class='".$cls."'></span>" : "<i class='".$cls."'></i>"; // retain space.
|
||||
$text .= ($space !== false) ? $space : "";
|
||||
|
||||
@ -2768,7 +2763,7 @@ class e_parser
|
||||
|
||||
if($type == 'youtube')
|
||||
{
|
||||
$video = '<iframe width="560" height="315" src="//www.youtube.com/embed/'.$id.'" frameborder="0" allowfullscreen></iframe>';
|
||||
$video = '<iframe width="560" height="315" src="//www.youtube.com/embed/'.$id.'" style="border:0px" allowfullscreen></iframe>';
|
||||
$thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg";
|
||||
|
||||
if($thumb == 'tag')
|
||||
|
||||
@ -596,16 +596,17 @@ class e_media
|
||||
$data_src = $this->mediaSelectNav($category,$tagid, $option); // ."&from=0";
|
||||
|
||||
// Inline style to override jquery-ui stuff.
|
||||
$text .= "<div class='input-append' style='margin-top:10px;font-size:12px'>
|
||||
<input type='text' style='padding-left:24px;margin-right:-20px' id='media-search' title='Enter some text to filter results' name='search' value='' class='e-tip' data-target='media-select-container' data-src='".$data_src."' />
|
||||
<i class='icon-search searchquery' style='top:4px;left:-212px'></i>";
|
||||
$text .= "<div class='btn-group'>
|
||||
<div class='input-append' style='margin-top:10px;font-size:12px'>
|
||||
<input type='text' id='media-search' placeholder='Search...' name='search' value='' class='e-tip' data-target='media-select-container' data-src='".$data_src."' />
|
||||
";
|
||||
// $text .= "<input type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&from=0' /> "; // Manual filter, if onkeyup ajax fails for some reason.
|
||||
$text .= "<button type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$data_src."' >Go</button>"; // Manual filter, if onkeyup ajax fails for some reason.
|
||||
$text .= "<button type='button' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$data_src."' >Go</button>"; // Manual filter, if onkeyup ajax fails for some reason.
|
||||
|
||||
$text .= " <button type='button' title='previous page' class='btn e-nav e-media-nav e-tip' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$data_src."' >«</button>"; // see next page of images.
|
||||
$text .= "<button type='button' title='previous page' class='btn e-nav e-media-nav e-tip' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$data_src."' >«</button>"; // see next page of images.
|
||||
|
||||
$text .= "<button type='button' title='next page' class='btn e-nav e-media-nav e-tip' style='text-align:center' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='up' data-nav-inc='".$limit."' data-src='".$data_src."' >»</button>"; // see next page of images.
|
||||
$text .= "</div>";
|
||||
$text .= "</div></div>";
|
||||
|
||||
$text .= "
|
||||
<div id='media-select-container'>";
|
||||
@ -768,21 +769,94 @@ class e_media
|
||||
* Get all Glyphs
|
||||
* @todo Cache
|
||||
*/
|
||||
function getGlyphs()
|
||||
function getGlyphs($type='fa4',$prefix = '')
|
||||
{
|
||||
$icons = array();
|
||||
|
||||
$pattern = '/\.(icon-(?:\w+(?:-)?)+):before\s+{\s*content:\s*"(.+)";\s+}/';
|
||||
$subject = file_get_contents(e_WEB_JS.'font-awesome/css/font-awesome.css');
|
||||
if($type == 'bs2')
|
||||
{
|
||||
$matches = array(
|
||||
'glass','music','search','envelope','heart','star','star-empty','user','film','th-large','th','th-list','ok',
|
||||
'remove','zoom-in','zoom-out','off','signal','cog','trash','home','file','time','road','download-alt','download',
|
||||
'upload','inbox','play-circle','repeat','refresh','list-alt','lock','flag','headphones','volume-off','volume-down',
|
||||
'volume-up','qrcode','barcode','tag','tags','book','bookmark','print','camera','font','bold','italic','text-height',
|
||||
'text-width','align-left','align-center','align-right','align-justify','list','indent-left','indent-right',
|
||||
'facetime-video','picture','pencil','map-marker','adjust','tint','edit','share','check','move','step-backward',
|
||||
'fast-backward','backward','play','pause','stop','forward','fast-forward','step-forward','eject','chevron-left',
|
||||
'chevron-right','plus-sign','minus-sign','remove-sign','ok-sign','question-sign','info-sign','screenshot',
|
||||
'remove-circle','ok-circle','ban-circle','arrow-left','arrow-right','arrow-up','arrow-down','share-alt',
|
||||
'resize-full','resize-small','plus','minus','asterisk','exclamation-sign','gift','leaf','fire','eye-open',
|
||||
'eye-close','warning-sign','plane','calendar','random','comment','magnet','chevron-up','chevron-down',
|
||||
'retweet','shopping-cart','folder-close','folder-open','resize-vertical','resize-horizontal','hdd',
|
||||
'bullhorn','bell','certificate','thumbs-up','thumbs-down','hand-right','hand-left','hand-up','hand-down',
|
||||
'circle-arrow-right','circle-arrow-left','circle-arrow-up','circle-arrow-down','globe','wrench','tasks',
|
||||
'filter','briefcase','fullscreen'
|
||||
);
|
||||
|
||||
foreach($matches as $match)
|
||||
{
|
||||
$icons[] = $prefix.$match;
|
||||
}
|
||||
|
||||
return $icons;
|
||||
}
|
||||
|
||||
if($type == 'bs3')
|
||||
{
|
||||
$matches = array(
|
||||
'adjust','align-center','align-justify','align-left','align-right','arrow-down','arrow-left','arrow-right','arrow-up','asterisk','backward','ban-circle','barcode','bell','bold','book
|
||||
','bookmark','briefcase','bullhorn','calendar','camera','certificate','check','chevron-down','chevron-left','chevron-right','chevron-up','circle-arrow-down','circle-arrow-left','circle-arrow-right
|
||||
','circle-arrow-up','cloud','cloud-download','cloud-upload','cog','collapse-down','collapse-up','comment','compressed','copyright-mark','credit-card','cutlery','dashboard','download','download-alt
|
||||
','earphone','edit','eject','envelope','euro','exclamation-sign','expand','export','eye-close','eye-open','facetime-video','fast-backward','fast-forward','file','film','filter','fire','flag
|
||||
','flash','floppy-disk','floppy-open','floppy-remove','floppy-save','floppy-saved','folder-close','folder-open','font','forward','fullscreen','gbp','gift
|
||||
','glass','globe','hand-down','hand-left','hand-right','hand-up','hd-video','hdd','header','headphones','heart','heart-empty','home','import','inbox','indent-left','indent-right','info-sign','italic','leaf','link','list
|
||||
','list-alt','lock','log-in','log-out','magnet','map-marker','minus','minus-sign','move','music','new-window','off','ok','ok-circle','ok-sign','open','paperclip','pause','pencil','phone','phone-alt','picture
|
||||
','plane','play','play-circle','plus','plus-sign','print','pushpin','qrcode','question-sign','random','record','refresh','registration-mark','remove','remove-circle','remove-sign','repeat','resize-full','resize-horizontal
|
||||
','resize-small','resize-vertical','retweet','road','save','saved','screenshot','sd-video','search','send','share','share-alt','shopping-cart','signal','sort','sort-by-alphabet','sort-by-alphabet-alt
|
||||
','sort-by-attributes','sort-by-attributes-alt','sort-by-order','sort-by-order-alt','sound-5-1','sound-6-1','sound-7-1','sound-dolby','sound-stereo','star','stats','step-backward','step-forward','stop
|
||||
','subtitles','tag','tags','tasks','text-height','text-width','th','th-large','th-list','thumbs-down','thumbs-up','time','tint','tower','transfer','trash','tree-conifer','tree-deciduous','unchecked','upload
|
||||
','usd','user','volume-down','volume-off','volume-up','warning-sign','wrench','zoom-in','zoom-out'
|
||||
);
|
||||
|
||||
foreach($matches as $match)
|
||||
{
|
||||
$icons[] = $prefix.$match;
|
||||
}
|
||||
|
||||
return $icons;
|
||||
}
|
||||
|
||||
$cache = e107::getCache();
|
||||
$cache->setMD5('_');
|
||||
|
||||
if($data = $cache->retrieve($type,360,true))
|
||||
{
|
||||
return e107::unserialize($data);
|
||||
}
|
||||
|
||||
|
||||
if($type == 'fa4')
|
||||
{
|
||||
$pattern = '/\.(fa-(?:\w+(?:-)?)+):before\s+{\s*content:\s*"(.+)";\s+}/';
|
||||
$subject = e107::getFile()->getRemoteContent('http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css');
|
||||
}
|
||||
elseif($type == 'fa3')
|
||||
{
|
||||
$pattern = '/\.(icon-(?:\w+(?:-)?)+):before\s+{\s*content:\s*"(.+)";\s+}/';
|
||||
$subject = file_get_contents(e_WEB_JS.'font-awesome/css/font-awesome.css');
|
||||
}
|
||||
|
||||
preg_match_all($pattern, $subject, $matches, PREG_SET_ORDER);
|
||||
|
||||
$icons = array();
|
||||
|
||||
|
||||
foreach($matches as $match)
|
||||
{
|
||||
$icons[] = $match[1];
|
||||
}
|
||||
|
||||
|
||||
$data = e107::serialize($icons);
|
||||
$cache->set($type,$data,true);
|
||||
return $icons;
|
||||
|
||||
}
|
||||
@ -936,47 +1010,63 @@ class e_media
|
||||
{
|
||||
$tp = e107::getParser();
|
||||
|
||||
$defaultThumb = $tp->thumbUrl('','w=400&h=240');
|
||||
$defaultThumb = $tp->thumbUrl('','w=400&h=240');
|
||||
|
||||
$default = array(
|
||||
'width' => 200,
|
||||
'height' => 113,
|
||||
'id' => '',
|
||||
'type' => 'image',
|
||||
'tagid' => '',
|
||||
'saveValue' => '',
|
||||
'previewUrl' => $defaultThumb ,
|
||||
'thumbUrl' => $defaultThumb,
|
||||
'title' => ''
|
||||
|
||||
);
|
||||
$default = array(
|
||||
'width' => 200,
|
||||
'height' => 113,
|
||||
'id' => '',
|
||||
'type' => 'image',
|
||||
'tagid' => '',
|
||||
'saveValue' => '',
|
||||
'previewUrl' => $defaultThumb ,
|
||||
'thumbUrl' => $defaultThumb,
|
||||
'title' => '',
|
||||
'gridClass' => 'span2'
|
||||
|
||||
$data = array();
|
||||
|
||||
foreach($default as $k=>$v)
|
||||
{
|
||||
$data[$k] = isset($row[$k]) ? $row[$k] : $default[$k];
|
||||
}
|
||||
);
|
||||
|
||||
$data = array();
|
||||
|
||||
foreach($default as $k=>$v)
|
||||
{
|
||||
$data[$k] = isset($row[$k]) ? $row[$k] : $default[$k];
|
||||
}
|
||||
|
||||
|
||||
$close = (E107_DEBUG_LEVEL > 0) ? "" : "e-dialog-close";
|
||||
$close = (E107_DEBUG_LEVEL > 0) ? "" : "e-dialog-close";
|
||||
|
||||
|
||||
$text .= "<div class='browserItem span2'>";
|
||||
$text .= '<div class="well clearfix">';
|
||||
$text .= "<a data-toggle='context' class='e-media-select ".$close." e-tip' data-id='".$data['id']."' data-width='".$data['width']."' data-height='".$data['height']."' data-src='".$data['previewUrl']."' data-type='".$data['type']."' data-bbcode='{$bbcode}' data-target='".$data['tagid']."' data-path='".$data['saveValue']."' data-preview='".$data['previewUrl']."' title=\"".$data['title']."\" style='float:left' href='#' >";
|
||||
// $text .= "<span style='margin:7px;display:inline-block'></span>";
|
||||
$text .= '<img class="img-responsive" alt="" src="'.$data['thumbUrl'].'" style="width:100%;display:inline-block" />';
|
||||
$text .= "</a>\n\n";
|
||||
$text .= "<div><small style='padding-top:8px;white-space:nowrap;display:inline-block;width:100%;overflow:hidden'>".$data['title']."</small></div>";
|
||||
$text .= "</div>";
|
||||
$text .= "</div>";
|
||||
$text .= "\n\n<!-- Start Item -->\n<div class='media-carousel ".$data['gridClass']."'>
|
||||
|
||||
<div class='well clearfix'>
|
||||
|
||||
<a data-toggle='context' class='e-media-select ".$close." e-tip' data-id='".$data['id']."' data-width='".$data['width']."' data-height='".$data['height']."' data-src='".$data['previewUrl']."' data-type='".$data['type']."' data-bbcode='{$bbcode}' data-target='".$data['tagid']."' data-path='".$data['saveValue']."' data-preview='".$data['previewUrl']."' title=\"".$data['title']."\" style='float:left' href='#' >";
|
||||
|
||||
if($data['type'] == 'image')
|
||||
{
|
||||
$text .= '<img class="img-responsive" alt="" src="'.$data['thumbUrl'].'" style="width:100%;display:inline-block" />';
|
||||
}
|
||||
elseif($data['type'] == 'glyph')
|
||||
{
|
||||
$text .= "\n<span style='margin:7px;display:inline-block; color:white'>".$tp->toGlyph($data['thumbUrl'],false)."</span>";
|
||||
}
|
||||
$text .= "\n</a>\n\n";
|
||||
|
||||
if($data['type'] == 'image')
|
||||
{
|
||||
$text .= "\n<div><small class='media-carousel-item-caption'>".$data['title']."</small></div>";
|
||||
}
|
||||
|
||||
$text .= "</div>
|
||||
|
||||
</div>\n<!-- End Item -->\n\n";
|
||||
|
||||
return $text;
|
||||
|
||||
}
|
||||
|
||||
function browserIndicators($slides=array())
|
||||
function browserIndicators($slides=array(),$uniqueID)
|
||||
{
|
||||
|
||||
if(count($slides)<1)
|
||||
@ -985,12 +1075,12 @@ class e_media
|
||||
}
|
||||
|
||||
$indicators = '<ol class="carousel-indicators span2" style="top:-40px">
|
||||
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>';
|
||||
<li data-target="#'.$uniqueID.'" data-slide-to="0" class="active"></li>';
|
||||
|
||||
foreach($slides as $key=>$v)
|
||||
{
|
||||
$id = $key + 1;
|
||||
$indicators .= '<li data-target="#myCarousel" data-slide-to="'.$id.'"></li>';
|
||||
$indicators .= '<li data-target="#'.$uniqueID.'" data-slide-to="'.$id.'"></li>';
|
||||
}
|
||||
|
||||
$indicators .= '</ol>';
|
||||
@ -1005,48 +1095,50 @@ class e_media
|
||||
/* Fix for Bootstrap2 margin-left issue when wrapping */
|
||||
e107::css('inline','
|
||||
|
||||
.browserItem { margin-bottom:15px }
|
||||
.media-carousel { margin-bottom:15px }
|
||||
|
||||
.row-fluid .browserItem.span6:nth-child(2n + 3) { margin-left : 0px; }
|
||||
.row-fluid .browserItem.span4:nth-child(3n + 4) { margin-left : 0px; }
|
||||
.row-fluid .browserItem.span3:nth-child(4n + 5) { margin-left : 0px; }
|
||||
.row-fluid .browserItem.span2:nth-child(6n + 7) { margin-left : 0px; }
|
||||
.row-fluid .media-carousel.span6:nth-child(2n + 3) { margin-left : 0px; }
|
||||
.row-fluid .media-carousel.span4:nth-child(3n + 4) { margin-left : 0px; }
|
||||
.row-fluid .media-carousel.span3:nth-child(4n + 5) { margin-left : 0px; }
|
||||
.row-fluid .media-carousel.span2:nth-child(6n + 7) { margin-left : 0px; }
|
||||
');
|
||||
|
||||
$frm = varset($option['from']) ? $option['from'] : 0;
|
||||
$limit = varset($option['limit']) ? $option['limit'] : 20;
|
||||
$bbcode = varset($option['bbcode']) ? $option['bbcode'] : null;
|
||||
$navMode = varset($option['nav']) ? TRUE : FALSE;
|
||||
$search = varset($option['search']) ? $option['search'] : null;
|
||||
|
||||
|
||||
$frm = e107::getForm();
|
||||
|
||||
// $text .= print_a($_GET,true);
|
||||
|
||||
$data_src = $this->mediaSelectNav($category,$parm['tagid'], $parm);
|
||||
$carouselID = 'myCarousel-'.$parm['action'];
|
||||
|
||||
//$text = "<form class='form-search' action='".e_SELF."?".e_QUERY."' id='core-plugin-list-form' method='get'>";
|
||||
|
||||
if(!e_AJAX_REQUEST)
|
||||
{
|
||||
$text = '<div class="btn-group"><span class="input-append">';
|
||||
$text .= "<input type='text'class='e-ajax-keyup e-tip' placeholder= 'Search...' title='Enter some text to filter results' name='search' value='' data-target='media-browser-container' data-src='".$data_src."' />";
|
||||
$text .= "<input type='text' class='e-ajax-keyup e-tip' placeholder= 'Search...' title='Enter some text to filter results' name='search' value='' data-target='media-browser-container-".$parm['action']."' data-src='".$data_src."' />";
|
||||
// $text .= '<button class="btn btn-primary" name="'.$submitName.'" type="submit">'.LAN_GO.'</button>';
|
||||
$text .= '<a class="btn btn-primary" href="#myCarousel" data-slide="prev">‹</a><a class="btn btn-primary" href="#myCarousel" data-slide="next">›</a>';
|
||||
$text .= '<a class="btn btn-primary" href="#'.$carouselID.'" data-slide="prev">‹</a><a class="btn btn-primary" href="#'.$carouselID.'" data-slide="next">›</a>';
|
||||
$text .= "</span>";
|
||||
$text .= "</div>";
|
||||
$text .= "<div id='media-browser-container' class='form-inline clearfix row-fluid'>";
|
||||
$text .= "<div id='media-browser-container-".$parm['action']."' class='form-inline clearfix row-fluid'>";
|
||||
}
|
||||
|
||||
if(count($data) < 1)
|
||||
{
|
||||
return "<div class='alert alert-info alert-block text-center'>No Results Found.</div>";
|
||||
}
|
||||
|
||||
|
||||
|
||||
// $text .= $this->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online');
|
||||
|
||||
|
||||
$text .= '<div id="myCarousel" class="carousel slide" data-interval="false">';
|
||||
$text .= '{INDICATORS}';
|
||||
$text .= '<div id="shop" style="margin-top:10px;min-height:585px" class="carousel-inner">';
|
||||
$text .= '<div id="'.$carouselID.'" class="carousel slide" data-interval="false">';
|
||||
$text .= '{INDICATORS}';
|
||||
$text .= '<div style="margin-top:10px" class="carousel-inner">';
|
||||
|
||||
|
||||
$text .= "<div class='item active row-fluid'>";
|
||||
// $text .= "<div class='item active'>";
|
||||
|
||||
$perPage = vartrue($parm['perPage'],12);
|
||||
|
||||
@ -1054,38 +1146,71 @@ class e_media
|
||||
|
||||
$slides = array();
|
||||
|
||||
|
||||
foreach($data as $key=>$val)
|
||||
{
|
||||
if($c == 0)
|
||||
{
|
||||
$active = (count($slides) <1) ? ' active' : '';
|
||||
$text .= '
|
||||
|
||||
<!-- Start Slide -->
|
||||
<div class="item'.$active.'">';
|
||||
|
||||
if(vartrue($val['slideCaption']))
|
||||
{
|
||||
$text .= "<h4>".$val['slideCaption']."</h4>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$val['width'] = $parm['width'];
|
||||
$val['height'] = $parm['height'];
|
||||
$val['id'] = $parm['id'];
|
||||
$val['tagid'] = $parm['tagid'];
|
||||
$val['type'] = $parm['type'];
|
||||
|
||||
$val['gridClass'] = $parm['gridClass'];
|
||||
|
||||
$text .= $this->browserCarouselItem($val);
|
||||
|
||||
$c++;
|
||||
|
||||
if($c == $perPage)
|
||||
|
||||
if(varset($val['slideCategory']) && isset($prevCat))
|
||||
{
|
||||
if($val['slideCategory'] !== $prevCat)
|
||||
{
|
||||
$text .= '</div><div class="item">';
|
||||
$slides[] = 1;
|
||||
$c = 0;
|
||||
$c = $perPage;
|
||||
}
|
||||
|
||||
$prevCat = $val['slideCategory'];
|
||||
|
||||
}
|
||||
|
||||
if($c == $perPage)
|
||||
{
|
||||
$text .= '
|
||||
</div>
|
||||
<!-- End Slide -->
|
||||
|
||||
';
|
||||
$slides[] = 1;
|
||||
$c = 0;
|
||||
}
|
||||
}
|
||||
|
||||
$text .= "</div><div class='clearfix'> </div>\n\n";
|
||||
|
||||
|
||||
|
||||
$text .= ($c != 0) ? "</div>\n<!-- End Slide -->\n" : "";
|
||||
|
||||
$text .= "\n<!-- End Carousel -->\n<div class='clearfix'> </div>\n\n";
|
||||
|
||||
$text .= "</div>";
|
||||
|
||||
if(!e_AJAX_REQUEST)
|
||||
{
|
||||
$text .= "</div>";
|
||||
$text .= "</div></div>";
|
||||
}
|
||||
|
||||
$ret = str_replace('{INDICATORS}', $this->browserIndicators($slides), $text);
|
||||
$ret = str_replace('{INDICATORS}', $this->browserIndicators($slides,$carouselID), $text);
|
||||
|
||||
return $ret;
|
||||
|
||||
|
||||
@ -928,6 +928,13 @@ li.rssRow > div {
|
||||
width:142px;
|
||||
|
||||
}
|
||||
|
||||
.media-carousel-item-caption {
|
||||
padding-top:8px; white-space:nowrap; display:inline-block; width:100%; overflow:hidden;
|
||||
}
|
||||
|
||||
.media-carousel-item-glyph { width: 64px; height:64px; overflow:hidden; margin-right:5px; margin-bottom:0px }
|
||||
|
||||
/*
|
||||
|
||||
body { background-color: rgb(68, 68, 68); }
|
||||
|
||||
@ -317,13 +317,13 @@ $(document).ready(function()
|
||||
|
||||
delay(function(){
|
||||
|
||||
if((search.length) >= 3) {
|
||||
// if((search.length) >= 3) {
|
||||
$('#'+id).load(src,function() {
|
||||
// alert(src);
|
||||
|
||||
$('#'+id).fadeIn('fast'); // .slideLeft();
|
||||
});
|
||||
}
|
||||
// }
|
||||
|
||||
}, 300 );
|
||||
|
||||
@ -370,12 +370,12 @@ $(document).ready(function()
|
||||
src = src + '&search='+search;
|
||||
}
|
||||
|
||||
|
||||
$(id).fadeOut('fast');
|
||||
|
||||
//TODO Animate.
|
||||
$(id).load(src,function() {
|
||||
// alert(src);
|
||||
// $(this).hide();
|
||||
$(id).fadeIn('fast');
|
||||
// $(this).show('slow'); // .slideLeft();
|
||||
});
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user