[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7956]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [7956] |
|
Date: |
Thu, 27 Oct 2011 08:12:03 +0000 |
Revision: 7956
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7956
Author: erikhl
Date: 2011-10-27 08:12:01 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_group.inc.php
trunk/controller/inc/class.uicommon.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/control.xsl
trunk/controller/templates/base/procedure_item.xsl
Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php 2011-10-26 18:56:10 UTC
(rev 7955)
+++ trunk/controller/inc/class.socontrol_group.inc.php 2011-10-27 08:12:01 UTC
(rev 7956)
@@ -361,7 +361,7 @@
$tables = "controller_control_group";
$joins = " {$this->left_join} fm_building_part ON
(building_part_id = CAST(fm_building_part.id AS INT))";
$joins .= " {$this->left_join} controller_procedure ON
(controller_control_group.procedure_id = controller_procedure.id)";
- $joins .= " {$this->left_join} controller_control_area ON
(control_area_id = controller_control_area.id)";
+ $joins .= " {$this->left_join} controller_control_area ON
(controller_control_group.control_area_id = controller_control_area.id)";
//$joins .= " {$this->left_join} rental_contract_composite ON
(rental_contract_composite.composite_id = rental_composite.id)";
//$joins .= " {$this->left_join} rental_contract ON
(rental_contract.id = rental_contract_composite.contract_id)";
@@ -371,7 +371,7 @@
}
else
{
- $cols .= "controller_control_group.id, group_name,
controller_control_group.procedure_id, control_area_id, building_part_id,
fm_building_part.descr AS building_part_descr, controller_procedure.title as
procedure_title, controller_control_area.title as control_area_name ";
+ $cols .= "controller_control_group.id, group_name,
controller_control_group.procedure_id,
controller_control_group.control_area_id, building_part_id,
fm_building_part.descr AS building_part_descr, controller_procedure.title as
procedure_title, controller_control_area.title as control_area_name ";
}
$dir = $ascending ? 'ASC' : 'DESC';
$order = $sort_field ? "ORDER BY {$this->marshal($sort_field,
'field')} $dir ": '';
Modified: trunk/controller/inc/class.uicommon.inc.php
===================================================================
--- trunk/controller/inc/class.uicommon.inc.php 2011-10-26 18:56:10 UTC (rev
7955)
+++ trunk/controller/inc/class.uicommon.inc.php 2011-10-27 08:12:01 UTC (rev
7956)
@@ -480,6 +480,67 @@
);
}
+ public function use_yui_editor($targets)
+ {
+ /*
+
self::add_stylesheet('phpgwapi/js/yahoo/assets/skins/sam/skin.css');
+ self::add_javascript('yahoo', 'yahoo/editor',
'simpleeditor-min.js');
+ */
+ $lang_font_style = lang('Font Style');
+ $lang_lists = lang('Lists');
+ $lang_insert_item = lang('Insert Item');
+ $js = '';
+ foreach ( $targets as $target )
+ {
+ $js .= <<<SCRIPT
+ (function() {
+ var Dom = YAHOO.util.Dom,
+ Event = YAHOO.util.Event;
+
+ var editorConfig = {
+ toolbar:
+ {buttons: [
+ { group: 'textstyle',
label: '{$lang_font_style}',
+ buttons: [
+ { type: 'push',
label: 'Fet CTRL + SHIFT + B', value: 'bold' }
+ ]
+ },
+ { type: 'separator' },
+ { group: 'indentlist',
label: '{$lang_lists}',
+ buttons: [
+ { type: 'push',
label: 'Opprett punktliste', value: 'insertunorderedlist' },
+ { type: 'push',
label: 'Opprett nummerert liste', value: 'insertorderedlist' }
+ ]
+ },
+ { type: 'separator' },
+ { group: 'insertitem',
label: '{$lang_insert_item}',
+ buttons: [
+ { type:
'push', label: 'HTML Lenke CTRL + SHIFT + L', value: 'createlink', disabled:
true },
+ { type:
'push', label: 'Sett inn bilde', value: 'insertimage' }
+ ]
+ }
+ ]
+ },
+ height: '200px',
+ width: '700px',
+ animate: true,
+ dompath: true,
+ handleSubmit: true,
+ };
+
+ var editorWidget = new
YAHOO.widget.Editor('{$target}', editorConfig);
+ editorWidget.render();
+ })();
+
+SCRIPT;
+ }
+
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/editor/assets/skins/sam/editor.css');
+ phpgw::import_class('phpgwapi.yui');
+ phpgwapi_yui::load_widget('editor');
+ $GLOBALS['phpgw']->js->add_event('load', $js);
+ }
+
/**
* Returns formatted version of gab id. The format of the
string returned
* is '[Cadastral unit number] / [Property unit number] /
[Leasehold unit number] / [Section unit number]'.
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2011-10-26 18:56:10 UTC
(rev 7955)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2011-10-27 08:12:01 UTC
(rev 7956)
@@ -266,11 +266,11 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Procedure');
-
$GLOBALS['phpgw']->richtext->replace_element('purpose');
- //$this->use_yui_editor();
-
$GLOBALS['phpgw']->richtext->replace_element('description');
+
//$GLOBALS['phpgw']->richtext->replace_element('purpose');
+
$this->use_yui_editor(array('purpose','description'));
+
//$GLOBALS['phpgw']->richtext->replace_element('description');
//$GLOBALS['phpgw']->richtext->generate_script(true);
- $GLOBALS['phpgw']->richtext->generate_script();
+
//$GLOBALS['phpgw']->richtext->generate_script();
// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'controller.item', 'controller' );
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2011-10-26 18:56:10 UTC (rev
7955)
+++ trunk/controller/setup/phpgw_no.lang 2011-10-27 08:12:01 UTC (rev
7956)
@@ -226,7 +226,7 @@
t_new_procedure controller no Ny prosedyre
f_new_procedure controller no Legg til
Procedure purpose controller no Formål
-Procedure responsibility controller no Ansvarlig
+Procedure responsibility controller no Ansvar og myndighet
Procedure description controller no Beskrivelse
Procedure reference controller no Referanse
Procedure attachment controller no Vedlegg
@@ -257,5 +257,8 @@
Control_equipment controller no Utstyr
New control controller no Ny kontroll
revisit controller no Revidér
-Procedure revision controller no Revisjon
-Procedure revision date controller no Revisjonsdato
\ No newline at end of file
+Procedure revision controller no Versjon
+Procedure revision date controller no Revisjonsdato
+Font Style controller no Font stil
+Lists controller no Lister
+Insert Item controller no Sett inn
\ No newline at end of file
Modified: trunk/controller/templates/base/control.xsl
===================================================================
--- trunk/controller/templates/base/control.xsl 2011-10-26 18:56:10 UTC (rev
7955)
+++ trunk/controller/templates/base/control.xsl 2011-10-27 08:12:01 UTC (rev
7956)
@@ -110,11 +110,10 @@
<dd>
<select id="repeat_type"
name="repeat_type">
<option value="0">Ikke
angitt</option>
- <option
value="1">Daglig</option>
- <option
value="2">Ukentlig</option>
- <option value="3">Månedlig pr
dato</option>
- <option value="4">Månedlig pr
dag</option>
- <option value="5">Årlig</option>
+ <option value="1">Dag</option>
+ <option value="2">Uke</option>
+ <option value="3">Måned</option>
+ <option value="5">År</option>
</select>
</dd>
<dt>
Modified: trunk/controller/templates/base/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure_item.xsl 2011-10-26 18:56:10 UTC
(rev 7955)
+++ trunk/controller/templates/base/procedure_item.xsl 2011-10-27 08:12:01 UTC
(rev 7956)
@@ -67,6 +67,7 @@
<xsl:choose>
<xsl:when test="editable">
<select
id="control_area" name="control_area">
+ <option
value="0">Ingen valgt</option>
<xsl:apply-templates select="control_area/options"/>
</select>
</xsl:when>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7956],
Erik Holm-Larsen <=