mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-09-01 02:21:58 +02:00
Code Issues Releases Wiki Activity

Revert changes by infopanel, and introduce flexpanel, which extends infopanel funcionality.

Browse Source
This commit is contained in:
lonalore
2016-11-07 14:12:19 +01:00
parent 6d96cdbeab
commit 3a3734ef86
9 changed files with 504 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
e107_themes/bootstrap3/admin_template.php
View File

@@ -208,6 +208,7 @@ $ADMIN_MODAL = '<div id="uiModal" class="modal hide fade" tabindex="-1" role="d
</div>';*/
// TODO - LANs
$ADMIN_MODAL = '
<div id="uiModal" class="modal fade">
<div id="admin-ui-modal" class="modal-dialog modal-lg">
@@ -224,12 +225,13 @@ $ADMIN_MODAL = '
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->';
</div>
</div>
</div>
';
$ADMIN_HEADER_DASHBOARD = $ADMIN_HEADER = $ADMIN_MODAL . '
// TODO - LANs
$ADMIN_HEADER_FLEXPANEL = $ADMIN_HEADER = $ADMIN_MODAL . '
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
@@ -239,12 +241,12 @@ $ADMIN_HEADER_DASHBOARD = $ADMIN_HEADER = $ADMIN_MODAL . '
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand navbar-brand" href="' . e_ADMIN_ABS . 'admin.php" title="Return to Front Panel">
<img class="admin-logo" src="' . e_THEME_ABS . 'bootstrap3/images/e107_adminlogo.png" alt="e107"/>
<a class="brand navbar-brand" href="'.e_ADMIN_ABS.'admin.php" title="Return to Front Panel">
<img class="admin-logo" src="'.e_THEME_ABS.'bootstrap3/images/e107_adminlogo.png" alt="e107"/>
</a>
</div>
<div class="navbar-collapse collapse">
{ADMIN_NAVIGATION=no-main}
{ADMIN_NAVIGATION=no-main}
<div>
{ADMIN_NAVIGATION=logout}
{ADMIN_NAVIGATION=language}
@@ -252,88 +254,57 @@ $ADMIN_HEADER_DASHBOARD = $ADMIN_HEADER = $ADMIN_MODAL . '
{ADMIN_PM}
{ADMIN_DEBUG}
</div>
</div><!--/.navbar-collapse -->
</div>
</div>
</div>
';
$ADMIN_HEADER_DASHBOARD .= '
<div class="container-fluid">
<div class="row">
<div class="col-md-2" id="left-panel">
<div class="draggable-panels" id="droppable-area-sidebar">
{SETSTYLE=admin_menu}
{ADMIN_MENU}
{ADMIN_PWORD}
{ADMIN_MENUMANAGER}
{SETSTYLE=site_info}
{ADMINUI_HELP}
{ADMIN_HELP}
{ADMIN_SITEINFO=creditsonly}
{SETSTYLE=admin_menu}
{ADMIN_LATEST=infopanel}
{ADMIN_STATUS=infopanel}
{ADMIN_LOG=request}
{ADMIN_MSG=request}
{ADMIN_PLUGINS}
{SETSTYLE=default}
</div>
</div>
<div class="col-md-10" id="right-panel">
<div class="sidebar-toggle">
<a href="#" title="Toggle Sidebar" data-toggle-sidebar="true">&nbsp;</a>
</div>
<div>
';
$ADMIN_FOOTER_DASHBOARD = '
</div>
</div><!--/span-->
</div><!--/row-->
</div><!--/.fluid-container-->
<footer class="center mute">
Copyright &copy; 2008-2015 e107 Inc (e107.org)<br />
</footer>
';
$ADMIN_HEADER .= '
<div class="container-fluid">
<div class="row">
';
$ADMIN_HEADER_FLEXPANEL .= '
<div class="col-sm-12">
<div class="admin-main-content">
';
// TODO - LANs
$ADMIN_HEADER .= '
<div class="col-md-3 col-lg-2" id="left-panel">
{SETSTYLE=admin_menu}
{ADMIN_MENU}
{ADMIN_PWORD}
{ADMIN_MENUMANAGER}
<div class="e-scroll-fixed">
{SETSTYLE=site_info}
{ADMINUI_HELP}
{ADMIN_HELP}
</div>
{ADMIN_SITEINFO=creditsonly}
{SETSTYLE=admin_menu}
{ADMIN_LATEST=infopanel}
{ADMIN_STATUS=infopanel}
{ADMIN_LOG=request}
{ADMIN_MSG=request}
{ADMIN_PLUGINS}
{SETSTYLE=default}
{SETSTYLE=default}
</div>
<div class="col-md-9 col-lg-10" id="right-panel">
<div class="sidebar-toggle">
<a href="#" title="Toggle Sidebar" data-toggle-sidebar="true">&nbsp;</a>
</div>
<div>
<div class="admin-main-content">
';
// TODO - LANs
$ADMIN_FOOTER = '
</div><!--/row-->
</div><!--/span-->
</div><!--/row-->
</div>
</div>
</div><!--/.row-->
</div><!--/.fluid-container-->
<footer class="center mute">

