mirror of
https://github.com/e107inc/e107.git
synced 2025-07-28 02:10:46 +02:00
media-picker work. Issue #6 Removed '...' from LAN_SELECT and added manually where appropriate.
This commit is contained in:
@@ -679,7 +679,7 @@ class links_admin_form_ui extends e_admin_form_ui
|
|||||||
$cats = $this->getController()->getLinkArray($catid);
|
$cats = $this->getController()->getLinkArray($catid);
|
||||||
$ret = array();
|
$ret = array();
|
||||||
$this->_parent_select_array(0, $cats, $ret);
|
$this->_parent_select_array(0, $cats, $ret);
|
||||||
return $this->selectbox('link_parent', $ret, $value, array('size'=>'xlarge','default' => LAN_SELECT));
|
return $this->selectbox('link_parent', $ret, $value, array('size'=>'xlarge','default' => LAN_SELECT."..."));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'batch':
|
case 'batch':
|
||||||
|
@@ -3720,7 +3720,8 @@ class e_parse extends e_parser
|
|||||||
/**
|
/**
|
||||||
* New v2 Parser
|
* New v2 Parser
|
||||||
* Start Fresh and Build on it over time to become eventual replacement to e_parse.
|
* Start Fresh and Build on it over time to become eventual replacement to e_parse.
|
||||||
* Cameron's DOM-based parser.
|
* Cameron's DOM-based parser.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
class e_parser
|
class e_parser
|
||||||
{
|
{
|
||||||
@@ -4662,6 +4663,8 @@ class e_parser
|
|||||||
|
|
||||||
$type = pathinfo($file, PATHINFO_EXTENSION);
|
$type = pathinfo($file, PATHINFO_EXTENSION);
|
||||||
|
|
||||||
|
$id = str_replace(".".$type, "", $file);
|
||||||
|
|
||||||
$thumb = vartrue($parm['thumb']);
|
$thumb = vartrue($parm['thumb']);
|
||||||
$mode = varset($parm['mode'],false); // tag, url
|
$mode = varset($parm['mode'],false); // tag, url
|
||||||
|
|
||||||
@@ -4692,6 +4695,7 @@ class e_parser
|
|||||||
|
|
||||||
if($type === 'youtube')
|
if($type === 'youtube')
|
||||||
{
|
{
|
||||||
|
|
||||||
// $thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg";
|
// $thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg";
|
||||||
$thumbSrc = "https://i1.ytimg.com/vi/".$id."/mqdefault.jpg";
|
$thumbSrc = "https://i1.ytimg.com/vi/".$id."/mqdefault.jpg";
|
||||||
$video = '<iframe class="embed-responsive-item" width="560" height="315" src="//www.youtube.com/embed/'.$id.'?'.$ytqry.'" style="background-size: 100%;background-image: url('.$thumbSrc.');border:0px" allowfullscreen></iframe>';
|
$video = '<iframe class="embed-responsive-item" width="560" height="315" src="//www.youtube.com/embed/'.$id.'?'.$ytqry.'" style="background-size: 100%;background-image: url('.$thumbSrc.');border:0px" allowfullscreen></iframe>';
|
||||||
|
@@ -1323,7 +1323,7 @@ class e_media
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
$text = "\n\n<!-- Start Item -->
|
$text = "\n\n
|
||||||
|
|
||||||
<div class='media-carousel ".$data['gridClass']."'>
|
<div class='media-carousel ".$data['gridClass']."'>
|
||||||
|
|
||||||
@@ -1405,7 +1405,10 @@ class e_media
|
|||||||
|
|
||||||
$text .= "</div>
|
$text .= "</div>
|
||||||
|
|
||||||
</div>\n<!-- End Item -->\n\n";
|
</div>\n\n\n";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return $text;
|
return $text;
|
||||||
|
|
||||||
@@ -1545,7 +1548,7 @@ class e_media
|
|||||||
// $text .= $this->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online');
|
// $text .= $this->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online');
|
||||||
|
|
||||||
|
|
||||||
$text .= '<div id="'.$carouselID.'" class="carousel slide" data-interval="false">';
|
$text .= '<div id="'.$carouselID.'" class="carousel slide" data-interval="false" data-wrap="false">';
|
||||||
// $text .= '{INDICATORS}';
|
// $text .= '{INDICATORS}';
|
||||||
$text .= '<div style="margin-top:10px" class="row admingrid carousel-inner">';
|
$text .= '<div style="margin-top:10px" class="row admingrid carousel-inner">';
|
||||||
|
|
||||||
@@ -1555,6 +1558,7 @@ class e_media
|
|||||||
$perPage = vartrue($parm['perPage'],12);
|
$perPage = vartrue($parm['perPage'],12);
|
||||||
|
|
||||||
$c=0;
|
$c=0;
|
||||||
|
|
||||||
|
|
||||||
$slides = array();
|
$slides = array();
|
||||||
|
|
||||||
@@ -1567,11 +1571,18 @@ class e_media
|
|||||||
if($c == 0)
|
if($c == 0)
|
||||||
{
|
{
|
||||||
$active = (count($slides) <1) ? ' active' : '';
|
$active = (count($slides) <1) ? ' active' : '';
|
||||||
|
|
||||||
$text .= '
|
$text .= '
|
||||||
|
|
||||||
<!-- Start Slide -->
|
<!-- Start Slide -->
|
||||||
<div class="item'.$active.'">';
|
<div class="item'.$active.'">';
|
||||||
|
|
||||||
|
if(count($slides) > 1)
|
||||||
|
{
|
||||||
|
|
||||||
|
$text .= "<!-- ";
|
||||||
|
}
|
||||||
|
|
||||||
if(vartrue($val['slideCaption']))
|
if(vartrue($val['slideCaption']))
|
||||||
{
|
{
|
||||||
$text .= "<h4>".$val['slideCaption']."</h4>";
|
$text .= "<h4>".$val['slideCaption']."</h4>";
|
||||||
@@ -1586,10 +1597,12 @@ class e_media
|
|||||||
$val['bbcode'] = $parm['bbcode'];
|
$val['bbcode'] = $parm['bbcode'];
|
||||||
$val['gridClass'] = $parm['gridClass'];
|
$val['gridClass'] = $parm['gridClass'];
|
||||||
|
|
||||||
|
|
||||||
$text .= $this->browserCarouselItem($val);
|
$text .= $this->browserCarouselItem($val);
|
||||||
|
|
||||||
$c++;
|
$c++;
|
||||||
|
|
||||||
|
|
||||||
if(varset($val['slideCategory']) && isset($prevCat))
|
if(varset($val['slideCategory']) && isset($prevCat))
|
||||||
{
|
{
|
||||||
if($val['slideCategory'] !== $prevCat)
|
if($val['slideCategory'] !== $prevCat)
|
||||||
@@ -1603,14 +1616,25 @@ class e_media
|
|||||||
|
|
||||||
if($c == $perPage)
|
if($c == $perPage)
|
||||||
{
|
{
|
||||||
|
if(count($slides) > 1)
|
||||||
|
{
|
||||||
|
$text .= " -->";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$text .= '
|
$text .= '
|
||||||
</div>
|
</div>
|
||||||
<!-- End Slide -->
|
<!-- End Slide -->
|
||||||
|
|
||||||
';
|
';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$slides[] = 1;
|
$slides[] = 1;
|
||||||
$c = 0;
|
$c = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -323,7 +323,7 @@ define("LAN_ORDER","Order");
|
|||||||
define("LAN_ASC","ASC");
|
define("LAN_ASC","ASC");
|
||||||
define("LAN_DESC","DESC");
|
define("LAN_DESC","DESC");
|
||||||
|
|
||||||
define("LAN_SELECT","Select ...");
|
define("LAN_SELECT","Select");
|
||||||
define("LAN_ADMIN","Admin");
|
define("LAN_ADMIN","Admin");
|
||||||
define("LAN_ROOT","Root");
|
define("LAN_ROOT","Root");
|
||||||
define("LAN_LINE","Line");
|
define("LAN_LINE","Line");
|
||||||
|
@@ -29,7 +29,7 @@ if (ADMIN == TRUE)
|
|||||||
|
|
||||||
$amtext = "<div class='text-center' style='text-align:center'>
|
$amtext = "<div class='text-center' style='text-align:center'>
|
||||||
<select name='activate' onchange='urljump(this.options[selectedIndex].value)' class='tbox form-control'>
|
<select name='activate' onchange='urljump(this.options[selectedIndex].value)' class='tbox form-control'>
|
||||||
<option>".LAN_SELECT."</option>\n";
|
<option>".LAN_SELECT."...</option>\n";
|
||||||
foreach ($array_functions as $link_value)
|
foreach ($array_functions as $link_value)
|
||||||
{
|
{
|
||||||
$amtext .= render_admin_links($link_value['link'], $link_value['title'], $link_value['perms']);
|
$amtext .= render_admin_links($link_value['link'], $link_value['title'], $link_value['perms']);
|
||||||
|
@@ -528,7 +528,7 @@ class banner_form_ui extends e_admin_form_ui
|
|||||||
$text = '';
|
$text = '';
|
||||||
if (count($this->clients))
|
if (count($this->clients))
|
||||||
{
|
{
|
||||||
$text = $frm->select('banner_clientname_sel',$this->clients, $curVal,'', LAN_SELECT);
|
$text = $frm->select('banner_clientname_sel',$this->clients, $curVal,'', LAN_SELECT."...");
|
||||||
$text .= $frm->text('banner_clientname','','',array('placeholder'=> 'Or enter a new client'));
|
$text .= $frm->text('banner_clientname','','',array('placeholder'=> 'Or enter a new client'));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -611,7 +611,7 @@ class banner_form_ui extends e_admin_form_ui
|
|||||||
case 'write': // Edit Page
|
case 'write': // Edit Page
|
||||||
if (count($this->campaigns))
|
if (count($this->campaigns))
|
||||||
{
|
{
|
||||||
$text = $frm->select('banner_campaign_sel',$this->campaigns, $curVal,'',LAN_SELECT);
|
$text = $frm->select('banner_campaign_sel',$this->campaigns, $curVal,'',LAN_SELECT."...");
|
||||||
$text .= $frm->text('banner_campaign','','',array('size'=>'xlarge', 'class'=>'e-hideme','placeholder'=> 'Enter a campaign name'));
|
$text .= $frm->text('banner_campaign','','',array('size'=>'xlarge', 'class'=>'e-hideme','placeholder'=> 'Enter a campaign name'));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1030,7 +1030,7 @@ if ($action == "create")
|
|||||||
|
|
||||||
if (count($campaigns))
|
if (count($campaigns))
|
||||||
{
|
{
|
||||||
$text .= $frm->select('banner_campaign_sel',$campaigns,$_POST['banner_campaign'],'',LAN_SELECT);
|
$text .= $frm->select('banner_campaign_sel',$campaigns,$_POST['banner_campaign'],'',LAN_SELECT."...");
|
||||||
$text .= $frm->text('banner_campaign','','',array('placeholder'=> 'Or enter a new campaign'));
|
$text .= $frm->text('banner_campaign','','',array('placeholder'=> 'Or enter a new campaign'));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1048,7 +1048,7 @@ if ($action == "create")
|
|||||||
|
|
||||||
if (count($clients))
|
if (count($clients))
|
||||||
{
|
{
|
||||||
$text .= $frm->select('banner_client_sel',$clients, $_POST['client_name'],'', LAN_SELECT);
|
$text .= $frm->select('banner_client_sel',$clients, $_POST['client_name'],'', LAN_SELECT."...");
|
||||||
$text .= $frm->text('client_name','','',array('placeholder'=> 'Or enter a new client'));
|
$text .= $frm->text('client_name','','',array('placeholder'=> 'Or enter a new client'));
|
||||||
|
|
||||||
|
|
||||||
|
@@ -501,7 +501,7 @@ class import_main_ui extends e_admin_ui
|
|||||||
$text .= "
|
$text .= "
|
||||||
<tr>
|
<tr>
|
||||||
<td >$importType ".LAN_CONVERT_22."</td>
|
<td >$importType ".LAN_CONVERT_22."</td>
|
||||||
<td >".$frm->select('dbParamDatabase', $databases, null, array('required'=>1), LAN_SELECT)."</td>
|
<td >".$frm->select('dbParamDatabase', $databases, null, array('required'=>1), LAN_SELECT."...")."</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td >$importType ".LAN_CONVERT_23."</td>
|
<td >$importType ".LAN_CONVERT_23."</td>
|
||||||
|
@@ -787,8 +787,24 @@ $(document).ready(function()
|
|||||||
var currentIndex = $(this).find('.active').index();
|
var currentIndex = $(this).find('.active').index();
|
||||||
var text = (currentIndex + 1);
|
var text = (currentIndex + 1);
|
||||||
var id = $(this).attr('id') + '-index'; // admin-ui-carousel-index etc.
|
var id = $(this).attr('id') + '-index'; // admin-ui-carousel-index etc.
|
||||||
|
|
||||||
$('#'+id).text(text);
|
$('#'+id).text(text);
|
||||||
|
|
||||||
|
// this takes commented content for each carousel slide and enables it, one slide at a time as we scroll.
|
||||||
|
|
||||||
|
$(this).find('.item').each(function(index, node)
|
||||||
|
{
|
||||||
|
var content = $(this).contents();
|
||||||
|
|
||||||
|
var item = content[0];
|
||||||
|
|
||||||
|
if(item.nodeType === 8) // commented code @see e_media::browserCarousel() using '<!--'
|
||||||
|
{
|
||||||
|
$(item).replaceWith(item.nodeValue);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user