mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Media-Picker spacer fix.

Browse Source
This commit is contained in:
Cameron
2018-09-03 14:35:03 -07:00
parent b09beceb4e
commit 7daded6ac5
4 changed files with 272 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/newspost.php
View File

@@ -1752,13 +1752,13 @@ class news_form_ui extends e_admin_form_ui
} }
} }
$text = "<div class='mediaselector-multi'>";
$text = $frm->imagepicker('news_thumbnail[0]', varset($thumbTmp[0]), varset($paths[0]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images')); $text .= $frm->imagepicker('news_thumbnail[0]', varset($thumbTmp[0]), varset($paths[0]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images'));
$text .= $frm->imagepicker('news_thumbnail[1]', varset($thumbTmp[1]), varset($paths[1]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images')); $text .= $frm->imagepicker('news_thumbnail[1]', varset($thumbTmp[1]), varset($paths[1]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images'));
$text .= $frm->imagepicker('news_thumbnail[2]', varset($thumbTmp[2]), varset($paths[2]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images')); $text .= $frm->imagepicker('news_thumbnail[2]', varset($thumbTmp[2]), varset($paths[2]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images'));
$text .= $frm->imagepicker('news_thumbnail[3]', varset($thumbTmp[3]), varset($paths[3]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images')); $text .= $frm->imagepicker('news_thumbnail[3]', varset($thumbTmp[3]), varset($paths[3]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images'));
$text .= $frm->imagepicker('news_thumbnail[4]', varset($thumbTmp[4]), varset($paths[4]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images')); $text .= $frm->imagepicker('news_thumbnail[4]', varset($thumbTmp[4]), varset($paths[4]), array('media' => 'news+', 'video' => 1, 'legacyPath' => '{e_IMAGE}newspost_images'));
$text .= "</div>";
// $text .= "<div class='field-help'>Insert image/video into designated area of template.</div>"; // $text .= "<div class='field-help'>Insert image/video into designated area of template.</div>";
return $text; return $text;
} }

114
e107_handlers/e107_class.php
View File

