[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6637] merge 6635:6636 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6637] merge 6635:6636 from trunk |
|
Date: |
Thu, 25 Nov 2010 09:20:13 +0000 |
Revision: 6637
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6637
Author: sigurdne
Date: 2010-11-25 09:20:13 +0000 (Thu, 25 Nov 2010)
Log Message:
-----------
merge 6635:6636 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/templates/portico/navbar.inc.php
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/config.tpl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6627,6629-6631,6633-6634
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6627,6629-6631,6633-6634,6636
Modified: branches/Version-1_0-branch/phpgwapi/templates/portico/navbar.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/portico/navbar.inc.php
2010-11-25 09:18:18 UTC (rev 6636)
+++ branches/Version-1_0-branch/phpgwapi/templates/portico/navbar.inc.php
2010-11-25 09:20:13 UTC (rev 6637)
@@ -209,9 +209,14 @@
HTML;
}
+ $target = '';
+ if(isset($item['target']))
+ {
+ $target = "target = '{$item['target']}'";
+ }
return <<<HTML
$out
- <a
href="{$item['url']}"{$link_class}{$icon_style} id="{$id}">
+ <a
href="{$item['url']}"{$link_class}{$icon_style} id="{$id}" {$target}>
<span>{$item['text']}</span>
</a>
{$children}
Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2010-11-25
09:18:18 UTC (rev 6636)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2010-11-25
09:20:13 UTC (rev 6637)
@@ -872,6 +872,19 @@
'text' => lang('gallery')
);
+ $config = CreateObject('phpgwapi.config',
'property');
+ $config->read();
+ $local_files =
isset($config->config_data['documentation_local_files']) &&
$config->config_data['documentation_local_files'] ?
$config->config_data['documentation_local_files'] : '';
+
+ if($local_files)
+ {
+
$menus['navigation']['documentation']['children']['local_files'] = array
+ (
+ 'url' =>
"file:{$local_files}",
+ 'text' => lang('local files'),
+ 'target'=> '_blank'
+ );
+ }
}
if ( $acl->check('.custom', PHPGW_ACL_READ, 'property')
)
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2010-11-25
09:18:18 UTC (rev 6636)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2010-11-25
09:20:13 UTC (rev 6637)
@@ -957,6 +957,7 @@
list workorder property no List arbeidsordre
location property no Lokalisering
loc1_name property no Navn
+local files property no Lokale filer
location changed property no Lokalisering er endret
location code property no Lokaliserings kode
location_code property no Lokaliserings kode
Modified: branches/Version-1_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/config.tpl
2010-11-25 09:18:18 UTC (rev 6636)
+++ branches/Version-1_0-branch/property/templates/base/config.tpl
2010-11-25 09:20:13 UTC (rev 6637)
@@ -155,6 +155,11 @@
<td><input name="newsettings[files_url]" value="{value_files_url}"></td>
</tr>
<tr class="row_on">
+ <td>{lang_local_files_at_documentation}:<br>
+ {lang_Example}: "///C|/temp" </td>
+ <td><input name="newsettings[documentation_local_files]"
value="{value_documentation_local_files}"></td>
+ </tr>
+ <tr class="row_on">
<td>{lang_Path_to_external_files_for_use_with_location}:<br>
{lang_On_windows_use}: "//computername/share" {lang_or}
"\\\\computername\share"</td>
<td><input name="newsettings[external_files]"
value="{value_external_files}"></td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6637] merge 6635:6636 from trunk,
Sigurd Nes <=