";
@@ -4241,6 +4241,7 @@ class e_form
//return $this->options($field, $value, $attributes, $id);
// consistent method arguments, fixed in admin cron administration
$attributes['type'] = null; // prevent infinite loop.
+
return $this->options($parms, $value, $id, $attributes);
}
}
@@ -4662,6 +4663,20 @@ class e_form
break;
case 'image': //js tooltip...
+
+ $thparms = array();
+ $createLink = true;
+
+ // Support readParms example: thumb=1&w=200&h=300
+ // Support readParms example: thumb=1&aw=80&ah=30
+ if(isset($parms['h'])) { $thparms['h'] = intval($parms['h']); }
+ if(isset($parms['ah'])) { $thparms['ah'] = intval($parms['ah']); }
+ if(isset($parms['w'])) { $thparms['w'] = intval($parms['w']); }
+ if(isset($parms['aw'])) { $thparms['aw'] = intval($parms['aw']); }
+ if(isset($parms['crop'])) { $thparms['crop'] = $parms['crop']; }
+
+
+
if($value)
{
@@ -4693,16 +4708,13 @@ class e_form
- if(vartrue($parms['thumb']))
+ if(!empty($parms['thumb']))
{
- $thparms = array();
-
- // Support readParms example: thumb=1&w=200&h=300
- // Support readParms example: thumb=1&aw=80&ah=30
- if(isset($parms['h'])) { $thparms['h'] = intval($parms['h']); }
- if(isset($parms['ah'])) { $thparms['ah'] = intval($parms['ah']); }
- if(isset($parms['w'])) { $thparms['w'] = intval($parms['w']); }
- if(isset($parms['aw'])) { $thparms['aw'] = intval($parms['aw']); }
+
+ if(isset($parms['link']) && empty($parms['link']))
+ {
+ $createLink = false;
+ }
// Support readParms example: thumb=200x300 (wxh)
if(strpos($parms['thumb'],'x')!==false)
@@ -4728,15 +4740,21 @@ class e_form
// return print_a($thparms,true);
$src = $tp->replaceConstants(vartrue($parms['pre']).$value, 'abs');
- $thsrc = $tp->thumbUrl(vartrue($parms['pre']).$value, $thparms, varset($parms['thumb_urlraw']));
+ // $thsrc = $tp->thumbUrl(vartrue($parms['pre']).$value, $thparms, varset($parms['thumb_urlraw']));
$alt = basename($src);
// $ttl = '
';
$thparms['alt'] = $alt;
- $thparms['class'] = "thumbnail e-thumb";
+ $thparms['class'] = "thumbnail e-thumb img-responsive";
+
+
$ttl = $tp->toImage($value, $thparms);
+ if($createLink === false)
+ {
+ return $ttl;
+ }
$value = '
'.$ttl.'';
@@ -4749,6 +4767,12 @@ class e_form
$value = '
'.defset($ttl, $ttl).'';
}
}
+ elseif(!empty($parms['fallback']))
+ {
+ $value = $parms['fallback'];
+ $thparms['class'] = "thumbnail e-thumb img-responsive fallback";
+ return $tp->toImage($value, $thparms);
+ }
break;
case 'files':
@@ -5697,7 +5721,7 @@ class e_form
}
/**
- * Generic List Form, used internal by admin UI
+ * Generic List Form, used internally by admin UI
* Expected options array format:
*
*
-
- ";
-
+ $text .= "
";
$text .= $tp->simpleParse($template,$vars);
-
-
- // $text .= $this->renderTableRow($fields, $current_fields, $model->getData(), $options['pid']);
$text .= "
";
}
@@ -5959,6 +5989,7 @@ class e_form
$parms = 'total='.$total;
$parms .= '&amount='.$amount;
$parms .= '¤t='.$from;
+
if(ADMIN_AREA)
{
$parms .= '&tmpl_prefix=admin';
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index ffd7ed170..add0e657b 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -59,6 +59,30 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
#admin-ui-nav-menu li.divider { padding-top: 10px; border-bottom: 1px outset #262626; margin-bottom: 10px; }
+
+
+/* e-overlay */
+.e-overlay { position: relative; height: 100%; }
+.e-overlay .e-overlay-content { position: absolute; top: 0; left: 0; width: 100%; height: 100%; color: #FFF; opacity: 0; }
+.e-overlay:hover .e-overlay-content { opacity: 1; padding-top:33%; transition: opacity .20s ease-in-out;
+ -moz-transition: opacity .20s ease-in-out;
+ -webkit-transition: opacity .20s ease-in-out;
+ vertical-align: middle;
+ background: rgba(0, 0, 0, .7);
+ text-align:center;
+ }
+.e-overlay .thumbnail { margin:0; }
+
+.admin-ui-grid img.fallback { opacity: 0.3; }
+
+
+
+
+
+
+
+
+
/* TODO - use col-xx-x markup where core-mainpanel-block occurs. ? */
@media (max-width: 1700px){
.core-mainpanel-block { width:25%; }
'); // must use single quotes.
+ define("ADMIN_FILTER_ICON", "");
define("ADMIN_TRUE_ICON", "");
define("ADMIN_FALSE_ICON", "");
define("ADMIN_WARNING_ICON", "");
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 476660872..d759d9e82 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -3011,6 +3011,7 @@ class e_admin_controller_ui extends e_admin_controller
public function setTreeModel($tree_model)
{
$this->_tree_model = $tree_model;
+
return $this;
}
@@ -5364,6 +5365,7 @@ class e_admin_ui extends e_admin_controller_ui
return;
}
$this->getTreeModel()->setParam('db_query', $this->_modifyListQry(false, false, false, false, $this->listQry))->load();
+
$this->addTitle();
}
@@ -6577,6 +6579,10 @@ class e_admin_form_ui extends e_form
$perPage = $this->getController()->getPerPage();
$fromPage = $this->getController()->getQuery('from', 0);
+ $vars = $this->getController()->getQuery();
+ $vars['from'] = '[FROM]';
+ // var_dump($vars);
+ $paginate = http_build_query($vars);
$text = "