@@ -324,7 +324,7 @@ class e107
* @param $e107_paths * @param $e107_paths
* @param $e107_root_path * @param $e107_root_path
* @param array $e107_config_override * @param array $e107_config_override
* @return object|false e107 * @return e107
*/ */
public function initInstall($e107_paths, $e107_root_path, $e107_config_override = array()) public function initInstall($e107_paths, $e107_root_path, $e107_config_override = array())
{ {
@@ -1265,7 +1265,7 @@ class e107
/** /**
* Retrieve text parser singleton object * Retrieve text parser singleton object
* *
* @return object e_parse * @return e_parse
*/ */
public static function getParser() public static function getParser()
{ {
@@ -1275,7 +1275,7 @@ class e107
/** /**
* Retrieve sc parser singleton object * Retrieve sc parser singleton object
* *
* @return object e_parse_shortcode * @return e_parse_shortcode
*/ */
public static function getScParser() public static function getScParser()
{ {
@@ -1286,7 +1286,7 @@ class e107
/** /**
* Retrieve secure_image singleton object * Retrieve secure_image singleton object
* *
* @return object secure_image * @return secure_image
*/ */
public static function getSecureImg() public static function getSecureImg()
{ {
@@ -1333,7 +1333,7 @@ class e107
* $instance_id * $instance_id
* *
* @param string $instance_id * @param string $instance_id
* @return object e_db_mysql * @return e_db_mysql
*/ */
public static function getDb($instance_id = '') public static function getDb($instance_id = '')
{ {
@@ -1343,7 +1343,7 @@ class e107
/** /**
* Retrieve cache singleton object * Retrieve cache singleton object
* *
* @return object ecache * @return ecache
*/ */
public static function getCache() public static function getCache()
{ {
@@ -1353,7 +1353,7 @@ class e107
/** /**
* Retrieve bbcode singleton object * Retrieve bbcode singleton object
* *
* @return object e_bbcode * @return e_bbcode
*/ */
public static function getBB() public static function getBB()
{ {
@@ -1363,7 +1363,7 @@ class e107
/** /**
* Retrieve user-session singleton object * Retrieve user-session singleton object
* *
* @return object UserHandler * @return UserHandler
*/ */
public static function getUserSession() public static function getUserSession()
{ {
@@ -1374,7 +1374,7 @@ class e107
* Retrieve core session singleton object(s) * Retrieve core session singleton object(s)
* *
* @param null $namespace * @param null $namespace
* @return object e_core_session * @return e_core_session
*/ */
public static function getSession($namespace = null) public static function getSession($namespace = null)
{ {
@@ -1391,7 +1391,7 @@ class e107
/** /**
* Retrieve redirection singleton object * Retrieve redirection singleton object
* *
* @return object redirection * @return redirection
*/ */
public static function getRedirect() public static function getRedirect()
{ {
@@ -1402,7 +1402,7 @@ class e107
/** /**
* Retrieve rater singleton object * Retrieve rater singleton object
* *
* @return object rater * @return rater
*/ */
public static function getRate() public static function getRate()
{ {
@@ -1412,7 +1412,7 @@ class e107
/** /**
* Retrieve sitelinks singleton object * Retrieve sitelinks singleton object
* *
* @return object sitelinks * @return sitelinks
*/ */
public static function getSitelinks() public static function getSitelinks()
{ {
@@ -1423,7 +1423,7 @@ class e107
/** /**
* Retrieve render singleton object * Retrieve render singleton object
* *
* @return object e107table * @return e107table
*/ */
public static function getRender() public static function getRender()
{ {
@@ -1433,7 +1433,7 @@ class e107
/** /**
* Retrieve e107Email singleton object * Retrieve e107Email singleton object
* *
* @return object e107Email * @return e107Email
*/ */
public static function getEmail($overrides=null) public static function getEmail($overrides=null)
{ {
@@ -1444,7 +1444,7 @@ class e107
/** /**
* Retrieve e107Email mail mailer object. * Retrieve e107Email mail mailer object.
* *
* @return object e107MailManager * @return e107MailManager
*/ */
public static function getBulkEmail() public static function getBulkEmail()
{ {
@@ -1454,7 +1454,7 @@ class e107
/** /**
* Retrieve event singleton object * Retrieve event singleton object
* *
* @return object e107_event * @return e107_event
*/ */
public static function getEvent() public static function getEvent()
{ {
@@ -1464,7 +1464,7 @@ class e107
/** /**
* Retrieve array storage singleton object * Retrieve array storage singleton object
* *
* @return object e_array * @return e_array
*/ */
public static function getArrayStorage() public static function getArrayStorage()
{ {
@@ -1474,7 +1474,7 @@ class e107
/** /**
* Retrieve menu handler singleton object * Retrieve menu handler singleton object
* *
* @return object e_menu * @return e_menu
*/ */
public static function getMenu() public static function getMenu()
{ {
@@ -1484,7 +1484,7 @@ class e107
/** /**
* Retrieve e_theme singleton object * Retrieve e_theme singleton object
* @return object e_theme * @return e_theme
*/ */
public static function getTheme($themedir='front', $clearCache=false) public static function getTheme($themedir='front', $clearCache=false)
{ {
@@ -1524,7 +1524,7 @@ class e107
/** /**
* Retrieve URL singleton object * Retrieve URL singleton object
* *
* @return object eURL * @return eURL
*/ */
public static function getUrl() public static function getUrl()
{ {
@@ -1535,7 +1535,7 @@ class e107
* Retrieve file handler singleton or new fresh object * Retrieve file handler singleton or new fresh object
* *
* @param boolean $singleton default true * @param boolean $singleton default true
* @return object e_file * @return e_file
*/ */
public static function getFile($singleton = false) public static function getFile($singleton = false)
{ {
@@ -1551,7 +1551,7 @@ class e107
* *
* @param boolean $singleton default false * @param boolean $singleton default false
* @param boolean $tabindex passed to e_form when initialized as an object (not singleton) * @param boolean $tabindex passed to e_form when initialized as an object (not singleton)
* @return object e_form * @return e_form
*/ */
public static function getForm($singleton = false, $tabindex = false) public static function getForm($singleton = false, $tabindex = false)
{ {
@@ -1565,7 +1565,7 @@ class e107
/** /**
* Retrieve admin log singleton object * Retrieve admin log singleton object
* @Deprecated - use e107::getLog(); * @Deprecated - use e107::getLog();
* @return object e_admin_log * @return e_admin_log
*/ */
public static function getAdminLog() public static function getAdminLog()
{ {
@@ -1575,7 +1575,7 @@ class e107
/** /**
* Retrieve admin log singleton object * Retrieve admin log singleton object
* *
* @return object e_admin_log * @return e_admin_log
*/ */
public static function getLog() public static function getLog()
{ {
@@ -1585,7 +1585,7 @@ class e107
/** /**
* Retrieve date handler singleton object * Retrieve date handler singleton object
* *
* @return object convert * @return convert
*/ */
public static function getDateConvert() public static function getDateConvert()
{ {
@@ -1595,7 +1595,7 @@ class e107
/** /**
* Retrieve date handler singleton object - preferred method. * Retrieve date handler singleton object - preferred method.
* *
* @return object convert * @return convert
*/ */
public static function getDate() public static function getDate()
{ {
@@ -1606,7 +1606,7 @@ class e107
/** /**
* Retrieve date handler singleton object - preferred method. * Retrieve date handler singleton object - preferred method.
* *
* @return object e107_db_debug * @return e107_db_debug
*/ */
public static function getDebug() //XXX Discuss - possible with current setup? public static function getDebug() //XXX Discuss - possible with current setup?
{ {
@@ -1616,7 +1616,7 @@ class e107
/** /**
* Retrieve notify handler singleton object * Retrieve notify handler singleton object
* *
* @return object notify * @return notify
*/ */
public static function getNotify() public static function getNotify()
{ {
@@ -1627,7 +1627,7 @@ class e107
/** /**
* Retrieve override handler singleton object * Retrieve override handler singleton object
* *
* @return object override * @return override
*/ */
public static function getOverride() public static function getOverride()
{ {
@@ -1639,7 +1639,7 @@ class e107
/** /**
* Retrieve Language handler singleton object * Retrieve Language handler singleton object
* *
* @return object language * @return language
*/ */
public static function getLanguage() public static function getLanguage()
{ {
@@ -1649,7 +1649,7 @@ class e107
/** /**
* Retrieve IP/ban handler singleton object * Retrieve IP/ban handler singleton object
* *
* @return object eIPHandler * @return eIPHandler
*/ */
public static function getIPHandler() public static function getIPHandler()
{ {
@@ -1659,7 +1659,7 @@ class e107
/** /**
* Retrieve Xml handler singleton or new instance object * Retrieve Xml handler singleton or new instance object
* @param mixed $singleton false - new instance, true - singleton from default registry location, 'string' - registry path * @param mixed $singleton false - new instance, true - singleton from default registry location, 'string' - registry path
* @return object xmlClass * @return xmlClass
*/ */
public static function getXml($singleton = true) public static function getXml($singleton = true)
{ {
@@ -1692,7 +1692,7 @@ class e107
/** /**
* Retrieve userclass singleton object * Retrieve userclass singleton object
* *
* @return object user_class * @return user_class
*/ */
public static function getUserClass() public static function getUserClass()
{ {
@@ -1705,7 +1705,7 @@ class e107
* @param integer $user_id target user * @param integer $user_id target user
* @param boolean $checkIfCurrent if tru user_id will be compared to current user, if there is a match * @param boolean $checkIfCurrent if tru user_id will be compared to current user, if there is a match
* current user object will be returned * current user object will be returned
* @return object e_system_user * @return e_system_user
*/ */
public static function getSystemUser($user_id, $checkIfCurrent = true) public static function getSystemUser($user_id, $checkIfCurrent = true)
{ {
@@ -1728,7 +1728,7 @@ class e107
/** /**
* Simple replacement for deprecated get_user_data(). e107::user(); * Simple replacement for deprecated get_user_data(). e107::user();
* @param $uid integer user_id or leave empty for currently logged in user. * @param $uid integer user_id or leave empty for currently logged in user.
* @return array|bool of user data * @return array of user data
*/ */
public static function user($uid=null) public static function user($uid=null)
{ {
@@ -1817,7 +1817,7 @@ class e107
* Retrieve user model object. * Retrieve user model object.
* *
* @param integer $user_id target user * @param integer $user_id target user
* @return object e_user_extended_structure_tree * @return e_user_extended_structure_tree
*/ */
public static function getUserStructure() public static function getUserStructure()
{ {
@@ -1826,7 +1826,7 @@ class e107
/** /**
* Retrieve User Extended handler singleton object * Retrieve User Extended handler singleton object
* @return object e107_user_extended * @return e107_user_extended
*/ */
public static function getUserExt() public static function getUserExt()
{ {
@@ -1835,7 +1835,7 @@ class e107
/** /**
* Retrieve User Perms (admin perms) handler singleton object * Retrieve User Perms (admin perms) handler singleton object
* @return object e_userperms * @return e_userperms
*/ */
public static function getUserPerms() public static function getUserPerms()
{ {
@@ -1844,7 +1844,7 @@ class e107
/** /**
* Retrieve online users handler singleton object * Retrieve online users handler singleton object
* @return object e_ranks * @return e_ranks
*/ */
public static function getRank() public static function getRank()
{ {
@@ -1853,7 +1853,7 @@ class e107
/** /**
* Retrieve plugin handler singleton object * Retrieve plugin handler singleton object
* @return object e107plugin * @return e107plugin
*/ */
public static function getPlugin() public static function getPlugin()
{ {
@@ -1864,7 +1864,7 @@ class e107
/** /**
* Retrieve plugin class singleton object * Retrieve plugin class singleton object
* @return object e_plugin * @return e_plugin
*/ */
public static function getPlug() public static function getPlug()
{ {
@@ -1873,7 +1873,7 @@ class e107
/** /**
* Retrieve online users handler singleton object * Retrieve online users handler singleton object
* @return object e_online * @return e_online
*/ */
public static function getOnline() public static function getOnline()
{ {
@@ -1883,7 +1883,7 @@ class e107
/** /**
* Retrieve chart handler singleton object * Retrieve chart handler singleton object
* @return object e_chart * @return e_chart
*/ */
public static function getChart() public static function getChart()
{ {
@@ -1893,7 +1893,7 @@ class e107
/** /**
* Retrieve comments handler singleton object * Retrieve comments handler singleton object
* @return object comment * @return comment
*/ */
public static function getComment() public static function getComment()
{ {
@@ -1902,7 +1902,7 @@ class e107
/** /**
* Retrieve comments handler singleton object * Retrieve comments handler singleton object
* @return object e_customfields * @return e_customfields
*/ */
public static function getCustomFields() public static function getCustomFields()
{ {
@@ -1911,7 +1911,7 @@ class e107
/** /**
* Retrieve Media handler singleton object * Retrieve Media handler singleton object
* @return object e_media * @return e_media
*/ */
public static function getMedia() public static function getMedia()
{ {
@@ -1920,7 +1920,7 @@ class e107
/** /**
* Retrieve Navigation Menu handler singleton object * Retrieve Navigation Menu handler singleton object
* @return object e_navigation * @return e_navigation
*/ */
public static function getNav() public static function getNav()
{ {
@@ -1929,7 +1929,7 @@ class e107
/** /**
* Retrieve message handler singleton * Retrieve message handler singleton
* @return object eMessage * @return eMessage
*/ */
public static function getMessage() public static function getMessage()
{ {
@@ -1946,7 +1946,7 @@ class e107
/** /**
* Retrieve ajax singleton object * Retrieve ajax singleton object
* *
* @return object e_ajax_class * @return e_ajax_class
*/ */
public static function getAjax() public static function getAjax()
{ {
@@ -1956,7 +1956,7 @@ class e107
/** /**
* Retrieve Library Manager singleton object (internal use only. Use e107::library()) * Retrieve Library Manager singleton object (internal use only. Use e107::library())
* *
* @return object e_library_manager * @return e_library_manager
*/ */
public static function getLibrary() public static function getLibrary()
{ {
@@ -2328,7 +2328,7 @@ class e107
* Retrieve JS Helper object * Retrieve JS Helper object
* *
* @param boolean|string $singleton if true return singleton, if string return singleton object, use string as namespace, default false * @param boolean|string $singleton if true return singleton, if string return singleton object, use string as namespace, default false
* @return object e_jshelper * @return e_jshelper
*/ */
public static function getJshelper($singleton = false) public static function getJshelper($singleton = false)
{ {
@@ -2911,7 +2911,7 @@ class e107
* @param boolean $merge * @param boolean $merge
* @return array * @return array
*/ */
public static function getTemplateInfo($plug_name = null, $id=null, $key = null, $override = true, $merge = false) public static function getTemplateInfo($plug_name = null, $id, $key = null, $override = true, $merge = false)
{ {
if($plug_name) if($plug_name)
{ {
@@ -3568,7 +3568,7 @@ class e107
/** /**
* Retrieve error page handler. * Retrieve error page handler.
* *
* @return object error_page * @return error_page
*/ */
public static function getError() public static function getError()
{ {
@@ -3581,7 +3581,7 @@ class e107
* rawurlencode() (instead of urlencode()) all query parameters. * rawurlencode() (instead of urlencode()) all query parameters.
* @param array $query The query parameter array to be processed, e.g. $_GET. * @param array $query The query parameter array to be processed, e.g. $_GET.
* @param string $parent Internal use only. Used to build the $query array key for nested items. * @param string $parent Internal use only. Used to build the $query array key for nested items.
* @return string A rawurlencoded string which can be used as or appended to the URL query string. * @return array A rawurlencoded string which can be used as or appended to the URL query string.
*/ */
public static function httpBuildQuery(array $query, $parent = '') public static function httpBuildQuery(array $query, $parent = '')
{ {
@@ -3612,12 +3612,6 @@ class e107
} }
/**
* @param $js
* @param array $options
* @return bool|null|string
* @throws Exception
*/
public static function minify($js,$options=array()) public static function minify($js,$options=array())
{ {
if(empty($js)) if(empty($js))

7
e107_handlers/form_handler.php
View File

@@ -5871,6 +5871,8 @@ class e_form
$label = varset($parms['label'], 'LAN_EDIT'); $label = varset($parms['label'], 'LAN_EDIT');
$max = varset($parms['max'],5); $max = varset($parms['max'],5);
$ret .= "<div class='mediaselector-multi field-element-images'>";
for ($i=0; $i < $max; $i++) for ($i=0; $i < $max; $i++)
{ {
$k = $key.'['.$i.'][path]'; $k = $key.'['.$i.'][path]';
@@ -5879,6 +5881,7 @@ class e_form
$ret .= $this->imagepicker($k, $ival, defset($label, $label), $parms); $ret .= $this->imagepicker($k, $ival, defset($label, $label), $parms);
} }
$ret .= "</div>";
break; break;
/** Generic Media Pick for combinations of images, audio, video, glyphs, files, etc. Field Type = json */ /** Generic Media Pick for combinations of images, audio, video, glyphs, files, etc. Field Type = json */
@@ -5886,7 +5889,7 @@ class e_form
$max = varset($parms['max'],1); $max = varset($parms['max'],1);
$ret = ''; $ret = "<div class='mediaselector-multi field-element-media'>";
for ($i=0; $i < $max; $i++) for ($i=0; $i < $max; $i++)
{ {
$k = $key.'['.$i.'][path]'; $k = $key.'['.$i.'][path]';
@@ -5895,6 +5898,8 @@ class e_form
$ret .= $this->mediapicker($k, $ival, $parms); $ret .= $this->mediapicker($k, $ival, $parms);
} }
$ret .= "</div>";
return $ret; return $ret;
break; break;

1
e107_themes/bootstrap3/admin_style.css
View File

@@ -303,6 +303,7 @@ td.right, th.right { text-align:right }
.mediaselector-container-icon .mediaselector-preview { height: auto; padding: 0; text-align: center; } .mediaselector-container-icon .mediaselector-preview { height: auto; padding: 0; text-align: center; }
td .mediaselector-container { margin-bottom:0 } td .mediaselector-container { margin-bottom:0 }
td .mediaselector-multi .mediaselector-container { margin-bottom: 20px }
/* dropzone new in v2.1.9 */ /* dropzone new in v2.1.9 */