mirror of
https://github.com/e107inc/e107.git
synced 2025-08-06 14:46:56 +02:00
Javascript work, HTML cleanup, iconpicker through media-manager.
This commit is contained in:
@@ -82,13 +82,13 @@ $text = "
|
|||||||
<tr>
|
<tr>
|
||||||
<td class='label'>".METLAN_9."</td>
|
<td class='label'>".METLAN_9."</td>
|
||||||
<td class='control'>
|
<td class='control'>
|
||||||
<textarea class='tbox textarea' title='meta_description' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm($meta_diz[e_LANGUAGE])."</textarea>
|
<textarea class='tbox textarea e-autoheight' title='meta_description' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm($meta_diz[e_LANGUAGE])."</textarea>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class='label'>".METLAN_10."</td>
|
<td class='label'>".METLAN_10."</td>
|
||||||
<td class='control'>
|
<td class='control'>
|
||||||
<textarea class='tbox textarea' title='meta_keywords' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm($meta_keywords[e_LANGUAGE])."</textarea>
|
<textarea class='tbox textarea e-autoheight' title='meta_keywords' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm($meta_keywords[e_LANGUAGE])."</textarea>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
@@ -109,7 +109,7 @@ $text = "
|
|||||||
<tr>
|
<tr>
|
||||||
<td class='label'>".METLAN_2."</td>
|
<td class='label'>".METLAN_2."</td>
|
||||||
<td class='control'>
|
<td class='control'>
|
||||||
<textarea class='tbox textarea' title=\"eg. <meta name='author' content='your name' />\" id='meta' name='meta' cols='70'
|
<textarea class='tbox textarea e-autoheight' title=\"eg. <meta name='author' content='your name' />\" id='meta' name='meta' cols='70'
|
||||||
rows='10' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".str_replace("<","<",$tp->toForm($meta[e_LANGUAGE]))."</textarea>
|
rows='10' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".str_replace("<","<",$tp->toForm($meta[e_LANGUAGE]))."</textarea>
|
||||||
<div class='smalltext field-help'>eg. <meta name='author' content='your name' /> </div>
|
<div class='smalltext field-help'>eg. <meta name='author' content='your name' /> </div>
|
||||||
</td>
|
</td>
|
||||||
@@ -143,6 +143,7 @@ require_once("footer.php");
|
|||||||
*/
|
*/
|
||||||
function headerjs()
|
function headerjs()
|
||||||
{
|
{
|
||||||
|
|
||||||
$ret = "
|
$ret = "
|
||||||
<script type='text/javascript'>
|
<script type='text/javascript'>
|
||||||
var e107Admin = {}
|
var e107Admin = {}
|
||||||
|
@@ -1172,7 +1172,7 @@ $text .= "
|
|||||||
$text .= "
|
$text .= "
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform' style='margin-top: 20px'>
|
<table class='adminform' style='margin-top: 20px'>
|
||||||
<colgroup>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
|
@@ -2241,6 +2241,11 @@ class e_admin_controller_ui extends e_admin_controller
|
|||||||
/**
|
/**
|
||||||
* @var e_admin_model
|
* @var e_admin_model
|
||||||
*/
|
*/
|
||||||
|
protected $formQuery = false; // custom form post query
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var e_admin_model
|
||||||
|
*/
|
||||||
protected $_model = null;
|
protected $_model = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -2386,6 +2391,11 @@ class e_admin_controller_ui extends e_admin_controller
|
|||||||
return $this->perPage;
|
return $this->perPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getFormQuery()
|
||||||
|
{
|
||||||
|
return $this->formQuery;
|
||||||
|
}
|
||||||
|
|
||||||
public function getPrimaryName()
|
public function getPrimaryName()
|
||||||
{
|
{
|
||||||
return $this->getModel()->getFieldIdName();
|
return $this->getModel()->getFieldIdName();
|
||||||
@@ -4245,6 +4255,7 @@ class e_admin_form_ui extends e_form
|
|||||||
'id' => $this->getElementId(), // unique string used for building element ids, REQUIRED
|
'id' => $this->getElementId(), // unique string used for building element ids, REQUIRED
|
||||||
'pid' => $controller->getPrimaryName(), // primary field name, REQUIRED
|
'pid' => $controller->getPrimaryName(), // primary field name, REQUIRED
|
||||||
//'url' => e_SELF, default
|
//'url' => e_SELF, default
|
||||||
|
'query' => $controller->getFormQuery(), // work around - see form in newspost.php (submitted news)
|
||||||
//'query' => $request->buildQueryString(array(), true, 'ajax_used'), - ajax_used is now removed from QUERY_STRING - class2
|
//'query' => $request->buildQueryString(array(), true, 'ajax_used'), - ajax_used is now removed from QUERY_STRING - class2
|
||||||
'head_query' => $request->buildQueryString('field=[FIELD]&asc=[ASC]&from=[FROM]', false), // without field, asc and from vars, REQUIRED
|
'head_query' => $request->buildQueryString('field=[FIELD]&asc=[ASC]&from=[FROM]', false), // without field, asc and from vars, REQUIRED
|
||||||
'np_query' => $request->buildQueryString(array(), false, 'from'), // without from var, REQUIRED for next/prev functionality
|
'np_query' => $request->buildQueryString(array(), false, 'from'), // without from var, REQUIRED for next/prev functionality
|
||||||
|
@@ -362,8 +362,8 @@ class db_verify
|
|||||||
<fieldset id='core-db-verify-{$selection}'>
|
<fieldset id='core-db-verify-{$selection}'>
|
||||||
<legend id='core-db-verify-{$selection}-legend'>".DBVLAN_16."</legend>
|
<legend id='core-db-verify-{$selection}-legend'>".DBVLAN_16."</legend>
|
||||||
|
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='4'>
|
<colgroup>
|
||||||
<col style='width: 25%'></col>
|
<col style='width: 25%'></col>
|
||||||
<col style='width: 25%'></col>
|
<col style='width: 25%'></col>
|
||||||
<col style='width: 10%'></col>
|
<col style='width: 10%'></col>
|
||||||
@@ -858,8 +858,8 @@ class db_verify
|
|||||||
<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."' id='core-db-verify-sql-tables-form'>
|
<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."' id='core-db-verify-sql-tables-form'>
|
||||||
<fieldset id='core-db-verify-sql-tables'>
|
<fieldset id='core-db-verify-sql-tables'>
|
||||||
<legend>".DBVLAN_14."</legend>
|
<legend>".DBVLAN_14."</legend>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='1'>
|
<colgroup>
|
||||||
<col style='width: 100%'></col>
|
<col style='width: 100%'></col>
|
||||||
</colgroup>
|
</colgroup>
|
||||||
<thead>
|
<thead>
|
||||||
@@ -923,8 +923,8 @@ function check_tables($what)
|
|||||||
{ // $k is the DB table name (less prefix)
|
{ // $k is the DB table name (less prefix)
|
||||||
$ttcount = 0;
|
$ttcount = 0;
|
||||||
$ttext = "
|
$ttext = "
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='4'>
|
<colgroup >
|
||||||
<col style='width: 25%'></col>
|
<col style='width: 25%'></col>
|
||||||
<col style='width: 25%'></col>
|
<col style='width: 25%'></col>
|
||||||
<col style='width: 10%'></col>
|
<col style='width: 10%'></col>
|
||||||
@@ -1333,8 +1333,8 @@ $text = "
|
|||||||
<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."' id='core-db-verify-sql-tables-form'>
|
<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."' id='core-db-verify-sql-tables-form'>
|
||||||
<fieldset id='core-db-verify-sql-tables'>
|
<fieldset id='core-db-verify-sql-tables'>
|
||||||
<legend>".DBVLAN_14."</legend>
|
<legend>".DBVLAN_14."</legend>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='1'>
|
<colgroup>
|
||||||
<col style='width: 100%'></col>
|
<col style='width: 100%'></col>
|
||||||
</colgroup>
|
</colgroup>
|
||||||
<thead>
|
<thead>
|
||||||
|
@@ -124,7 +124,7 @@ class e_form
|
|||||||
// TODO - Hide the <input type='text'> element, and display the icon itself after it has been chosen.
|
// TODO - Hide the <input type='text'> element, and display the icon itself after it has been chosen.
|
||||||
// eg. <img id='iconview' src='".$img."' style='border:0; ".$blank_display."' alt='' />
|
// eg. <img id='iconview' src='".$img."' style='border:0; ".$blank_display."' alt='' />
|
||||||
// The button itself could be replaced with an icon just for this purpose.
|
// The button itself could be replaced with an icon just for this purpose.
|
||||||
|
return $this->imagepicker($name, $default, $label, 'media=_icon');
|
||||||
|
|
||||||
$e107 = e107::getInstance();
|
$e107 = e107::getInstance();
|
||||||
$id = $this->name2id($name);
|
$id = $this->name2id($name);
|
||||||
@@ -226,20 +226,36 @@ class e_form
|
|||||||
$default = $tp->createConstants($default, 'mix');
|
$default = $tp->createConstants($default, 'mix');
|
||||||
}
|
}
|
||||||
$default_url = $tp->replaceConstants($default, 'abs');
|
$default_url = $tp->replaceConstants($default, 'abs');
|
||||||
|
$blank = FALSE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$default = $default_url = e_IMAGE_ABS."generic/blank.gif";
|
$default = $default_url = e_IMAGE_ABS."generic/blank.gif";
|
||||||
|
$blank = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
//$width = intval(vartrue($sc_parameters['width'], 150));
|
//$width = intval(vartrue($sc_parameters['width'], 150));
|
||||||
|
$cat = $tp->toDB($sc_parameters['media']);
|
||||||
|
|
||||||
|
if($cat == '_icon')
|
||||||
|
{
|
||||||
|
$ret = "<div class='imgselector-container' style='display:block;width:64px;min-height:64px'>";
|
||||||
|
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $default_thumb;
|
||||||
|
$style = ($blank) ? "border:1px dashed black;width:64px;height:64px" : "border:1px dashed black";
|
||||||
|
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='{$style}' />";
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$ret = "<div class='imgselector-container' style='display:block;width:120px;min-height:100px'>";
|
$ret = "<div class='imgselector-container' style='display:block;width:120px;min-height:100px'>";
|
||||||
$att = 'aw=120&ah=100';
|
$att = 'aw=120&ah=100';
|
||||||
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $tp->thumbUrl($default_thumb, $att, true);
|
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $tp->thumbUrl($default_thumb, $att, true);
|
||||||
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='width:120px;height:100px;border:1px dashed black;' />";
|
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='width:120px;height:100px;border:1px dashed black;' />";
|
||||||
|
|
||||||
$cat = $tp->toDB($sc_parameters['media']);
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$ret .= $this->mediaUrl($cat, $label,$name_id);
|
$ret .= $this->mediaUrl($cat, $label,$name_id);
|
||||||
$ret .= "</div>\n";
|
$ret .= "</div>\n";
|
||||||
$ret .= "<input type='hidden' name='{$name}' id='{$name_id}' value='{$default}' />"; // to be hidden eventually.
|
$ret .= "<input type='hidden' name='{$name}' id='{$name_id}' value='{$default}' />"; // to be hidden eventually.
|
||||||
@@ -1992,7 +2008,6 @@ class e_form
|
|||||||
$current_fields = varset($options['fieldpref']) ? $options['fieldpref'] : array_keys($options['fields']);
|
$current_fields = varset($options['fieldpref']) ? $options['fieldpref'] : array_keys($options['fields']);
|
||||||
$legend_class = vartrue($options['legend_class'], 'e-hideme');
|
$legend_class = vartrue($options['legend_class'], 'e-hideme');
|
||||||
|
|
||||||
|
|
||||||
$text .= "
|
$text .= "
|
||||||
<form method='post' action='{$formurl}' id='{$elid}-list-form'>
|
<form method='post' action='{$formurl}' id='{$elid}-list-form'>
|
||||||
<div>".$this->token()."
|
<div>".$this->token()."
|
||||||
@@ -2000,7 +2015,7 @@ class e_form
|
|||||||
<fieldset id='{$elid}-list'>
|
<fieldset id='{$elid}-list'>
|
||||||
<legend class='{$legend_class}'>".$options['legend']."</legend>
|
<legend class='{$legend_class}'>".$options['legend']."</legend>
|
||||||
".vartrue($options['table_pre'])."
|
".vartrue($options['table_pre'])."
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist' id='{$elid}-list-table'>
|
<table class='adminlist' id='{$elid}-list-table'>
|
||||||
".$this->colGroup($fields, $current_fields)."
|
".$this->colGroup($fields, $current_fields)."
|
||||||
".$this->thead($fields, $current_fields, varset($options['head_query']), varset($options['query']))."
|
".$this->thead($fields, $current_fields, varset($options['head_query']), varset($options['query']))."
|
||||||
<tbody id='e-sort'>
|
<tbody id='e-sort'>
|
||||||
@@ -2155,8 +2170,8 @@ class e_form
|
|||||||
<fieldset id='{$id}'>
|
<fieldset id='{$id}'>
|
||||||
<legend>".vartrue($fdata['legend'])."</legend>
|
<legend>".vartrue($fdata['legend'])."</legend>
|
||||||
".vartrue($fdata['table_pre'])."
|
".vartrue($fdata['table_pre'])."
|
||||||
<table cellpadding='0' cellspacing='0' class='adminedit'>
|
<table class='adminedit'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -2373,7 +2388,7 @@ class e_form
|
|||||||
if(vartrue($fdata['table_rows']) || vartrue($fdata['table_body']))
|
if(vartrue($fdata['table_rows']) || vartrue($fdata['table_body']))
|
||||||
{
|
{
|
||||||
$text .= "
|
$text .= "
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
{$colgroup}
|
{$colgroup}
|
||||||
<thead>
|
<thead>
|
||||||
".vartrue($fdata['table_head'])."
|
".vartrue($fdata['table_head'])."
|
||||||
|
@@ -791,8 +791,8 @@ class mailoutAdminClass extends e107MailManager
|
|||||||
$text .= "<div>
|
$text .= "<div>
|
||||||
<form method='post' action='".e_SELF."?mode=makemail' id='mailout_form'>
|
<form method='post' action='".e_SELF."?mode=makemail' id='mailout_form'>
|
||||||
".$this->emailSelector('all', varset($mailSource['mail_selectors'], FALSE))."
|
".$this->emailSelector('all', varset($mailSource['mail_selectors'], FALSE))."
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -1022,8 +1022,8 @@ class mailoutAdminClass extends e107MailManager
|
|||||||
$text .= "
|
$text .= "
|
||||||
<form action='".e_SELF.'?mode=maildeleteconfirm&m='.$mailID.'&savepage='.$nextPage."' id='email_delete' method='post'>
|
<form action='".e_SELF.'?mode=maildeleteconfirm&m='.$mailID.'&savepage='.$nextPage."' id='email_delete' method='post'>
|
||||||
<fieldset id='email-delete'>
|
<fieldset id='email-delete'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -1093,7 +1093,7 @@ class mailoutAdminClass extends e107MailManager
|
|||||||
$text .= "
|
$text .= "
|
||||||
<form action='".e_SELF.'?'.e_QUERY."' id='email_list' method='post'>
|
<form action='".e_SELF.'?'.e_QUERY."' id='email_list' method='post'>
|
||||||
<fieldset id='emails-list'>
|
<fieldset id='emails-list'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>";
|
<table class='adminlist'>";
|
||||||
|
|
||||||
$fieldPrefs = $this->calcFieldSpec($type, TRUE); // Get columns to display
|
$fieldPrefs = $this->calcFieldSpec($type, TRUE); // Get columns to display
|
||||||
|
|
||||||
@@ -1241,8 +1241,8 @@ class mailoutAdminClass extends e107MailManager
|
|||||||
$text .= "
|
$text .= "
|
||||||
<form action='".e_SELF.'?mode=marksend&m='.$mailMainID."' id='email_send' method='post'>
|
<form action='".e_SELF.'?mode=marksend&m='.$mailMainID."' id='email_send' method='post'>
|
||||||
<fieldset id='email-send'>
|
<fieldset id='email-send'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -1304,8 +1304,8 @@ class mailoutAdminClass extends e107MailManager
|
|||||||
$text = "
|
$text = "
|
||||||
<legend>".LAN_MAILOUT_242."</legend>
|
<legend>".LAN_MAILOUT_242."</legend>
|
||||||
<fieldset id='email-send-options'>
|
<fieldset id='email-send-options'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -1383,8 +1383,8 @@ class mailoutAdminClass extends e107MailManager
|
|||||||
$text .= "
|
$text .= "
|
||||||
<form action='".e_SELF.'?'.e_QUERY."' id='email_recip_header' method='post'>
|
<form action='".e_SELF.'?'.e_QUERY."' id='email_recip_header' method='post'>
|
||||||
<fieldset id='email-recip_header'>
|
<fieldset id='email-recip_header'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -1415,7 +1415,7 @@ class mailoutAdminClass extends e107MailManager
|
|||||||
$text .= "
|
$text .= "
|
||||||
<form action='".e_SELF."?mode=recipients&m={$mailID}&count={$count}&frm={$this->showFrom}&fld={$this->sortField}&asc={$this->sortOrder}&savepage={$nextPage}' id='email_recip_body' method='post'>
|
<form action='".e_SELF."?mode=recipients&m={$mailID}&count={$count}&frm={$this->showFrom}&fld={$this->sortField}&asc={$this->sortOrder}&savepage={$nextPage}' id='email_recip_body' method='post'>
|
||||||
<fieldset id='email-recip_body'>
|
<fieldset id='email-recip_body'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>";
|
<table class='adminlist'>";
|
||||||
|
|
||||||
|
|
||||||
$fieldPrefs = $this->calcFieldSpec('recipients', TRUE); // Get columns to display
|
$fieldPrefs = $this->calcFieldSpec('recipients', TRUE); // Get columns to display
|
||||||
|
@@ -292,6 +292,45 @@ class e_media
|
|||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return an array of Images in a particular category
|
||||||
|
* @param string $type : 16 | 32 | 48 | 64
|
||||||
|
* @param integer $from
|
||||||
|
* @param integer $amount
|
||||||
|
*/
|
||||||
|
public function getIcons($type='', $from=0, $amount=null)
|
||||||
|
{
|
||||||
|
$inc = array();
|
||||||
|
|
||||||
|
if($type)
|
||||||
|
{
|
||||||
|
$inc[] = "media_category = '_icon_".$type."' ";
|
||||||
|
}
|
||||||
|
|
||||||
|
$ret = array();
|
||||||
|
$query = "SELECT * FROM #core_media WHERE media_userclass IN (".USERCLASS_LIST.") AND media_category LIKE '_icon%' ";
|
||||||
|
$query .= (count($inc)) ? " AND ( ".implode(" OR ",$inc)." )" : "";
|
||||||
|
$query .= " ORDER BY media_category, media_name";
|
||||||
|
|
||||||
|
if($amount)
|
||||||
|
{
|
||||||
|
$query .= " LIMIT ".$from." ,".$amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
e107::getDb()->db_Select_gen($query);
|
||||||
|
while($row = e107::getDb()->db_Fetch(mySQL_ASSOC))
|
||||||
|
{
|
||||||
|
$id = $row['media_id'];
|
||||||
|
$ret[$id] = $row;
|
||||||
|
}
|
||||||
|
return $ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate Simple Thumbnail window for image-selection
|
* Generate Simple Thumbnail window for image-selection
|
||||||
* TODO Use Whole-page popup window
|
* TODO Use Whole-page popup window
|
||||||
@@ -336,39 +375,52 @@ class e_media
|
|||||||
{
|
{
|
||||||
$bbcode = null; // option to override onclick behavior. See ibrowser.php
|
$bbcode = null; // option to override onclick behavior. See ibrowser.php
|
||||||
|
|
||||||
|
if($cat !='_icon')
|
||||||
|
{
|
||||||
$cat = ($cat) ? $cat."+" : ""; // the '+' loads category '_common' as well as the chosen category.
|
$cat = ($cat) ? $cat."+" : ""; // the '+' loads category '_common' as well as the chosen category.
|
||||||
|
$images = $this->getImages($cat,0,23);
|
||||||
|
$class = "media-select-image";
|
||||||
|
$w = 120;
|
||||||
|
$h = 100;
|
||||||
|
}
|
||||||
|
else // Icons
|
||||||
|
{
|
||||||
|
$cat = "";
|
||||||
|
$images = $this->getIcons($cat,0,200);
|
||||||
|
$class = "media-select-icon";
|
||||||
|
$w = 64;
|
||||||
|
$h = 64;
|
||||||
|
}
|
||||||
|
|
||||||
parse_str($att); // grab 'onclick' .
|
parse_str($att); // grab 'onclick' .
|
||||||
|
|
||||||
// $total_images = $this->getImages($cat); // for use by next/prev in filter at some point.
|
// $total_images = $this->getImages($cat); // for use by next/prev in filter at some point.
|
||||||
$images = $this->getImages($cat,0,23);
|
|
||||||
$att = 'aw=120&ah=100';
|
$att = 'aw=120&ah=100';
|
||||||
$prevId = $tagid."_prev";
|
$prevId = $tagid."_prev";
|
||||||
|
|
||||||
// EXAMPLE of FILTER GUI.
|
// EXAMPLE of FILTER GUI.
|
||||||
|
// $text .= "CAT=".$cat;
|
||||||
|
|
||||||
$text .= "<div>Filter: <input type='text' name='non-working-filter-example' value='' />";
|
$text .= "<div>Filter: <input type='text' name='non-working-filter-example' value='' />";
|
||||||
$text .= "<input type='button' value='Go' /> "; // Manual filter, if onkeyup ajax fails for some reason.
|
$text .= "<input type='button' value='Go' /> "; // Manual filter, if onkeyup ajax fails for some reason.
|
||||||
$text .= "<input type='button' value='«' />"; // see previous page of images.
|
$text .= "<input type='button' value='«' />"; // see previous page of images.
|
||||||
$text .= "<input type='button' value='»' />"; // see next page of images.
|
$text .= "<input type='button' value='»' />"; // see next page of images.
|
||||||
$text .= " Displaying 0-24 of 150 images.<br /> </div>
|
$text .= " Displaying 0-24 of 150 images.<br /> </div>
|
||||||
<div>\n";
|
<div class='media-select-container'>\n";
|
||||||
|
|
||||||
|
|
||||||
if($bbcode == null) // e107 Media Manager - new-image mode.
|
if($bbcode == null) // e107 Media Manager - new-image mode.
|
||||||
{
|
{
|
||||||
$onclick_clear = "parent.document.getElementById('{$tagid}').value = '';
|
$onclick_clear = "parent.document.getElementById('{$tagid}').value = '';
|
||||||
parent.document.getElementById('".$prevId."').src = '".e_IMAGE_ABS."generic/blank.gif';
|
parent.document.getElementById('".$prevId."').src = '".e_IMAGE_ABS."generic/blank.gif';
|
||||||
parent.e107Widgets.DialogManagerDefault.getWindow('e-dialog').close();
|
|
||||||
return false;";
|
return false;";
|
||||||
|
|
||||||
$text .= "<a class='media-select-clear' style='float:left' href='#' onclick=\"{$onclick_clear}\" >
|
$text .= "<a class='{$class} media-select-none e-dialog-close' style='vertical-align:middle;display:block;float:left;' href='#' onclick=\"{$onclick_clear}\" >
|
||||||
<div style='display:block;border:1px solid silver;padding-top:40px;text-align:center;vertical-align:middle;width:120px;height:58px'>
|
<div style='text-align:center;position: relative; top: 30%'>No image</div>
|
||||||
No Image</div>";
|
</a>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$srch = array("{MEDIA_URL}","{MEDIA_PATH}");
|
$srch = array("{MEDIA_URL}","{MEDIA_PATH}");
|
||||||
|
|
||||||
foreach($images as $im)
|
foreach($images as $im)
|
||||||
@@ -393,16 +445,15 @@ class e_media
|
|||||||
return false;";
|
return false;";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$img_url = ($cat !='_icon') ? e107::getParser()->thumbUrl($im['media_url'], $att) : $media_path;
|
||||||
|
|
||||||
$text .= "<a class='media-select e-dialog-close' title=\"".$diz."\" href='#' onclick=\"{$onclicki}\" >\n";
|
$text .= "<a class='{$class} e-dialog-close' title=\"".$diz."\" style='float:left' href='#' onclick=\"{$onclicki}\" >";
|
||||||
$text .= "<img src='".e107::getParser()->thumbUrl($im['media_url'], $att)."' alt=\"".$im['media_title']."\" />\n";
|
$text .= "<img src='".$img_url."' alt=\"".$im['media_title']."\" />";
|
||||||
$text .= "</a>\n\n";
|
$text .= "</a>\n\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$text .= "<div style='clear:both'><!-- --></div>";
|
||||||
|
|
||||||
|
|
||||||
$text .= "</div>";
|
$text .= "</div>";
|
||||||
|
|
||||||
return $text;
|
return $text;
|
||||||
|
@@ -470,7 +470,7 @@ class e_menuManager {
|
|||||||
<form method='post' action='".e_SELF."?lay=".$this->curLayout."'>
|
<form method='post' action='".e_SELF."?lay=".$this->curLayout."'>
|
||||||
<fieldset id='core-menus-parametersform'>
|
<fieldset id='core-menus-parametersform'>
|
||||||
<legend>Menu parameters ".$row['menu_name']."</legend>
|
<legend>Menu parameters ".$row['menu_name']."</legend>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
Parameters (query string format):
|
Parameters (query string format):
|
||||||
@@ -511,7 +511,7 @@ class e_menuManager {
|
|||||||
<form method='post' action='".e_SELF."?lay=".$this->curLayout."'>
|
<form method='post' action='".e_SELF."?lay=".$this->curLayout."'>
|
||||||
<fieldset id='core-menus-visibilityform'>
|
<fieldset id='core-menus-visibilityform'>
|
||||||
<legend>". MENLAN_7." ".$row['menu_name']."</legend>
|
<legend>". MENLAN_7." ".$row['menu_name']."</legend>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<input type='hidden' name='menuAct[{$row['menu_id']}]' value='sv.{$row['menu_id']}' />
|
<input type='hidden' name='menuAct[{$row['menu_id']}]' value='sv.{$row['menu_id']}' />
|
||||||
|
@@ -477,8 +477,8 @@ class themeHandler
|
|||||||
|
|
||||||
$text = "
|
$text = "
|
||||||
<div style='text-align:center'>
|
<div style='text-align:center'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -522,7 +522,7 @@ class themeHandler
|
|||||||
|
|
||||||
|
|
||||||
$text = "<div style='font-weight:bold;margin-bottom:10px'>".TPVLAN_7."</div>
|
$text = "<div style='font-weight:bold;margin-bottom:10px'>".TPVLAN_7."</div>
|
||||||
<table class='adminlist' cellpadding='0' cellspacing='0'>";
|
<table class='adminlist'>";
|
||||||
$text .= $author ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_4."</b>:</td><td style='vertical-align:top'>".$author."</td></tr>" : "";
|
$text .= $author ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_4."</b>:</td><td style='vertical-align:top'>".$author."</td></tr>" : "";
|
||||||
$text .= $website ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_5."</b>:</td><td style='vertical-align:top'>".$website."</td></tr>" : "";
|
$text .= $website ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_5."</b>:</td><td style='vertical-align:top'>".$website."</td></tr>" : "";
|
||||||
$text .= $theme['date'] ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_6."</b>:</td><td style='vertical-align:top'>".$theme['date']."</td></tr>" : "";
|
$text .= $theme['date'] ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_6."</b>:</td><td style='vertical-align:top'>".$theme['date']."</td></tr>" : "";
|
||||||
@@ -715,7 +715,7 @@ class themeHandler
|
|||||||
|
|
||||||
$text .= "
|
$text .= "
|
||||||
<div id='core-thememanager-configure'>
|
<div id='core-thememanager-configure'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<colgroup>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
@@ -777,8 +777,8 @@ class themeHandler
|
|||||||
$itext = "<tr>
|
$itext = "<tr>
|
||||||
<td style='vertical-align:top; width:24%'><b>".TPVLAN_50."</b>:</td>
|
<td style='vertical-align:top; width:24%'><b>".TPVLAN_50."</b>:</td>
|
||||||
<td colspan='2' style='vertical-align:top'>
|
<td colspan='2' style='vertical-align:top'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-tm-layout-default' style='width:10%' />
|
<col class='col-tm-layout-default' style='width:10%' />
|
||||||
<col class='col-tm-layout-name' style='width:20%' />
|
<col class='col-tm-layout-name' style='width:20%' />
|
||||||
<col class='col-tm-layout-visibility' style='width:35%' />
|
<col class='col-tm-layout-visibility' style='width:35%' />
|
||||||
|
@@ -454,7 +454,7 @@ if($action == 'cat')
|
|||||||
$calendarmenu_text .= "
|
$calendarmenu_text .= "
|
||||||
<form id='calformupdate' method='post' action='".e_SELF."?cat'>
|
<form id='calformupdate' method='post' action='".e_SELF."?cat'>
|
||||||
<fieldset id='plugin-ecal-categories'>
|
<fieldset id='plugin-ecal-categories'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<colgroup span='2'>
|
<colgroup span='2'>
|
||||||
<col style = 'width:20%;' class='col-label' />
|
<col style = 'width:20%;' class='col-label' />
|
||||||
<col style = 'width:80%;' class='col-control' />
|
<col style = 'width:80%;' class='col-control' />
|
||||||
|
@@ -387,8 +387,8 @@ function showStartPage()
|
|||||||
<form method='post' action='".e_SELF."' id='core-import-form'>
|
<form method='post' action='".e_SELF."' id='core-import-form'>
|
||||||
<fieldset id='core-import-select-type'>
|
<fieldset id='core-import-select-type'>
|
||||||
<legend class='e-hideme'>".'DBLAN_10'."</legend>
|
<legend class='e-hideme'>".'DBLAN_10'."</legend>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table class='adminlist'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col />
|
<col />
|
||||||
<col />
|
<col />
|
||||||
<col />
|
<col />
|
||||||
@@ -463,8 +463,8 @@ function showImportOptions($mode='csv')
|
|||||||
|
|
||||||
$text = "
|
$text = "
|
||||||
<form method='post' action='".e_SELF."'>
|
<form method='post' action='".e_SELF."'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>";
|
</colgroup>";
|
||||||
|
@@ -146,7 +146,7 @@ class tinymce
|
|||||||
$text = "<form method='post' action='".e_SELF."?mode=create'>
|
$text = "<form method='post' action='".e_SELF."?mode=create'>
|
||||||
<fieldset id='core-release-list'>
|
<fieldset id='core-release-list'>
|
||||||
<legend class='e-hideme'>".$this->pluginTitle."</legend>
|
<legend class='e-hideme'>".$this->pluginTitle."</legend>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>".
|
<table class='adminlist'>".
|
||||||
$frm->colGroup($this->fields,$this->fieldpref).
|
$frm->colGroup($this->fields,$this->fieldpref).
|
||||||
$frm->thead($this->fields,$this->fieldpref).
|
$frm->thead($this->fields,$this->fieldpref).
|
||||||
|
|
||||||
@@ -280,8 +280,8 @@ class tinymce
|
|||||||
<form method='post' action='".e_SELF."?mode=create' id='dataform' enctype='multipart/form-data'>
|
<form method='post' action='".e_SELF."?mode=create' id='dataform' enctype='multipart/form-data'>
|
||||||
<fieldset id='core-cpage-create-general'>
|
<fieldset id='core-cpage-create-general'>
|
||||||
<legend class='e-hideme'>".$this->pluginTitle."</legend>
|
<legend class='e-hideme'>".$this->pluginTitle."</legend>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminedit'>
|
<table class='adminedit'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -450,8 +450,8 @@ class tinymce
|
|||||||
<form method='post' action='".e_SELF."?".e_QUERY."'>
|
<form method='post' action='".e_SELF."?".e_QUERY."'>
|
||||||
<fieldset id='core-cpage-options'>
|
<fieldset id='core-cpage-options'>
|
||||||
<legend class='e-hideme'>".LAN_OPTIONS."</legend>
|
<legend class='e-hideme'>".LAN_OPTIONS."</legend>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
@@ -611,8 +611,8 @@ function edit_theme()
|
|||||||
$text = "<div style='text-align:center'>
|
$text = "<div style='text-align:center'>
|
||||||
<form method='post' action='".e_SELF."'>
|
<form method='post' action='".e_SELF."'>
|
||||||
<fieldset id='plugin-tinymce-config'>
|
<fieldset id='plugin-tinymce-config'>
|
||||||
<table cellpadding='0' cellspacing='0' class='adminform'>
|
<table class='adminform'>
|
||||||
<colgroup span='2'>
|
<colgroup>
|
||||||
<col class='col-label' />
|
<col class='col-label' />
|
||||||
<col class='col-control' />
|
<col class='col-control' />
|
||||||
</colgroup>
|
</colgroup>
|
||||||
|
@@ -43,7 +43,7 @@ $ADMIN_HEADER = "
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class='admin-page-body'>
|
<div class='admin-page-body'>
|
||||||
<table class='main-table' cellpadding='0' cellspacing='0'>
|
<table class='main-table'>
|
||||||
<tr>
|
<tr>
|
||||||
<!--
|
<!--
|
||||||
<td class='col-left'></td>
|
<td class='col-left'></td>
|
||||||
|
@@ -107,7 +107,8 @@ e107::js('inline','
|
|||||||
$(".e-expandit").show();
|
$(".e-expandit").show();
|
||||||
|
|
||||||
$(".e-expandit").click(function () {
|
$(".e-expandit").click(function () {
|
||||||
$(".e-hideme").toggle("slow");
|
var id = $(this).attr("href");
|
||||||
|
$(id).toggle("slow");
|
||||||
});
|
});
|
||||||
|
|
||||||
// Date
|
// Date
|
||||||
@@ -127,13 +128,14 @@ e107::js('inline','
|
|||||||
$(".adminlist tr:last").addClass("last");
|
$(".adminlist tr:last").addClass("last");
|
||||||
|
|
||||||
// Character Counter
|
// Character Counter
|
||||||
$("textarea").before("<p id=\"remainingCharacters\"> </p>");
|
$("textarea").before("<p class=\"remainingCharacters\" id=\"" + $("textarea").attr("name")+ "-remainingCharacters\"> </p>");
|
||||||
$("textarea").keyup(function(){
|
$("textarea").keyup(function(){
|
||||||
|
|
||||||
// var max=$(this).attr("maxlength");
|
// var max=$(this).attr("maxlength");
|
||||||
var max = 100;
|
var max = 100;
|
||||||
|
var el = "#" + $(this).attr("name") + "-remainingCharacters";
|
||||||
var valLen=$(this).val().length;
|
var valLen=$(this).val().length;
|
||||||
$("#remainingCharacters").text( valLen + " characters")
|
$(el).text( valLen + " characters")
|
||||||
});
|
});
|
||||||
|
|
||||||
// Text-area AutoGrow
|
// Text-area AutoGrow
|
||||||
@@ -151,6 +153,18 @@ e107::js('inline','
|
|||||||
parent.$.colorbox.close()
|
parent.$.colorbox.close()
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// Modal Box - uses inline hidden content
|
||||||
|
$(".e-modal").click(function () {
|
||||||
|
var id = $(this).attr("href");
|
||||||
|
$(id).dialog({
|
||||||
|
minWidth: 800,
|
||||||
|
maxHeight: 800,
|
||||||
|
modal: true
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
// Sorting
|
// Sorting
|
||||||
var fixHelper = function(e, ui) {
|
var fixHelper = function(e, ui) {
|
||||||
ui.children().each(function() {
|
ui.children().each(function() {
|
||||||
@@ -192,6 +206,24 @@ e107::js('inline','
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// highlight checked row
|
||||||
|
$("input[type=\"checkbox\"].checkbox").click(function(evt){
|
||||||
|
|
||||||
|
if(this.checked)
|
||||||
|
{
|
||||||
|
$(this).closest("tr").switchClass( "odd", "highlight-odd", 0 );
|
||||||
|
$(this).closest("tr").switchClass( "even", "highlight-even", 0 );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$(this).closest("tr").switchClass( "highlight-even", "even", 300 );
|
||||||
|
$(this).closest("tr").switchClass( "highlight-odd", "odd", 300 );
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Basic Delete Confirmation
|
// Basic Delete Confirmation
|
||||||
$("input.delete").click(function(){
|
$("input.delete").click(function(){
|
||||||
@@ -202,11 +234,24 @@ e107::js('inline','
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
})
|
})
|
||||||
|
// BC Expandit() function
|
||||||
|
function expandit(e) {
|
||||||
|
var id = "#" + e; // TODO detect new "div" when e = "";
|
||||||
|
$(id).toggle("slow");
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
','jquery');
|
','jquery');
|
||||||
|
|
||||||
e107::css('inline',"
|
e107::css('inline',"
|
||||||
.e-moving { background-color:yellow; }
|
.e-moving { background-color:yellow; }
|
||||||
|
tr.highlight-even { background-color:silver; }
|
||||||
|
tr.highlight-odd { background-color:silver; }
|
||||||
legend { display: none; }
|
legend { display: none; }
|
||||||
",'jquery');
|
",'jquery');
|
||||||
|
|
||||||
|
@@ -826,3 +826,10 @@ h3 { font-size: 12px; }
|
|||||||
h1.bbcode, h2.bbcode, h3.bbcode, h4.bbcode, h5.bbcode, h6.bbcode { }/* override if requried */
|
h1.bbcode, h2.bbcode, h3.bbcode, h4.bbcode, h5.bbcode, h6.bbcode { }/* override if requried */
|
||||||
|
|
||||||
div.bbcode { margin: 15px 0px; clear: both; } /* layout control via bbcodes */
|
div.bbcode { margin: 15px 0px; clear: both; } /* layout control via bbcodes */
|
||||||
|
|
||||||
|
a.media-select-image { margin:5px; border:1px solid silver; }
|
||||||
|
a.media-select-image:hover { border:1px solid red; }
|
||||||
|
a.media-select-icon { text-align:center; vertical-align:middle; margin:1px; border:1px solid white; width:48px; height:48px;}
|
||||||
|
a.media-select-icon:hover { border:1px solid red; }
|
||||||
|
.media-select-container { padding:10px; }
|
||||||
|
.media-select-none { text-decoration:none; }
|
||||||
|
Reference in New Issue
Block a user