2
e107_themes/bootstrap3/admin_theme.php
View File

@@ -5,7 +5,7 @@ define("SEP"," <span class='fa fa-play e-breadcrumb'></span> ");
define("BOOTSTRAP", 3);
define('FONTAWESOME', 4);
e107::js("theme", "js/bootstrap3.js", 'jquery');
// e107::js("url", "https://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js",'jquery', 2);
// e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css');

94
e107_themes/bootstrap3/js/bootstrap3.js vendored
View File

@@ -1,94 +0,0 @@
var e107 = e107 || {'settings': {}, 'behaviors': {}};
(function ($)
{
'use strict';
e107.settings.draggablePanels = {
selector: '.draggable-panels',
items: '> .panel'
};
/**
* Behavior to initialize draggable panels on the dashboard.
*
* @type {{attach: e107.behaviors.adminDashboardDraggablePanels.attach}}
*/
e107.behaviors.adminDashboardDraggablePanels = {
attach: function (context, settings)
{
var selector = e107.settings.draggablePanels.selector;
var onceKey = 'admin-dashboard-draggable-panels';
$(context).find(selector).once(onceKey).each(function ()
{
var $panel = $(this);
$panel.sortable({
connectWith: selector,
items: e107.settings.draggablePanels.items,
handle: '.panel-heading',
accept: e107.settings.draggablePanels.selector,
cursor: 'move',
placeholder: 'draggable-placeholder',
forcePlaceholderSize: true,
helper: 'clone',
forceHelperSize: true,
opacity: 0.4,
tolerance: 'pointer',
start: function (event, ui)
{
var $placeholders = $('.draggable-placeholder');
var $draggablePanels = $(e107.settings.draggablePanels.selector);
$placeholders.css('margin', '15px');
$placeholders.css('background-color', '#337ab7');
$draggablePanels.css('min-height', '20px');
$draggablePanels.css('border', '1px dashed #CCCCCC');
$draggablePanels.css('margin-bottom', '30px');
$panel.sortable("refreshPositions");
},
stop: function (event, ui)
{
var $draggablePanels = $(e107.settings.draggablePanels.selector);
$draggablePanels.css('min-height', '0');
$draggablePanels.css('border', 'none');
$draggablePanels.css('margin-bottom', '0');
e107.callbacks.adminDashboardSavePanelOrder();
}
});
});
}
};
e107.callbacks.adminDashboardSavePanelOrder = function ()
{
var selector = e107.settings.draggablePanels.selector;
var NewOrder = [];
$(selector).each(function ()
{
var $this = $(this);
var key = $this.attr('id');
if(key)
{
NewOrder[key] = [];
$('#' + key + ' ' + e107.settings.draggablePanels.items).each(function ()
{
var $item = $(this);
var title = $item.find('.panel-title').eq(0).text();
NewOrder[key].push(title);
});
}
});
console.log(NewOrder);
}
})(jQuery);