[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6710] Property: formatting: intend
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6710] Property: formatting: intend |
|
Date: |
Mon, 27 Dec 2010 15:07:02 +0000 |
Revision: 6710
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6710
Author: sigurdne
Date: 2010-12-27 15:07:01 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
Property: formatting: intend
Modified Paths:
--------------
trunk/property/inc/hook_config.inc.php
trunk/property/inc/hook_help.inc.php
trunk/property/inc/hook_home.inc.php
trunk/property/inc/hook_manual.inc.php
trunk/property/inc/hook_settings.inc.php
Modified: trunk/property/inc/hook_config.inc.php
===================================================================
--- trunk/property/inc/hook_config.inc.php 2010-12-27 13:17:08 UTC (rev
6709)
+++ trunk/property/inc/hook_config.inc.php 2010-12-27 15:07:01 UTC (rev
6710)
@@ -12,19 +12,19 @@
*/
/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
/**
@@ -47,7 +47,7 @@
}
$out .= <<<HTML
- <tr><td><input type="checkbox"
name="newsettings[fmttssimple_group][]" value="{$group}"
{$checked}><label>{$label}</label></td></tr>
+ <tr><td><input type="checkbox"
name="newsettings[fmttssimple_group][]" value="{$group}"
{$checked}><label>{$label}</label></td></tr>
HTML;
}
return $out;
@@ -73,7 +73,7 @@
}
$out .= <<<HTML
- <tr><td><input type="checkbox"
name="newsettings[fmtts_group_finnish_date][]" value="{$group}"
{$checked}><label>{$label}</label></td></tr>
+ <tr><td><input type="checkbox"
name="newsettings[fmtts_group_finnish_date][]" value="{$group}"
{$checked}><label>{$label}</label></td></tr>
HTML;
}
return $out;
@@ -135,7 +135,7 @@
}
$out .= <<<HTML
- <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
+ <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
HTML;
}
@@ -164,7 +164,7 @@
}
$out .= <<<HTML
- <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
+ <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
HTML;
}
Modified: trunk/property/inc/hook_help.inc.php
===================================================================
--- trunk/property/inc/hook_help.inc.php 2010-12-27 13:17:08 UTC (rev
6709)
+++ trunk/property/inc/hook_help.inc.php 2010-12-27 15:07:01 UTC (rev
6710)
@@ -24,19 +24,19 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage manual
- * @version $Id$
+ * @version $Id$
*/
/**
- * Description
- */
+ * Description
+ */
include(PHPGW_SERVER_ROOT.'/'.'property'.'/setup/setup.inc.php');
$GLOBALS['phpgw']->help->set_params(array('app_name' =>
'property',
-
'title' => lang('property'),
-
'app_version' => $setup_info['property']['version']));
+ 'title' => lang('property'),
+ 'app_version' => $setup_info['property']['version']));
$GLOBALS['phpgw']->help->data[] = array
(
'text' => lang('overview'),
Modified: trunk/property/inc/hook_home.inc.php
===================================================================
--- trunk/property/inc/hook_home.inc.php 2010-12-27 13:17:08 UTC (rev
6709)
+++ trunk/property/inc/hook_home.inc.php 2010-12-27 15:07:01 UTC (rev
6710)
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id$
+ * @version $Id$
*/
@@ -33,12 +33,12 @@
$GLOBALS['phpgw_info']['flags']['currentapp'] = 'property';
$maxmatches =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] =
5;
-
+
$prefs = $GLOBALS['phpgw_info']['user']['preferences'];
if ( isset($prefs['property']['mainscreen_show_new_updated_tts'])
- && $prefs['property']['mainscreen_show_new_updated_tts'] ==
'yes')
+ && $prefs['property']['mainscreen_show_new_updated_tts'] == 'yes')
{
$default_status =
isset($prefs['property']['tts_status']) ? $prefs['property']['tts_status'] : '';
@@ -73,7 +73,7 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$category_name = array(); // caching
@@ -118,7 +118,7 @@
if ( isset($prefs['property']['mainscreen_show_new_updated_tts_2'])
- && $prefs['property']['mainscreen_show_new_updated_tts_2'] ==
'yes')
+ && $prefs['property']['mainscreen_show_new_updated_tts_2'] == 'yes')
{
$default_status =
isset($prefs['property']['tts_status_2']) ? $prefs['property']['tts_status_2']
: '';
@@ -153,7 +153,7 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$category_name = array(); // caching
@@ -199,7 +199,7 @@
if ( isset($prefs['property']['mainscreen_show_new_updated_tts_3'])
- && $prefs['property']['mainscreen_show_new_updated_tts_3'] ==
'yes')
+ && $prefs['property']['mainscreen_show_new_updated_tts_3'] == 'yes')
{
$default_status =
isset($prefs['property']['tts_status_3']) ? $prefs['property']['tts_status_3']
: '';
@@ -234,7 +234,7 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$category_name = array(); // caching
@@ -278,7 +278,7 @@
}
if ( isset($prefs['property']['mainscreen_show_new_updated_tts_4'])
- && $prefs['property']['mainscreen_show_new_updated_tts_4'] ==
'yes')
+ && $prefs['property']['mainscreen_show_new_updated_tts_4'] == 'yes')
{
$default_status =
isset($prefs['property']['tts_status_4']) ? $prefs['property']['tts_status_4']
: '';
@@ -313,28 +313,28 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
- $status = array();
- $status['X'] = array
- (
- 'name' =>
lang('closed'),
- );
- $status['O'] = array
- (
- 'name' => lang('open'),
- );
+ $status = array();
+ $status['X'] = array
+ (
+ 'name' => lang('closed'),
+ );
+ $status['O'] = array
+ (
+ 'name' => lang('open'),
+ );
- $custom_status =
execMethod('property.botts.get_custom_status');
+ $custom_status =
execMethod('property.botts.get_custom_status');
- foreach($custom_status as $custom)
- {
- $status["C{$custom['id']}"] = array
- (
- 'status'
=> $custom['name'],
- );
- }
+ foreach($custom_status as $custom)
+ {
+ $status["C{$custom['id']}"] = array
+ (
+ 'status' =>
$custom['name'],
+ );
+ }
$category_name = array(); // caching
@@ -370,7 +370,7 @@
}
if ( isset($prefs['property']['mainscreen_project_1'])
- && $prefs['property']['mainscreen_project_1'] == 'yes')
+ && $prefs['property']['mainscreen_project_1'] == 'yes')
{
$default_status =
isset($prefs['property']['project_status_mainscreen_1']) ?
$prefs['property']['project_status_mainscreen_1'] : '';
@@ -405,7 +405,7 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$portalbox->data = array();
@@ -426,7 +426,7 @@
}
if ( isset($prefs['property']['mainscreen_workorder_1'])
- && $prefs['property']['mainscreen_workorder_1'] == 'yes')
+ && $prefs['property']['mainscreen_workorder_1'] == 'yes')
{
$default_status =
isset($prefs['property']['workorder_status_mainscreen_1']) ?
$prefs['property']['workorder_status_mainscreen_1'] : '';
@@ -461,7 +461,7 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$portalbox->data = array();
@@ -481,7 +481,7 @@
unset($default_status);
}
if ( isset($prefs['property']['mainscreen_workorder_2'])
- && $prefs['property']['mainscreen_workorder_2'] == 'yes')
+ && $prefs['property']['mainscreen_workorder_2'] == 'yes')
{
$default_status =
isset($prefs['property']['workorder_status_mainscreen_2']) ?
$prefs['property']['workorder_status_mainscreen_2'] : '';
@@ -516,7 +516,7 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$portalbox->data = array();
@@ -537,11 +537,11 @@
}
if ( isset($prefs['property']['mainscreen_showapprovals_request'])
- && $prefs['property']['mainscreen_showapprovals_request'] ==
'yes' )
+ && $prefs['property']['mainscreen_showapprovals_request'] == 'yes' )
{
$total_records = 0;
$title =
isset($prefs['property']['mainscreen_showapprovals_request_title']) &&
$prefs['property']['mainscreen_showapprovals_request_title']?
"{$prefs['property']['mainscreen_showapprovals_request_title']}
({$total_records})" : lang('approvals request') . " ({$total_records})";
-
+
//TODO Make listbox css compliant
$portalbox = CreateObject('phpgwapi.listbox', array
(
@@ -572,14 +572,14 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$action_params = array
(
'appname' => 'property',
'location' => '.project',
- // 'id' => $id,
+ // 'id' => $id,
'responsible' => '',
'responsible_type' => 'user',
'action' => 'approval',
@@ -605,7 +605,7 @@
(
'appname' => 'property',
'location' => '.project.workorder',
- // 'id' => $id,
+ // 'id' => $id,
'responsible' => '',
'responsible_type' => 'user',
'action' => 'approval',
@@ -629,7 +629,7 @@
(
'appname' => 'property',
'location' => '.ticket',
- // 'id' => $id,
+ // 'id' => $id,
'responsible' => '',
'responsible_type' => 'user',
'action' => 'approval',
@@ -649,7 +649,7 @@
'link' => $entry['url']
);
}
-
+
echo "\n".'<!-- BEGIN approval info
-->'."\n".$portalbox->draw()."\n".'<!-- END approval info -->'."\n";
unset($portalbox);
unset($obj);
@@ -657,7 +657,7 @@
}
if ( isset($prefs['property']['mainscreen_showapprovals'])
- && $prefs['property']['mainscreen_showapprovals'] == 'yes' )
+ && $prefs['property']['mainscreen_showapprovals'] == 'yes' )
{
$total_records = 0;
$title = 'dummy';
@@ -691,14 +691,14 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$action_params = array
(
'appname' => 'property',
'location' => '.project',
- // 'id' => $id,
+ // 'id' => $id,
'responsible' => $accound_id,
'responsible_type' => 'user',
'action' => 'approval',
@@ -718,14 +718,14 @@
);
$total_records++;
}
-
-// echo "\n".'<!-- BEGIN approval info
-->'."\n".$portalbox->draw()."\n".'<!-- END approval info -->'."\n";
+ // echo "\n".'<!-- BEGIN approval info
-->'."\n".$portalbox->draw()."\n".'<!-- END approval info -->'."\n";
+
$action_params = array
(
'appname' => 'property',
'location' => '.project.workorder',
- // 'id' => $id,
+ // 'id' => $id,
'responsible' => $accound_id,
'responsible_type' => 'user',
'action' => 'approval',
@@ -735,7 +735,7 @@
$pending_approvals =
execMethod('property.sopending_action.get_pending_action', $action_params);
-// $portalbox->data = array();
+ // $portalbox->data = array();
foreach ($pending_approvals as $entry)
{
$portalbox->data[] = array
@@ -750,7 +750,7 @@
(
'appname' => 'property',
'location' => '.ticket',
- // 'id' => $id,
+ // 'id' => $id,
'responsible' => $accound_id,
'responsible_type' => 'user',
'action' => 'approval',
@@ -760,7 +760,7 @@
$pending_approvals =
execMethod('property.sopending_action.get_pending_action', $action_params);
-// $portalbox->data = array();
+ // $portalbox->data = array();
foreach ($pending_approvals as $entry)
{
$portalbox->data[] = array
@@ -774,14 +774,14 @@
$title =
isset($prefs['property']['mainscreen_showapprovals_title']) &&
$prefs['property']['mainscreen_showapprovals_title']?
"{$prefs['property']['mainscreen_showapprovals_title']} ({$total_records})" :
lang('approvals') . " ({$total_records})";
$portalbox->setvar('title', $title);
$portalbox->start_template();
-
+
echo "\n".'<!-- BEGIN approval info
-->'."\n".$portalbox->draw()."\n".'<!-- END approval info -->'."\n";
unset($portalbox);
unset($pending_approvals);
}
if ( isset($prefs['property']['mainscreen_showvendor_reminder'])
- && $prefs['property']['mainscreen_showvendor_reminder'] ==
'yes' )
+ && $prefs['property']['mainscreen_showvendor_reminder'] == 'yes' )
{
$total_records = 0;
$title = 'dummy';
@@ -814,14 +814,14 @@
foreach ( $var as $key => $value )
{
-// $portalbox->set_controls($key,$value);
+ //
$portalbox->set_controls($key,$value);
}
$action_params = array
(
'appname' => 'property',
'location' => '.project.workorder',
- // 'id' => $id,
+ // 'id' => $id,
'responsible' => '',
'responsible_type' => 'vendor',
'action' => 'remind',
@@ -847,7 +847,7 @@
);
$total_records++;
}
-
+
$title =
isset($prefs['property']['mainscreen_showvendor_reminder_title']) &&
$prefs['property']['mainscreen_showvendor_reminder_title']?
"{$prefs['property']['mainscreen_showvendor_reminder_title']}
({$total_records})" : lang('vendor reminder') . " ({$total_records})";
$portalbox->setvar('title', $title);
$portalbox->start_template();
@@ -856,7 +856,7 @@
unset($pending_reminder);
unset($portalbox);
}
-
+
$GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] =
$maxmatches;
Modified: trunk/property/inc/hook_manual.inc.php
===================================================================
--- trunk/property/inc/hook_manual.inc.php 2010-12-27 13:17:08 UTC (rev
6709)
+++ trunk/property/inc/hook_manual.inc.php 2010-12-27 15:07:01 UTC (rev
6710)
@@ -24,11 +24,12 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id$
+ * @version $Id$
*/
// Only Modify the $file variable.....
- $file = Array(
+ $file = array
+ (
'Location'
=> 'location.php',
'Entities'
=> 'entities.php',
'Project management' =>
'project.php',
@@ -38,6 +39,6 @@
'Document register/Drawing register' => 'document.php',
'Helpdesk'
=> 'helpdesk.php'
);
-//Do not modify below this line
+ //Do not modify below this line
display_manual_section($appname,$file);
Modified: trunk/property/inc/hook_settings.inc.php
===================================================================
--- trunk/property/inc/hook_settings.inc.php 2010-12-27 13:17:08 UTC (rev
6709)
+++ trunk/property/inc/hook_settings.inc.php 2010-12-27 15:07:01 UTC (rev
6710)
@@ -24,20 +24,22 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id$
+ * @version $Id$
*/
- $select_property_filter = array(
+ $select_property_filter =array
+ (
'' => lang('Owner type'),
'owner' => lang('Owner')
);
create_select_box('Choose property
filter','property_filter',$select_property_filter,'Filter by owner or owner
type');
- $yes_and_no = array(
+ $yes_and_no =array
+ (
'yes' => 'Yes',
- 'no' => 'No'
+ 'no' => 'No'
);
create_select_box('Group filters in single
query','group_filters',$yes_and_no,'Group filters - means that one has to hit
the search button to apply the filter');
@@ -98,7 +100,7 @@
create_select_box('Default updated ticket status when creating
project','tts_status_create_project',$_status_tts,'The default status when
entering the helpdesk and mainscreen');
create_select_box('Autocreate project from
ticket','auto_create_project_from_ticket',$yes_and_no);
-
+
create_select_box('your projects on main screen - list
1','mainscreen_project_1',$yes_and_no,'Link to your projects');
create_select_box('Default project status
1','project_status_mainscreen_1',$_status_project,'The default status for list
1 when entering the mainscreen');
create_input_box('Custom title on projects on main screen - list
1','mainscreen_projects_1_title');
@@ -173,7 +175,8 @@
unset($sotts);
create_select_box('default ticket
categories','tts_category',$_categories_tts,'The default category for TTS');
- $yes_and_no = array(
+ $yes_and_no =array
+ (
'1' => 'Yes',
'2' => 'No'
);
@@ -192,13 +195,14 @@
create_select_box('Send order receipt as email
','order_email_rcpt',$yes_and_no,'Send the order as BCC to the user');
create_select_box('Notify owner of project/order on
change','notify_project_owner',$yes_and_no,'By email');
- $default_start_page = array(
+ $default_start_page =array
+ (
'location' => lang('Location'),
'project' => lang('Project'),
'tts' => lang('Ticket'),
'invoice' => lang('Invoice'),
'document'=> lang('Document')
- );
+ );
create_select_box('Default start
page','default_start_page',$default_start_page,'Select your start-submodule');
$socommon= CreateObject('property.socommon');
@@ -253,7 +257,7 @@
create_select_box('Workorder Approval
From','approval_from',$_accounts,'If you need approval from your supervisor for
projects/workorders');
-// if(!$email_org)
+ // if(!$email_org)
{
create_input_box('Your Email','email','Insert your email
address');
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6710] Property: formatting: intend,
Sigurd Nes <=