Author: ralfbecker
New Revision: 55435
URL: http://svn.stylite.de/viewvc/egroupware?rev=55435&view=rev
Log:
move et2 widget browser to api, thought link to it is currently only in old eTemplate sidebox menu
Added:
trunk/egroupware/api/src/Etemplate/WidgetBrowser.php
- copied, changed from r55427, trunk/etemplate/inc/class.etemplate_et2_widgets.inc.php
trunk/egroupware/api/templates/default/widget_browser.css
- copied, changed from r55427, trunk/etemplate/templates/default/widget_browser.css
Removed:
trunk/etemplate/inc/class.etemplate_et2_widgets.inc.php
trunk/etemplate/templates/default/widget_browser.css
Modified:
trunk/egroupware/api/js/etemplate/widget_browser.js
trunk/etemplate/inc/hook_sidebox_menu.inc.php
— trunk/egroupware/api/js/etemplate/widget_browser.js (original)
+++ trunk/egroupware/api/js/etemplate/widget_browser.js Sat Mar 19 16:25:32 2016
@@ -12,6 +12,9 @@
+/*egw:uses
/**
- widget_browser shows a list of widgets, and allows you to view them one at a time.
— trunk/etemplate/inc/class.etemplate_et2_widgets.inc.php (original)
+++ trunk/egroupware/api/src/Etemplate/WidgetBrowser.php Sat Mar 19 16:25:32 2016
@@ -1,7 +1,6 @@
<?php
/**
* EGroupware eTemplate2 widget browser
- * View & play with et2 widgets - PHP
*
* @link http://www.egroupware.org
* @author Nathan Gray
@@ -12,48 +11,51 @@
* @version $Id$
*/
+namespace EGroupware\Api\Etemplate;
+
+use EGroupware\Api;
+
+// explicitly list not yet ported api classes
+use egw_framework;
+
/**
* eTemplate2 widget browser
+ *
* View & play with et2 widgets. Most of the good stuff happens
* on the client side via js, this is the server side.
*/
-
-class etemplate_et2_widgets
+class WidgetBrowser
{
public $public_functions = array(
'index' => true
);
- public static function index($content = array())
+ public static function index()
{
$GLOBALS['egw_info']['flags']['currentapp'] = 'etemplate';
$GLOBALS['egw_info']['flags']['app_header'] = 'et2 Widgets';
//'js_link_registry' => True,
// Widget browser code
- egw_framework::validate_file('/etemplate/js/widget_browser.js');
+ egw_framework::validate_file('/api/js/etemplate/widget_browser.js');
// Include the etemplate2 javascript code
- egw_framework::validate_file('.', 'etemplate2', 'etemplate');
+ egw_framework::validate_file('.', 'etemplate2', 'etemplate');
- // Include the jQuery-UI CSS - many more complex widgets use it
- $theme = 'redmond';
+ // Include the jQuery-UI CSS - many more complex widgets use it
+ $theme = 'redmond';
egw_framework::includeCSS("/phpgwapi/js/jquery/jquery-ui/$theme/jquery-ui-1.10.3.custom.css");
- egw_framework::includeCSS('/etemplate/templates/default/etemplate2.css');
+ egw_framework::includeCSS('/api/templates/default/etemplate2.css');
- egw_framework::includeCSS('etemplate','widget_browser',false);
+ egw_framework::includeCSS('api','widget_browser',false);
// load translations
- translation::add_app('etemplate');
-
- common::egw_header();
- parse_navbar();
+ Api\Translation::add_app('etemplate');
- echo '
+ $GLOBALS['egw']->framework->render('
-
';
- common::egw_footer();
+
');
}
}
Copied: trunk/egroupware/api/templates/default/widget_browser.css (from r55427, trunk/etemplate/templates/default/widget_browser.css)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/templates/default/widget_browser.css?p2=trunk/egroupware/api/templates/default/widget_browser.css&p1=trunk/etemplate/templates/default/widget_browser.css&r1=55427&r2=55435&rev=55435&view=diff
==============================================================================
--- trunk/etemplate/templates/default/widget_browser.css (original)
+++ trunk/egroupware/api/templates/default/widget_browser.css Sat Mar 19 16:25:32 2016
@@ -1,6 +1,6 @@
/**
* CSS for the widget browser
- * etemplate.etemplate_et2_widgets.index
+ * Api\Etemplate\WidgetBrowser.php
*/
/* Basic layout */
@@ -14,7 +14,7 @@
overflow-y: scroll;
height: 55%;
width: inherit;
- list-style-type: none;
+ list-style-type: none;
margin: 0;
padding: 0;
}
Modified: trunk/etemplate/inc/hook_sidebox_menu.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/hook_sidebox_menu.inc.php?rev=55435&r1=55434&r2=55435&view=diff
==============================================================================
--- trunk/etemplate/inc/hook_sidebox_menu.inc.php (original)
+++ trunk/etemplate/inc/hook_sidebox_menu.inc.php Sat Mar 19 16:25:32 2016
@@ -1,63 +1,62 @@
<?php
- /**
- * eGroupWare - Setup
- * Originaly from the phpGW XSLT API
- *
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package etemplate
- * @link http://www.egroupware.org
- * @author Ralf Becker
- * @version $Id$
- */
+/**
+ * EGroupware - eTemplate sidebox
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @link http://www.egroupware.org
+ * @author Ralf Becker
+ * @version $Id$
+ */
- $menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
- $file = Array(
- 'eTemplate Editor' => $GLOBALS['egw']->link('/index.php','menuaction=etemplate.editor.edit'),
- 'DB-Tools' => $GLOBALS['egw']->link('/index.php','menuaction=etemplate.db_tools.edit'),
+$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
+$file = Array(
+ 'eTemplate Editor' => $GLOBALS['egw']->link('/index.php','menuaction=etemplate.editor.edit'),
+ 'DB-Tools' => $GLOBALS['egw']->link('/index.php','menuaction=etemplate.db_tools.edit'),
+);
+if (@$GLOBALS['egw_info']['user']['apps']['developer_tools'])
+{
+ $file += array(
+ '_NewLine_', // give a newline
+ 'developer_tools' => $GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.index'),
);
- if (@$GLOBALS['egw_info']['user']['apps']['developer_tools'])
- {
- $file += array(
- '_NewLine_', // give a newline
- 'developer_tools' => $GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.index'),
- );
- }
- if($GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate')
- {
- display_sidebox($appname,$menu_title,$file);
- }
- $menu_title = lang('Documentation');
- $docs = $GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/doc/';
- $file = Array(
- array(
- 'text' => 'eTemplate2 Reference',
- 'link' => egw::link('/index.php','menuaction=etemplate.etemplate_et2_widgets.index', 'etemplate'),
- ),
- array(
- 'text' => 'eTemplate Tutorial',
- 'link' => $docs.'etemplate.html',
- 'target' => 'docs'
- ),
- array(
- 'text' => 'eTemplate Reference',
- 'link' => $docs.'reference.html',
- 'target' => 'docs'
- ),
- array(
- 'text' => 'eGroupWare '.lang('Documentation'),
- 'no_lang' => True,
- 'link' => 'http://egroupware.org/wiki/DeveloperDocs',
- 'target' => 'docs'
- ),
- array(
- 'text' => 'CSS properties',
- 'link' => 'http://www.w3.org/TR/REC-CSS2/propidx.html',
- 'target' => 'docs'
- ),
+ }
+ if($GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate')
+ {
+ display_sidebox($appname,$menu_title,$file);
+ }
+$menu_title = lang('Documentation');
+$docs = $GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/doc/';
+$doc_file = Array(
+ array(
+ 'text' => 'eTemplate2 Reference',
+ 'link' => egw::link('/index.php','menuaction=api.EGroupware\\Api\\Etemplate\\WidgetBrowser.index', 'etemplate'),
+ ),
+ array(
+ 'text' => 'eTemplate Tutorial',
+ 'link' => $docs.'etemplate.html',
+ 'target' => 'docs'
+ ),
+ array(
+ 'text' => 'eTemplate Reference',
+ 'link' => $docs.'reference.html',
+ 'target' => 'docs'
+ ),
+ array(
+ 'text' => 'eGroupWare '.lang('Documentation'),
+ 'no_lang' => True,
+ 'link' => 'http://egroupware.org/wiki/DeveloperDocs',
+ 'target' => 'docs'
+ ),
+ array(
+ 'text' => 'CSS properties',
+ 'link' => 'http://www.w3.org/TR/REC-CSS2/propidx.html',
+ 'target' => 'docs'
+ ),
- );
+);
- if($GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate')
- {
- display_sidebox($appname,$menu_title,$file);
- }
+if($GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate')
+{
+ display_sidebox($appname, $menu_title, $doc_file);
+}
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140
_______________________________________________
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
