[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14838] configurable rich text editor
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14838] configurable rich text editor |
|
Date: |
Tue, 15 Mar 2016 12:33:30 +0000 |
Revision: 14838
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14838
Author: sigurdne
Date: 2016-03-15 12:33:24 +0000 (Tue, 15 Mar 2016)
Log Message:
-----------
configurable rich text editor
Modified Paths:
--------------
trunk/booking/inc/class.uiapplication_settings.inc.php
trunk/booking/inc/class.uibuilding.inc.php
trunk/booking/inc/class.uicontactperson.inc.php
trunk/booking/inc/class.uigroup.inc.php
trunk/booking/inc/class.uimetasettings.inc.php
trunk/booking/inc/class.uiorganization.inc.php
trunk/booking/inc/class.uiresource.inc.php
trunk/booking/inc/class.uisystem_message.inc.php
trunk/bookingfrontend/inc/class.uiallocation.inc.php
trunk/bookingfrontend/inc/class.uibooking.inc.php
trunk/bookingfrontend/inc/class.uievent.inc.php
trunk/bookingfrontend/inc/class.uisystem_message.inc.php
trunk/email/templates/base/addressbook-js.tpl
trunk/email/templates/base/debug.tpl
trunk/email/templates/base/spell_review.tpl
trunk/frontend/templates/base/base.css
trunk/phpgwapi/inc/class.uicommon_jquery.inc.php
trunk/preferences/inc/hook_settings.inc.php
Modified: trunk/booking/inc/class.uiapplication_settings.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication_settings.inc.php 2016-03-15
08:40:14 UTC (rev 14837)
+++ trunk/booking/inc/class.uiapplication_settings.inc.php 2016-03-15
12:33:24 UTC (rev 14838)
@@ -43,7 +43,7 @@
$settings = array();
$settings['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
self::render_template_xsl('application_settings',
array('config_data' => $config->config_data,
'data' => $settings));
}
Modified: trunk/booking/inc/class.uibuilding.inc.php
===================================================================
--- trunk/booking/inc/class.uibuilding.inc.php 2016-03-15 08:40:14 UTC (rev
14837)
+++ trunk/booking/inc/class.uibuilding.inc.php 2016-03-15 12:33:24 UTC (rev
14838)
@@ -206,7 +206,7 @@
$activity_data = $this->activity_bo->get_top_level();
phpgwapi_jquery::load_widget('autocomplete');
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
$tabs = array();
$tabs['generic'] = array('label' => lang('Building
New'), 'link' => '#building_form');
@@ -262,7 +262,7 @@
$this->flash_form_errors($errors);
phpgwapi_jquery::load_widget('autocomplete');
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
$tabs = array();
$tabs['generic'] = array('label' => lang('Building
Edit'), 'link' => '#building_form');
Modified: trunk/booking/inc/class.uicontactperson.inc.php
===================================================================
--- trunk/booking/inc/class.uicontactperson.inc.php 2016-03-15 08:40:14 UTC
(rev 14837)
+++ trunk/booking/inc/class.uicontactperson.inc.php 2016-03-15 12:33:24 UTC
(rev 14838)
@@ -149,7 +149,7 @@
}
}
$this->flash_form_errors($errors);
-
phpgwapi_jquery::init_ckeditor('contact-field-description');
+ self::rich_text_editor('contact-field-description');
self::add_template_file("contactperson_fields");
self::render_template_xsl('contactperson_edit',
array('person' => $person,));
Modified: trunk/booking/inc/class.uigroup.inc.php
===================================================================
--- trunk/booking/inc/class.uigroup.inc.php 2016-03-15 08:40:14 UTC (rev
14837)
+++ trunk/booking/inc/class.uigroup.inc.php 2016-03-15 12:33:24 UTC (rev
14838)
@@ -309,7 +309,7 @@
$activities = $activities['results'];
phpgwapi_jquery::load_widget('autocomplete');
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
$tabs = array();
$tab_text = ($id) ? 'Group Edit' : 'Group New';
Modified: trunk/booking/inc/class.uimetasettings.inc.php
===================================================================
--- trunk/booking/inc/class.uimetasettings.inc.php 2016-03-15 08:40:14 UTC
(rev 14837)
+++ trunk/booking/inc/class.uimetasettings.inc.php 2016-03-15 12:33:24 UTC
(rev 14838)
@@ -48,7 +48,7 @@
$active_tab = 'meta';
$meta['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- phpgwapi_jquery::init_ckeditor('field_frontpagetext');
+ self::rich_text_editor('field_frontpagetext');
self::render_template('metasettings',
array('config_data' => $config->config_data,
'meta' => $meta));
Modified: trunk/booking/inc/class.uiorganization.inc.php
===================================================================
--- trunk/booking/inc/class.uiorganization.inc.php 2016-03-15 08:40:14 UTC
(rev 14837)
+++ trunk/booking/inc/class.uiorganization.inc.php 2016-03-15 12:33:24 UTC
(rev 14838)
@@ -226,7 +226,7 @@
$activities = $activities['results'];
$this->install_customer_identifier_ui($organization);
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
$this->add_template_helpers();
@@ -298,7 +298,7 @@
$activities = $activities['results'];
$this->install_customer_identifier_ui($organization);
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
$this->add_template_helpers();
self::render_template_xsl('organization_edit',
array('organization' => $organization,
Modified: trunk/booking/inc/class.uiresource.inc.php
===================================================================
--- trunk/booking/inc/class.uiresource.inc.php 2016-03-15 08:40:14 UTC (rev
14837)
+++ trunk/booking/inc/class.uiresource.inc.php 2016-03-15 12:33:24 UTC (rev
14838)
@@ -166,7 +166,7 @@
self::add_javascript('booking', 'booking',
'resource_new.js');
phpgwapi_jquery::load_widget('autocomplete');
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
$activity_data = $this->activity_bo->fetch_activities();
$resource['types'] = $this->resource_types();
$resource['cancel_link'] =
self::link(array('menuaction' => 'booking.uiresource.index'));
@@ -232,7 +232,7 @@
$this->flash_form_errors($errors);
self::add_javascript('booking', 'booking',
'resource_new.js');
phpgwapi_jquery::load_widget('autocomplete');
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
$activity_data = $this->activity_bo->fetch_activities();
foreach ($activity_data['results'] as $acKey =>
$acValue)
{
Modified: trunk/booking/inc/class.uisystem_message.inc.php
===================================================================
--- trunk/booking/inc/class.uisystem_message.inc.php 2016-03-15 08:40:14 UTC
(rev 14837)
+++ trunk/booking/inc/class.uisystem_message.inc.php 2016-03-15 12:33:24 UTC
(rev 14838)
@@ -305,7 +305,7 @@
}
$this->flash_form_errors($errors);
- phpgwapi_jquery::init_ckeditor('field-message');
+ self::rich_text_editor('field-message');
$tabs = array();
$tabs['generic'] = array('label' => lang('System
message'), 'link' => '#system_message');
@@ -313,7 +313,7 @@
$system_message['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- phpgwapi_jquery::init_ckeditor('field_description');
+ self::rich_text_editor('field_description');
self::render_template('system_message_edit',
array('system_message' => $system_message,
'module' => $this->module));
Modified: trunk/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uiallocation.inc.php 2016-03-15
08:40:14 UTC (rev 14837)
+++ trunk/bookingfrontend/inc/class.uiallocation.inc.php 2016-03-15
12:33:24 UTC (rev 14838)
@@ -127,7 +127,7 @@
$allocation['to_'] =
pretty_timestamp($allocation['to_']);
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
- phpgwapi_jquery::init_ckeditor('field-message');
+ self::rich_text_editor('field-message');
self::render_template_xsl('allocation_cancel',
array('allocation' => $allocation));
}
else
@@ -326,7 +326,7 @@
if ($step < 2)
{
-
phpgwapi_jquery::init_ckeditor('field-message');
+ self::rich_text_editor('field-message');
self::render_template_xsl('allocation_delete', array('allocation' =>
$allocation,
'recurring' => $recurring,
'outseason' => $outseason,
Modified: trunk/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uibooking.inc.php 2016-03-15 08:40:14 UTC
(rev 14837)
+++ trunk/bookingfrontend/inc/class.uibooking.inc.php 2016-03-15 12:33:24 UTC
(rev 14838)
@@ -860,7 +860,7 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule',
'id' =>
$allocation['building_id']));
- phpgwapi_jquery::init_ckeditor('field-message');
+ self::rich_text_editor('field-message');
self::render_template_xsl('booking_cancel',
array('booking' => $booking));
}
else
@@ -1115,7 +1115,7 @@
if ($step < 2)
{
-
phpgwapi_jquery::init_ckeditor('field-message');
+ self::rich_text_editor('field-message');
self::render_template_xsl('booking_delete', array('booking' => $booking,
'recurring' => $recurring,
'outseason' => $outseason,
Modified: trunk/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uievent.inc.php 2016-03-15 08:40:14 UTC
(rev 14837)
+++ trunk/bookingfrontend/inc/class.uievent.inc.php 2016-03-15 12:33:24 UTC
(rev 14838)
@@ -264,7 +264,7 @@
$event['from_'] = pretty_timestamp($event['from_']);
$event['to_'] = pretty_timestamp($event['to_']);
- phpgwapi_jquery::init_ckeditor('field-message');
+ self::rich_text_editor('field-message');
self::render_template_xsl('event_delete', array('event'
=> $event, 'activities' => $activities,
'can_delete_events' => $can_delete_events));
Modified: trunk/bookingfrontend/inc/class.uisystem_message.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uisystem_message.inc.php 2016-03-15
08:40:14 UTC (rev 14837)
+++ trunk/bookingfrontend/inc/class.uisystem_message.inc.php 2016-03-15
12:33:24 UTC (rev 14838)
@@ -23,7 +23,7 @@
public function show()
{
parent::show();
- phpgwapi_jquery::init_ckeditor('field-message');
+ self::rich_text_editor('field-message');
}
public function edit()
@@ -65,7 +65,7 @@
}
$this->flash_form_errors($errors);
- phpgwapi_jquery::init_ckeditor('field-message');
+ self::rich_text_editor('field-message');
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
'file'));
Modified: trunk/email/templates/base/addressbook-js.tpl
===================================================================
--- trunk/email/templates/base/addressbook-js.tpl 2016-03-15 08:40:14 UTC
(rev 14837)
+++ trunk/email/templates/base/addressbook-js.tpl 2016-03-15 12:33:24 UTC
(rev 14838)
@@ -352,7 +352,7 @@
<td colspan="5" valign="middle">
<div ID="wait">
<center>
- <font style="font-weight=bold;
font-family=Helvetica,Arial,sans-serif">
+ <font style="font-weight:bold;
font-family:Helvetica,Arial,sans-serif">
Please Wait!
</font>
</div>
Modified: trunk/email/templates/base/debug.tpl
===================================================================
--- trunk/email/templates/base/debug.tpl 2016-03-15 08:40:14 UTC (rev
14837)
+++ trunk/email/templates/base/debug.tpl 2016-03-15 12:33:24 UTC (rev
14838)
@@ -9,15 +9,15 @@
margin-left: 4px;
margin-bottom: 4px;
- #font-family: "Courier New", Courier, fixed;
- #font-family: "lucida console", Courier, fixed;
+ /*font-family: "Courier New", Courier, fixed;*/
+ /*font-family: "lucida console", Courier, fixed;*/
font-family: "lucida", Courier, fixed;
- #font-size: 0.8em;
+ /*font-size: 0.8em;*/
font-size: 0.9em;
- #font-size: 1.0em;
+ /*font-size: 1.0em;*/
- # font-weight: bold;
+ /* font-weight: bold;*/
}
-->
</style>
Modified: trunk/email/templates/base/spell_review.tpl
===================================================================
--- trunk/email/templates/base/spell_review.tpl 2016-03-15 08:40:14 UTC (rev
14837)
+++ trunk/email/templates/base/spell_review.tpl 2016-03-15 12:33:24 UTC (rev
14838)
@@ -4,12 +4,12 @@
<!--
P.spell_review
{
- ## display: inline;
- ## font-size: 1.2em;
+ /* display: inline;*/
+ /* font-size: 1.2em;*/
vertical-align: middle;
- ## line-height: 1.8em;
- ## padding: 1.8em;
- ## margin: 1.8em;
+ /* line-height: 1.8em;*/
+ /* padding: 1.8em;*/
+ /* margin: 1.8em;*/
}
-->
</style>
Modified: trunk/frontend/templates/base/base.css
===================================================================
--- trunk/frontend/templates/base/base.css 2016-03-15 08:40:14 UTC (rev
14837)
+++ trunk/frontend/templates/base/base.css 2016-03-15 12:33:24 UTC (rev
14838)
@@ -42,14 +42,14 @@
#header-search .query { width: 15em;}
.frontend_content {
- //background: url(../images/header_bg.png) repeat-x;
- //height: 129px;
+/* background: url(../images/header_bg.png) repeat-x;
+ height: 129px;*/
display: inline-block;
width: 100%;
}
.frontend_content a {
- //float: left;
+ /*float: left;*/
}
div#logo {
width: 125px;
@@ -71,7 +71,7 @@
font-size: 90%;
}
ul.nav {
- list-style-type: 0;
+ list-style-type: none;
padding-left: 0;
}
div.clr {clear: both;}
@@ -82,7 +82,7 @@
#login-bar {
clear: right;
float: right;
- //padding: .5em 1em 0 0;
+ /*padding: .5em 1em 0 0;*/
}
form#search {
text-align: center;
@@ -321,18 +321,18 @@
div#unit_selector {
float: left;
- //list-style:none;
- //padding: 2px;
- //padding-left: 5px;
- //padding:0.5em 1em 0 0;
+ /*list-style:none;
+ padding: 2px;
+ padding-left: 5px;
+ padding:0.5em 1em 0 0;*/
}
div#area_and_price2 {
float: left;
- //list-style:none;
- //padding: 2px;
- //padding-left: 5px;
- //padding:0.5em 1em 0 0;
+ /*list-style:none;
+ padding: 2px;
+ padding-left: 5px;
+ padding:0.5em 1em 0 0;*/
}
div#all_units_key_data {
@@ -394,7 +394,7 @@
.user_menu {
list-style:none;
height: 100%;
- //padding: 2px;
+ /*padding: 2px;*/
border-style: none none none solid;
border-width: 1px;
border-color: grey;
@@ -408,10 +408,10 @@
#area_and_price {
list-style:none;
height: 100%;
- //padding: 2px;
- //padding-left: 5px;
+ /*padding: 2px;*/
+ /*padding-left: 5px;*/
float:right;
- //padding:0.5em 1em 0 0;
+ /*padding:0.5em 1em 0 0;*/
}
#area_and_price li {
@@ -421,10 +421,10 @@
#org_units {
list-style: none;
height: 100%;
- //padding: 2px;
- //padding-left: 5px;
+ /*padding: 2px;*/
+ /*padding-left: 5px;*/
float:right;
- //padding:0.5em 1em 0 0;
+ /*padding:0.5em 1em 0 0;*/
}
#org_units li {
@@ -434,10 +434,10 @@
#information {
list-style:none;
height: 100%;
- //padding: 2px;
- //padding-left: 5px;
+ /*padding: 2px;*/
+ /*padding-left: 5px;*/
float:right;
- //padding:0.5em 1em 0 0;
+ /*padding:0.5em 1em 0 0;*/
}
#information li {
@@ -452,12 +452,12 @@
#logo_holder {
float: left;
border: 0 none;
- //font-family:Arial,sans-serif;
- //font-size:65%;
- //line-height:1.166;
+ /*font-family:Arial,sans-serif;
+ font-size:65%;
+ line-height:1.166;*/
padding-top: 0.5em;
padding-left: 0.5em;
- //position: absolute;
+ /*position: absolute;*/
}
em#bold {
Modified: trunk/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.uicommon_jquery.inc.php 2016-03-15 08:40:14 UTC
(rev 14837)
+++ trunk/phpgwapi/inc/class.uicommon_jquery.inc.php 2016-03-15 12:33:24 UTC
(rev 14838)
@@ -36,9 +36,9 @@
const UI_SESSION_FLASH = 'flash_msgs';
protected
- $filesArray,
- $ui_session_key,
- $flash_msgs;
+ $filesArray,
+ $ui_session_key,
+ $flash_msgs;
public $dateFormat;
public $type_of_user;
@@ -314,7 +314,7 @@
$to = lang('to');
$shows_from = lang('shows from');
$of_total = lang('of total');
- $sort_asc = lang(': activate to sort column
ascending');
+ $sort_asc = lang(': activate to sort column ascending');
$sort_desc = lang(': activate to sort column
descending');
if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
@@ -485,6 +485,12 @@
*/
public function rich_text_editor( $targets )
{
+ if
(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['rteditor'])
+ ||
$GLOBALS['phpgw_info']['user']['preferences']['common']['rteditor'] !=
'ckeditor')
+ {
+ return;
+ }
+
if (!is_array($targets))
{
$targets = array($targets);
@@ -796,11 +802,11 @@
foreach (array_keys($data['name']) as $key)
{
$files[$key] = self::fix_php_files_array(array(
- 'error' => $data['error'][$key],
- 'name' => $data['name'][$key],
- 'type' => $data['type'][$key],
- 'tmp_name' => $data['tmp_name'][$key],
- 'size' => $data['size'][$key],
+ 'error' => $data['error'][$key],
+ 'name' => $data['name'][$key],
+ 'type' => $data['type'][$key],
+ 'tmp_name' =>
$data['tmp_name'][$key],
+ 'size' => $data['size'][$key],
));
}
Modified: trunk/preferences/inc/hook_settings.inc.php
===================================================================
--- trunk/preferences/inc/hook_settings.inc.php 2016-03-15 08:40:14 UTC (rev
14837)
+++ trunk/preferences/inc/hook_settings.inc.php 2016-03-15 12:33:24 UTC (rev
14838)
@@ -143,8 +143,7 @@
$rteditors = array
(
'none' => lang('none'),
- 'fckeditor' => 'FCKeditor',
- 'tinymce' => 'tinyMCE'
+ 'ckeditor' => 'CKeditor'
);
create_select_box('Rich text (WYSIWYG) editor', 'rteditor', $rteditors,
'Which editor would you like to use for editing html and other
rich content?');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14838] configurable rich text editor,
Sigurd Nes <=