[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17510] Stable: Merge 17492:17509 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17510] Stable: Merge 17492:17509 from trunk |
|
Date: |
Tue, 9 Jan 2018 04:12:01 -0500 (EST) |
Revision: 17510
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17510
Author: sigurdne
Date: 2018-01-09 04:12:00 -0500 (Tue, 09 Jan 2018)
Log Message:
-----------
Stable: Merge 17492:17509 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/admin/setup/phpgw_no.lang
branches/Version-2_0-branch/admin/templates/base/config.tpl
branches/Version-2_0-branch/booking/js/base/common.js
branches/Version-2_0-branch/booking/setup/phpgw_no.lang
branches/Version-2_0-branch/booking/templates/base/application.xsl
branches/Version-2_0-branch/booking/templates/base/application_edit.xsl
branches/Version-2_0-branch/booking/templates/base/application_new.xsl
branches/Version-2_0-branch/booking/templates/base/config.tpl
branches/Version-2_0-branch/bookingfrontend/setup/phpgw_no.lang
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building.xsl
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/organization.xsl
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
branches/Version-2_0-branch/demo/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/felamimail/setup/egw_no.lang
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/logistic/setup/phpgw_no.lang
branches/Version-2_0-branch/phpgwapi/doc/Vagrantfile
branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-2_0-branch/phpgwapi/templates/aalesund/css/sample.css
branches/Version-2_0-branch/phpgwapi/templates/aalesund/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/aalesund/head.tpl
branches/Version-2_0-branch/phpgwapi/templates/aalesund/js/sample.js
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/idsociety/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/portico/css/base.css
branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/probusiness/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/verdilak/head.inc.php
branches/Version-2_0-branch/preferences/setup/phpgw_no.lang
branches/Version-2_0-branch/property/inc/class.menu.inc.php
branches/Version-2_0-branch/property/inc/class.uiadmin_entity.inc.php
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/setup/phpgw_no_bh.lang
branches/Version-2_0-branch/property/templates/base/config.tpl
branches/Version-2_0-branch/property/templates/base/tts.xsl
branches/Version-2_0-branch/rental/setup/phpgw_no.lang
branches/Version-2_0-branch/setup/lang/phpgw_no.lang
Added Paths:
-----------
branches/Version-2_0-branch/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png
branches/Version-2_0-branch/phpgwapi/templates/aalesund/img/header2.jpg
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch 2018-01-09 09:12:00 UTC (rev 17510)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430,17432-17477,17479,17481-17487,17489,17491
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430,17432-17477,17479,17481-17487,17489,17491,17493-17509
\ No newline at end of property
Modified: branches/Version-2_0-branch/admin/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/admin/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/admin/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -8,6 +8,8 @@
create group admin no Lag Gruppe
delete message admin no Slett Melding
disabled admin no Deaktivert
+disabled (not recomended) admin no Deaktivert (ikke anbefalt)
+fallback (after each pageview) admin no Fallback (etter hver
sidevisning)
display admin no Vis
global message admin no Global Melding
group name admin no Gruppenavn
@@ -40,15 +42,15 @@
title admin no Overskrift
important message admin no Viktig informasjon
enabled admin no Aktiv
-(to install new applications use<br><a href=setup/" target="setup">setup</a>
[manage applications] !!!)" admin no (For å installere nye
moduler, bruk<br><a href=setup/" target="setup">setup</a> [manage applications]
!!!)"
+(To install new applications use<br><a href="setup/" target="setup">Setup</a>
[Manage Applications] !!!) admin no (For å installere nye moduler,
bruk<br><a href="setup/" target="setup">setup</a> [manage applications] !!!)
add a category admin no Legg til kategori
add a section admin no Legg til seksjon
add a subcategory admin no Legg til undekategori
admins admin no Admins
appearance admin no Utseende
-attribute admin no Atributt
-attributes admin no Atributter
-attributes for this config section admin no Atributter for denne
konfigurasjonsseksjonen
+attribute admin no Egenskap
+attributes admin no Egenskaper
+attributes for this config section admin no Egenskaper for denne
konfigurasjonsseksjonen
category list admin no Kategoriliste
check ip address of all sessions admin no Kontroller IP-adresse
for sesjoner
close window admin no Lukk vindu
@@ -58,7 +60,7 @@
delete this category admin no Slett kategorien
edit the config admin no Endre konfigurasjon
edit this category admin no Endre kategorien
-email domain admin no Email domene
+email domain admin no E-post domene
enter the background color for the login page admin no Angi
bakgrunnsfarge for innloggingssiden
enter the background color for the site title admin no Angi
bakgrunnsfarge for nettstedstittelen
enter the file name of your logo admin no Angi filnavnet for logo
@@ -89,7 +91,7 @@
smtpdebug admin no smtpdebug
smtpsecure admin no smtpsecure
submit the search string admin no Send søketekst
-support email address admin no Epost brukerstøtte
+support email address admin no E-post brukerstøtte
total records: %1 admin no Antall poster: %1
use cookies to pass sessionid admin no Bruk cookier til å håndtere
sesjoner
use smtp auth admin no Bruk smtp autentisering
@@ -98,4 +100,41 @@
warn admin no Varsel
add category admin no Legg til kategori
edit category admin no Endre kategori
-parent category admin no Foreldrekategori
\ No newline at end of file
+parent category admin no Foreldrekategori
+add user admin no Legg til bruker
+add user account admin no Legg til brukerkonto
+Account aktiv admin no Konto aktiv
+action admin no Handling
+file admin no Fil
+info admin no Informasjon
+notice admin no
+hooks updated admin no Applikasjonskoblinger er oppdatert
+the new hooks should be available to all users admin no Nye
applikasjonskoblinger er tilgjengelig for alle brukere
+async services last executed admin no Asynkrone servicer ble sist
utført
+run asynchronous services admin no Kjør asynkrone servicer
+asyncservices not yet installed or other error (%1) !!! admin no
Asynkrone servicer er ikke installert, eller annen feil (%1) !!!
+crontab only (recomended) admin no Bare crontab (anbefalt)
+installed crontab admin no Installert crontab
+install crontab admin no Installer crontab
+for the times below (empty values count as '*', all empty = every minute)
admin no For de tidene under (tomme verdier teller som '*', hvis alle er
tom = hvert minutt)
+year admin no År
+month admin no Måned
+day of week (0-6, 0=sun) admin no Ukedag (0-6, 0=Søn)
+hour admin no Time
+minute admin no Minutt
+calculate next run admin no Kalkuler neste kjøring
+enable debug-messages admin no Aktiver feilsøkingsmeldinger
+cancel testjob! admin no Kanseller testjobb!
+start testjob! admin no Start testjobb!
+for the times above admin no For tidene over
+the testjob sends you a mail everytime it is called admin no
Testjobben sender deg en e-post hver gang den blir kjørt
+jobs admin no Jobber
+next run admin no Neste kjøring
+times admin no Tider
+update admin no Oppdater
+manual run admin no Manuell kjøring
+method admin no Metode
+data admin no Data
+settings admin no Innstillinger
+color selector admin no Farge velger
+would you like to check for a new version when admins login admin no
Vil du sjekke om det finnes ny versjon når administratorer logger inn
\ No newline at end of file
Modified: branches/Version-2_0-branch/admin/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/admin/templates/base/config.tpl 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/admin/templates/base/config.tpl 2018-01-09
09:12:00 UTC (rev 17510)
@@ -12,8 +12,8 @@
<tbody>
<!-- END header -->
<!-- BEGIN body -->
- <tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_check_for_a_new_version_when_admins_login_?}:</td>
+ <!--tr class="pure-table-odd">
+
<td>{lang_Would_you_like_to_check_for_a_new_version_when_admins_login}?:</td>
<td>
<select
name="newsettings[checkfornewversion]">
<option
value="">{lang_No}</option>
@@ -20,20 +20,20 @@
<option
value="True"{selected_checkfornewversion_True}>{lang_Yes}</option>
</select>
</td>
- </tr>
+ </tr-->
<tr>
-
<td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td>
+ <td>{lang_Timeout_for_sessions_in_seconds}
(default 14400 = 4 hours):</td>
<td><input size="8"
name="newsettings[sessions_timeout]" value="{value_sessions_timeout}"></td>
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td>
+
<td>{lang_Timeout_for_application_session_data_in_seconds} (default 86400 = 1
day):</td>
<td><input size="8"
name="newsettings[sessions_app_timeout]"
value="{value_sessions_app_timeout}"></td>
</tr>
<tr>
-
<td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td>
+
<td>{lang_Would_you_like_to_show_each_applications_upgrade_status}?:</td><td>
<select
name="newsettings[checkappversions]">
<option
value="">{lang_No}</option>
<option
value="Admin"{selected_checkappversions_Admin}>{lang_Admins}</option>
@@ -43,7 +43,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array_?}:</td>
+
<td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array}?:</td>
<td>
<select
name="newsettings[cache_phpgw_info]">
<option
value="">{lang_No}</option>
@@ -58,7 +58,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
+
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_at_login_time}?:</td>
<td>
<select
name="newsettings[disable_autoload_langfiles]">
<option
value="">{lang_Yes}</option>
@@ -68,7 +68,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_cache_data_in_shared_memory_?}:</td>
+
<td>{lang_Would_you_like_phpGroupWare_to_cache_data_in_shared_memory}?:</td>
<td>
<select name="newsettings[shm_enable]">
<option
value="">{lang_No}</option>
@@ -82,7 +82,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_SMTP_server_hostname_(or_IP_address)}:</td>
+
<td>{lang_SMTP_server_hostname_or_IP_address}:</td>
<td><input name="newsettings[smtp_server]"
value="{value_smtp_server}" /></td>
</tr>
@@ -214,7 +214,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries_?}:</td>
+
<td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries}?:</td>
<td>
<select
name="newsettings[deny_user_grants_access]">
<option
value="">{lang_No}</option>
@@ -224,7 +224,7 @@
</tr>
<tr>
-
<td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
+
<td>{lang_How_many_days_should_entries_stay_in_the_access_log_before_they_get_deleted}?
(default 90):</td>
<td>
<input
name="newsettings[max_access_log_age]" value="{value_max_access_log_age}"
size="5">
</td>
@@ -231,7 +231,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
+
<td>{lang_After_how_many_unsuccessful_attempts_to_login_an_account_should_be_blocked}?
(default 3):</td>
<td>
<input
name="newsettings[num_unsuccessful_id]" value="{value_num_unsuccessful_id}"
size="5">
</td>
@@ -238,7 +238,7 @@
</tr>
<tr>
-
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
+
<td>{lang_After_how_many_unsuccessful_attempts_to_login_an_IP_should_be_blocked}?
(default 3):</td>
<td>
<input
name="newsettings[num_unsuccessful_ip]" value="{value_num_unsuccessful_ip}"
size="5">
</td>
@@ -245,7 +245,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
+
<td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked}? (default
30):</td>
<td>
<input name="newsettings[block_time]"
value="{value_block_time}" size="5">
</td>
@@ -252,7 +252,7 @@
</tr>
<tr>
-
<td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
+
<td>{lang_comma_separated_admin_email_addresses_to_be_notified_about_the_blocking}:</td>
<td>
<input name="newsettings[admin_mails]"
value="{value_admin_mails}" size="40">
</td>
@@ -259,7 +259,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
+
<td>{lang_Disable_auto_completion_of_the_login_form_}:</td>
<td>
<select
name="newsettings[autocomplete_login]">
<option
value="">{lang_No}</option>
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/booking 2018-01-09 09:12:00 UTC (rev 17510)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16846
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
-/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132,17134-17143,17152-17157,17175-17188,17313-17314,17353-17354,17370,17394-17424,17426-17430,17432-17477
\ No newline at end of property
+/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132,17134-17143,17152-17157,17175-17188,17313-17314,17353-17354,17370,17394-17424,17426-17430,17432-17477,17493-17509
\ No newline at end of property
Modified: branches/Version-2_0-branch/booking/js/base/common.js
===================================================================
--- branches/Version-2_0-branch/booking/js/base/common.js 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/booking/js/base/common.js 2018-01-09
09:12:00 UTC (rev 17510)
@@ -34,6 +34,7 @@
var imgEl =
dlImage.appendChild(document.createElement('dd')).appendChild(document.createElement('img'));
var captionEl =
dlImage.appendChild(document.createElement('dt'));
imgEl.setAttribute('src',
v.src.replace(/&/gi, '&'));
+ imgEl.setAttribute('onClick',
'openModal(this)');
captionEl.appendChild(document.createTextNode(v.description));
container.appendChild(dlImage);
Modified: branches/Version-2_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/booking/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/booking/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -19,6 +19,7 @@
add another date booking no Legg til dato
add boundary booking no Legg til rammetid
add comment booking no Legg til kommentar
+comment booking no Kommentar
add document booking no Legg til dokument
add new event booking no Legg til arrangement
event settings booking no Innstillinger for arrangement
@@ -568,14 +569,14 @@
Booking email settings booking no Booking epost oppsett.
System name booking no System navn
Subject booking no Tema
-Mail text for application created booking no Epost tekst for søknad
opprettet.
-Mail text for application pending booking no Epost tekst for søknad
under behandling.
-Mail text for application accepted booking no Epost tekst for søknad
akseptert.
-Mail text for application rejected booking no Epost tekst for søknad
avist.
+Mail text for application created booking no E-post tekst for søknad
opprettet.
+Mail text for application pending booking no E-post tekst for søknad
under behandling.
+Mail text for application accepted booking no E-post tekst for søknad
akseptert.
+Mail text for application rejected booking no E-post tekst for søknad
avslått.
notify on accepted booking no Send kvittering til ansvarlig ved
akseptert.
Signature booking no Signatur
Tilsynsvakt name booking no Navn på tilsynsvakt
-Tilsynsvakt email booking no Epostt tilsynsvakt
+Tilsynsvakt email booking no E-post tilsynsvakt
Tilsynsvakt telephone booking no Telefon tilsynsvakt
Metadata common no Metadata
Author booking no Forfatter
@@ -677,4 +678,42 @@
duplicate ssn booking no Duplikat av f.nr for samme organisasjon
building show booking no Vis bygning
free booking no Ledig
-document new booking no Nytt dokument
\ No newline at end of file
+document new booking no Nytt dokument
+example booking no Eksempel
+booking settings booking no Booking innstillinger
+support email address booking no Brukerstøtte e-post adresse
+external host address booking no Ekstern verts adresse
+custom email sender booking no Tilpasset e-post sender
+logopath frontend booking no Sti til logo for frontend
+image maxheight booking no Makshøyde for bilder
+image maxwidth booking no Maksbredde for bilder
+case_officer booking no Saksbehandler
+allocation new booking no Ny tildeling
+event new booking no Nytt arrangement
+edit booking no Endre
+Delete booking no Slett
+season new booking no Ny sesong
+report participants booking no Deltaker rapport
+report freetime booking no Ledig tid rapport
+report new booking no Ny rapport
+participants per agegroupe booking no Deltaker per aldersguppe
+start time booking no Starttid
+end time booking no Slutttid
+variables booking no Variabler
+horizontal booking no Horisontal
+vertical booking no Vertikal
+permission add booking no Legg til tilatelse
+activity new booking no Ny aktivitet
+account new booking no Ny konteringsstreng
+external account booking no Ekstern konto
+external customer output format booking no Ekstern kunde output
format
+external file linebreak booking no Tegn for linjeskift
+export agresso booking no Agresso eksport
+export method booking no Eksport metode
+export path booking no Eksport sti
+ftp host booking no Ftp vert
+ftp basedir booking no Ftp initiell katalog ved pålogging
+ftp user booking no Ftp bruker
+ftp password booking no Ftp passord
+last id booking no Siste ID
+do not edit! booking no Ikke endre!
Modified: branches/Version-2_0-branch/booking/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/application.xsl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/booking/templates/base/application.xsl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -19,7 +19,6 @@
.pure-form-contentTable {display: inline-block;}
</style>
- <xsl:call-template name="jquery_phpgw_i18n"/>
<xsl:call-template name="msgbox"/>
<div class= "pure-form pure-form-aligned" id="form" name="form">
<input type="hidden" name="tab" value=""/>
@@ -28,7 +27,7 @@
<div id="application" class="booking-container">
<fieldset>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<h1>
<xsl:value-of
select="application/id"/>
</h1>
@@ -106,7 +105,7 @@
<br />Melding fra saksbehandler ligger under historikk, deretter vises kopi av
din søknad.<br /> Skal du gi en melding til saksbehandler skriver du denne inn
i feltet under "Legg til en kommentar"</span>
</div>
</xsl:if>
- <form method="POST">
+<!-- <form method="POST">
<div
class="pure-control-group">
<label
for="comment">
<xsl:value-of select="php:function('lang', 'Add a comment')" />
@@ -118,48 +117,57 @@
<label> </label>
<input
type="submit" value="{php:function('lang', 'Add comment')}" />
</div>
- </form>
+ </form>-->
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>1.
<xsl:value-of select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></h3>
</legend>
</div>
+ <table
class="historyTable">
+ <tr>
+
<th><xsl:value-of select="php:function('lang', 'Time')" /></th>
+
<th><xsl:value-of select="php:function('lang', 'Comment')" /></th>
+ </tr>
+
<xsl:for-each
select="application/comments[author]">
- <div
class="pure-control-group">
- <label>
+
+ <tr>
+ <td>
<xsl:value-of select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/>
- </label>
+ </td>
<xsl:choose>
<xsl:when
test='contains(comment,"bookingfrontend.uidocument_building.download")'>
-
<span>
+
<td>
<xsl:value-of select="comment" disable-output-escaping="yes"/>
-
</span>
+
</td>
</xsl:when>
<xsl:otherwise>
-
<span>
-
<!--xsl:value-of select="comment"/-->
-
<xsl:value-of select="comment" disable-output-escaping="yes"/>
-
-
</span>
+
<td>
+
<xsl:value-of select="comment"/>
+
</td>
</xsl:otherwise>
</xsl:choose>
- </div>
+ </tr>
+
+
</xsl:for-each>
+
+ </table>
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>1.1
<xsl:value-of select="php:function('lang', 'attachments')" /></h3>
</legend>
</div>
- <div
id="attachments_container"/>
+ <div
id="attachments_container"/><br/>
<form method="POST"
enctype='multipart/form-data' id='file_form'>
<input
name="name" id='field_name' type='file' >
<xsl:attribute name='title'>
@@ -178,7 +186,7 @@
<xsl:text>Max 2M:: jpg, png, gif, xls, xlsx, doc, docx, txt , pdf, odt,
ods</xsl:text>
</xsl:attribute>
</input>
- <br/>
+ <br/><br/>
<input
type="submit" value="{php:function('lang', 'Add attachment')}" />
</form>
@@ -186,7 +194,7 @@
</div>
<div class="pure-g">
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>2.
<xsl:value-of select="php:function('lang', 'Why?')" /></h3>
@@ -202,10 +210,10 @@
</div>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'Information about the event')" />
+
<xsl:value-of select="php:function('lang', 'Description')" />
</label>
<span>
-
<xsl:value-of disable-output-escaping="yes" select="application/description"/>
+
<xsl:value-of select="application/description"/>
</span>
</div>
<div
class="pure-control-group">
@@ -214,11 +222,11 @@
<xsl:value-of select="php:function('lang', 'Extra info')" />
</h4>
</label>
- <xsl:value-of
disable-output-escaping="yes" select="application/equipment"/>
+ <xsl:value-of
select="application/equipment"/>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>3.
<xsl:value-of select="php:function('lang', 'Where?')" /></h3>
@@ -241,7 +249,7 @@
<div
id="resources_container" class="pure-form-contentTable"></div>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>4.
<xsl:value-of select="php:function('lang', 'When?')" /></h3>
@@ -297,13 +305,10 @@
allocationParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="allocation_params"/>;
bookingParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="booking_params"/>;
eventParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="event_params"/>;
-
var allocationaddURL = phpGWLink('index.php',
{menuaction:'booking.uiallocation.add'});
-
var bookingaddURL = phpGWLink('index.php',
{menuaction:'booking.uibooking.add'});
-
var eventaddURL = phpGWLink('index.php', {menuaction:'booking.uievent.add'});
</script>
<div
class="pure-control-group">
<label> </label>
-
<select name="create" onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl(allocationaddURL, allocationParams[{id}]);
if(this.selectedIndex==2) JqueryPortico.booking.postToUrl(bookingaddURL,
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl(eventaddURL, eventParams[{id}]);">
+
<select name="create" onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
<xsl:if test="not(../case_officer/is_current_user)">
<xsl:attribute name="disabled">disabled</xsl:attribute>
</xsl:if>
@@ -332,7 +337,7 @@
</xsl:if>
</xsl:for-each>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>5.
<xsl:value-of select="php:function('lang', 'Who?')" /></h3>
@@ -395,7 +400,7 @@
</div>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>6.
<xsl:value-of select="php:function('lang', 'Contact information')" /></h3>
@@ -426,7 +431,7 @@
</span>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>7.
<xsl:value-of select="php:function('lang', 'responsible applicant')" /> /
<xsl:value-of select="php:function('lang', 'invoice information')" /></h3>
@@ -437,21 +442,23 @@
<label>
<xsl:value-of select="php:function('lang', 'organization number')" />
</label>
- <br/>
+ <span>
<xsl:value-of select="application/customer_organization_number"/>
+ </span>
</xsl:if>
<xsl:if
test="application/customer_identifier_type = 'ssn'">
<label>
<xsl:value-of select="php:function('lang', 'Date of birth or SSN')" />
</label>
- <br/>
+ <span>
<xsl:value-of select="application/customer_ssn"/>
+ </span>
</xsl:if>
</div>
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>8.
<xsl:value-of select="php:function('lang', 'Terms and conditions')" /></h3>
@@ -474,7 +481,7 @@
</div>
<xsl:if test="not(frontend)">
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div
class="heading">
<legend>
<h3>
@@ -490,7 +497,7 @@
</xsl:if>
<xsl:if test="application/edit_link">
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div
class="heading">
<legend>
<h3>
@@ -498,7 +505,20 @@
</h3>
</legend>
</div>
+ <form
method="POST">
<div
class="pure-control-group">
+ <label
for="comment">
+
<xsl:value-of select="php:function('lang', 'Add a comment')" />
+ </label>
+
<textarea name="comment" id="comment" style="width: 60%; height:
7em"></textarea>
+ <br/>
+ </div>
+ <div
class="pure-control-group">
+
<label> </label>
+ <input
type="submit" value="{php:function('lang', 'Add comment')}" />
+ </div>
+ </form><br/>
+ <div
class="pure-control-group">
<xsl:if
test="application/case_officer/is_current_user">
<form method="POST" style="display:inline">
<input type="hidden" name="unassign_user"/>
Modified:
branches/Version-2_0-branch/booking/templates/base/application_edit.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/application_edit.xsl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/booking/templates/base/application_edit.xsl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -36,7 +36,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>1.
<xsl:value-of select="php:function('lang', 'Why?')" /></h3>
@@ -109,7 +109,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>2.
<xsl:value-of select="php:function('lang', 'Where?')" /></h3>
@@ -158,7 +158,7 @@
</div>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>3.
<xsl:value-of select="php:function('lang', 'When?')" /></h3>
@@ -255,7 +255,7 @@
</a>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>4.
<xsl:value-of select="php:function('lang', 'Who?')" /></h3>
@@ -354,7 +354,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>
@@ -410,7 +410,7 @@
</input>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>
@@ -422,7 +422,7 @@
<xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="pure-g">
<div
class="pure-control-group pure-u-1 pure-u-md-1-2 pure-u-lg-1">
<div
class="heading">
Modified: branches/Version-2_0-branch/booking/templates/base/application_new.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/application_new.xsl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/booking/templates/base/application_new.xsl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -78,7 +78,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-14-24
pure-u-lg-10-24">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -143,7 +143,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -194,7 +194,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -304,7 +304,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -345,7 +345,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -422,7 +422,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div
class="pure-control-group">
<div
class="heading">
@@ -450,7 +450,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
Modified: branches/Version-2_0-branch/booking/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/config.tpl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/booking/templates/base/config.tpl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -13,23 +13,23 @@
<td
colspan="2"> <b>{lang_booking_settings}</b></td>
</tr>
<tr class="row_on">
- <td>{lang_external_host_address}:Example:
https://www.bergen.kommune.no</td>
+ <td>{lang_external_host_address}:{lang_example}:
https://www.bergen.kommune.no</td>
<td><input name="newsettings[external_site_address]"
value="{value_external_site_address}"></td>
</tr>
<tr class="row_off">
- <td>{lang_custom_email_sender}:example:
noreply<address@hidden></td>
+ <td>{lang_custom_email_sender}:{lang_example}:
noreply<address@hidden></td>
<td><input name="newsettings[email_sender]"
value="{value_email_sender}"></td>
</tr>
<tr class="row_on">
- <td>{lang_logopath_frontend}:example:
/phpgwapi/templates/bkbooking/images/bergen_logo.png</td>
+ <td>{lang_logopath_frontend}:{lang_example}:
/phpgwapi/templates/bkbooking/images/bergen_logo.png</td>
<td><input name="newsettings[logopath_frontend]"
value="{value_logopath_frontend}"></td>
</tr>
<tr class="row_off">
- <td>{lang_image_maxheight}:example: 300</td>
+ <td>{lang_image_maxheight}:{lang_example}: 300</td>
<td><input name="newsettings[image_maxheight]"
value="{value_image_maxheight}"></td>
</tr>
<tr class="row_on">
- <td>{lang_image_maxwidth}:example: 300</td>
+ <td>{lang_image_maxwidth}:{lang_example}: 300</td>
<td><input name="newsettings[image_maxwidth]"
value="{value_image_maxwidth}"></td>
</tr>
<tr class="row_off">
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2018-01-09 09:06:24 UTC (rev
17509)
+++ branches/Version-2_0-branch/bookingfrontend 2018-01-09 09:12:00 UTC (rev
17510)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/bookingfrontend:14933-16846
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
-/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132,17134-17143,17152-17157,17169-17173,17175-17188,17190-17195,17214,17303-17311,17344-17346,17349-17351,17353-17354,17356-17357,17370,17372-17378,17394-17424,17432-17477,17491
\ No newline at end of property
+/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132,17134-17143,17152-17157,17169-17173,17175-17188,17190-17195,17214,17303-17311,17344-17346,17349-17351,17353-17354,17356-17357,17370,17372-17378,17394-17424,17432-17477,17491,17493-17509
\ No newline at end of property
Modified: branches/Version-2_0-branch/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/setup/phpgw_no.lang
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/bookingfrontend/setup/phpgw_no.lang
2018-01-09 09:12:00 UTC (rev 17510)
@@ -398,4 +398,35 @@
please select an activity bookingfrontend no Velg en aktivitet
select date bookingfrontend no Velg dato
cancel event bookingfrontend no Avbestill
-free bookingfrontend no Ledig
\ No newline at end of file
+free bookingfrontend no Ledig
+bookingfrontend settings bookingfrontend no Bookingfrontend
innstillinger
+site title bookingfrontend no Tittel på siden
+footer info bookingfrontend no Footer informasjon
+remote authentication bookingfrontend no Ekstern autentisering
+select method bookingfrontend no Velg metode
+use cookies to pass sessionid bookingfrontend no Bruk cookie til å
håndtere sesjoner
+cookie domain for sessions bookingfrontend no Cookiedomene for
sesjoner
+if same as framework leave empty bookingfrontend no la stå tomt
dersom det er det samme som for rammeverket
+anonymous user bookingfrontend no Anonym bruker
+anonymous password bookingfrontend no Anonymt passord
+custom login url bookingfrontend no Egendefinert logg inn url
+custom login url parameter bookingfrontend no Egendefinert logg inn
url parametre
+login apikey bookingfrontend no login apikey
+login webservicehost bookingfrontend no login webservicehost
+login header key bookingfrontend no Innloggingsoverskrift:
+login header regular expression bookingfrontend no
Innloggingsoverskrift vanlig uttrykk
+login soap client location bookingfrontend no login soap klient
location
+login soap client uri bookingfrontend no login soap klient uri
+login soap client proxy host bookingfrontend no login soap klient
proxyserver
+login soap client proxy port bookingfrontend no login soap klient
proxyport
+login soap client encoding bookingfrontend no login soap klient
tegnsett
+login soap client login bookingfrontend no login soap klient login
+login soap client password bookingfrontend no login soap klient
passord
+login soap client wsdl bookingfrontend no login soap klient wsdl
+test organization bookingfrontend no Test organisasjon
+google tracker id bookingfrontend no Goggle sporer id
+url to external logout bookingfrontend no Url for ekstern logg ut
+Redirect is computed if url ends with bookingfrontend no Omdirigering
blir kalkulert hvis url slutter med
+bookingfrontend host bookingfrontend no Bookingfrontend vert
+Needed for the return from the external logout bookingfrontend no
Nødvendig for retur fra ekstern logg ut
+metadata settings bookingfrontend no Metadata innstillinger
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building.xsl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building.xsl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -132,28 +132,52 @@
</div>
<div class="col-lg-5">
- <dl class="images">
- <div id="images_container">
+ <dl class="images">
+ <div id="images_container">
- </div>
- </dl>
- <dl class="images map">
- <!--div id="images_container"></div-->
- <xsl:if test="street and normalize-space(street)">
- <div class="gmap-container">
- <iframe width="500" height="300" frameborder="0"
scrolling="no" marginheight="0" marginwidth="0" id="googlemapiframe"
src=""></iframe>
</div>
- <small>
- <a href="" id="googlemaplink"
style="color:#0000FF;text-align:left" target="_new">Vis større kart</a>
- </small>
- </xsl:if>
- </dl>
+ </dl>
+ <dl class="images map">
+ <!--div id="images_container"></div-->
+ <xsl:if test="street and normalize-space(street)">
+ <div class="gmap-container">
+ <iframe width="500" height="300"
frameborder="0" scrolling="no" marginheight="0" marginwidth="0"
id="googlemapiframe" src=""></iframe>
+ </div>
+ <small>
+ <a href="" id="googlemaplink"
style="color:#0000FF;text-align:left" target="_new">Vis større kart</a>
+ </small>
+ </xsl:if>
+ </dl>
</div>
- </div>
+ </div>
+
+
+ <div class="modal fade" id="mediaModal" role="dialog">
+ <div class="modal-dialog modal-xl">
+ <!-- Content of modal -->
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close"
data-dismiss="modal">x</button>
+ <h4 class="modal-title" id="mediaTitle"></h4>
+ </div>
+ <div class="modal-body" id="fullSizeImage">
+
+
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-danger"
data-dismiss="modal">Avslutt</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+
- <script type="text/javascript">
+ <script type="text/javascript">
var building_id = <xsl:value-of select="id"/>;
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Category', 'Activity', 'Resource Type')"/>;
var address = '<xsl:value-of select="street"/>, <xsl:value-of
select="zip_code"/>, <xsl:value-of select="city"/>';
@@ -194,7 +218,8 @@
</script>
</xsl:for-each>
-
+
+
</div>
</xsl:template>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/organization.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/organization.xsl
2018-01-09 09:06:24 UTC (rev 17509)
+++
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/organization.xsl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -140,6 +140,26 @@
</dl>
</div>
</div>
+
+ <div class="modal fade" id="mediaModal" role="dialog">
+ <div class="modal-dialog modal-xl">
+ <!-- Content of modal -->
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close"
data-dismiss="modal">x</button>
+ <h4 class="modal-title" id="mediaTitle"></h4>
+ </div>
+ <div class="modal-body" id="fullSizeImage">
+
+
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-danger"
data-dismiss="modal">Avslutt</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
<script type="text/javascript">
var organization_id = <xsl:value-of select="organization/id"/>;
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource.xsl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource.xsl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -81,6 +81,26 @@
</dl>
</div>
</div>
+
+ <div class="modal fade" id="mediaModal" role="dialog">
+ <div class="modal-dialog modal-xl">
+ <!-- Content of modal -->
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close"
data-dismiss="modal">x</button>
+ <h4 class="modal-title" id="mediaTitle"></h4>
+ </div>
+ <div class="modal-body" id="fullSizeImage">
+
+
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-danger"
data-dismiss="modal">Avslutt</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
<script type="text/javascript">
var resource_id = <xsl:value-of select="resource/id"/>;
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -38,7 +38,7 @@
</td>
</tr>
<tr class="row_on">
-
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
+ <td>{lang_cookie_domain_for_sessions} -
{lang_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
</tr>
<tr class="row_off">
@@ -124,13 +124,13 @@
</tr>
<tr class="row_off">
<td>{lang_url_to_external_logout}:
- <br/> Redirect is computed if url ends with '='
+ <br/>
{lang_Redirect_is_computed_if_url_ends_with} '='
</td>
<td><input name="newsettings[external_logout]"
value="{value_external_logout}"></td>
</tr>
<tr class="row_off">
<td>{lang_bookingfrontend_host}:
- <br/> Needed for the return from the
external_logout
+ <br/>
{lang_Needed_for_the_return_from_the_external_logout}
</td>
<td><input name="newsettings[bookingfrontend_host]"
value="{value_bookingfrontend_host}"></td>
</tr>
Modified: branches/Version-2_0-branch/demo/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/demo/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/demo/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -2,13 +2,13 @@
demo common no Demo Modul
Add demo no Legg til
Delete demo no Slett
-Edit demo no Editer
+Edit demo no Rediger
View demo no Vis
apply demo no Mellomlagre
list demo no Liste
general demo no Generell
dates demo no Datoer
-custom attributes demo no Egendefinerte attributter
+custom attributes demo no Egendefinerte egenskaper
no category demo no Kategori ikke valgt
time created demo no Tidsstempel
inline tables demo no Tabeller
Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2018-01-09 09:12:00 UTC (rev 17510)
@@ -1,7 +1,7 @@
eventplanner common no Turneplanlegger
Add eventplanner no Legg til
Delete eventplanner no Slett
-Edit eventplanner no Editer
+Edit eventplanner no Rediger
View eventplanner no Vis
apply eventplanner no Mellomlagre
list eventplanner no Liste
@@ -8,7 +8,7 @@
general eventplanner no Generell
dates eventplanner no Datoer
event dates eventplanner no Arrangement-dato
-custom attributes eventplanner no Egendefinerte attributter
+custom attributes eventplanner no Egendefinerte egenskaper
no category eventplanner no Kategori ikke valgt
time created eventplanner no Tidsstempel
inline tables eventplanner no Tabeller
Modified: branches/Version-2_0-branch/felamimail/setup/egw_no.lang
===================================================================
--- branches/Version-2_0-branch/felamimail/setup/egw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/felamimail/setup/egw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -279,7 +279,7 @@
simply click the target-folder felamimail no Klikk på målmappe
site configuration felamimail no sidekonfigurasjon
size felamimail no Størrelse
-size of editor window felamimail no Størrelse på editeringsvindu
+size of editor window felamimail no Størrelse på redigeringsvindu
size(...->0) felamimail no Størrelse (...->0)
size(0->...) felamimail no Størrelse (0->...)
small view felamimail no liten visning
Modified: branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -22,7 +22,7 @@
date opened helpdesk no Dato startet
disable helpdesk no Deaktivert
details helpdesk no Detaljer
-edit helpdesk no Editer
+edit helpdesk no Rediger
modified date helpdesk no Endret dato
email helpdesk no Epost
email-address of the user, eg. %1 helpdesk no Epost adressen
til brukeren, f.eks. %1
@@ -208,11 +208,11 @@
close message helpdesk no Svarmelding ved avsluttet sak
list %1 helpdesk no List %1
public helpdesk no synlig for alle
-open edit in new window helpdesk no Editer i nytt vindu
+open edit in new window helpdesk no Rediger i nytt vindu
columns is updated helpdesk no Kolonner er oppdatert
select column helpdesk no Velg kolonne
target helpdesk no Mål
-ticket attributes helpdesk no Meldingsattributter
+ticket attributes helpdesk no Meldingsegenskaper
ticket categories helpdesk no Meldingskategorier
ticket status helpdesk no Meldingsstatus
url helpdesk no Url
Modified: branches/Version-2_0-branch/logistic/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/logistic/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/logistic/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -34,8 +34,8 @@
Add sub activity logistic no Legg til underaktivitet
Entity logistic no Entitet
Category logistic no Kategori
-Attributes logistic no Attributter
-Chosen attributes logistic no Valgte attributter
+Attributes logistic no Egenskaper
+Chosen attributes logistic no Valgte egenskaper
Administrate requirements logistic no Administrer behovstype
resource_type_requirement logistic no Ressurstypebehov
Varchar logistic no Text
Modified: branches/Version-2_0-branch/phpgwapi/doc/Vagrantfile
===================================================================
--- branches/Version-2_0-branch/phpgwapi/doc/Vagrantfile 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/doc/Vagrantfile 2018-01-09
09:12:00 UTC (rev 17510)
@@ -126,10 +126,10 @@
sudo apt-get install -y less vim-tiny
sudo apt-get install -y subversion
sudo apt-get install -y apg
- sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/
`lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
- wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | sudo
apt-key add -
- sudo apt-get update
- sudo apt-get install -y postgresql postgresql-contrib
+ sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/
`lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
+ wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | sudo
apt-key add -
+ sudo apt-get update
+ sudo apt-get install -y postgresql-9.6 postgresql-client-9.6
postgresql-contrib-9.6
# fix permissions
echo "-------------------- fixing listen_addresses on postgresql.conf"
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -387,6 +387,7 @@
'sortAscending' => $sort_asc,
'sortDescending' => $sort_desc
)),
+ 'select' => json_encode(array('rows' =>
array('0'=> '','_'=> '%d ' . lang('rows selected'))))
),
'lengthmenu' => array('_' =>
json_encode($lengthmenu)),
'lengthmenu_allrows' => array('_' =>
json_encode(array(-1, lang('all')))),
Modified: branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -81,7 +81,7 @@
done common no Avbryt
e-mail common no E-Post
email-address of the user, eg. %1 common no E-Postadressen til
brukeren, %1
-edit common no Editer
+edit common no Rediger
email common no E-Post
entry has been deleted sucessfully common no Entry har blitt slettet
entry updated sucessfully common no Entry er oppdatert
@@ -279,3 +279,11 @@
no location common no Ingen lokasjon
enable inheritance common no Aktiver arving
users common no Brukere
+maximum entries in click path history common no Maksimum oppføringer i
klikkveiledning
+debugoutput common no Debugoutput
+add section common no Legg til seksjon
+showing common no Viser
+color selector common no Fargevelger
+select all common no Velg alle
+hidden common no Gjemt
+rows selected common no rader er valgt
Modified: branches/Version-2_0-branch/phpgwapi/templates/aalesund/css/sample.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/aalesund/css/sample.css
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/aalesund/css/sample.css
2018-01-09 09:12:00 UTC (rev 17510)
@@ -6,7 +6,7 @@
.jumbotron {
position: relative;
- background: url("../img/header.jpg") no-repeat center center;
+ background: url("../img/header2.jpg") no-repeat center center;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
@@ -23,7 +23,15 @@
}
}
+a{
+ color: #26348B;
+}
+a:hover{
+ color: #26348B;
+}
+
+
.main-icons{
font-size: 80px;;
}
@@ -52,16 +60,14 @@
}
.navbar-nav a:hover{
- background-color: #1f52a8;
+ background-color: whitesmoke;
}
.navbar-nav a{
- padding: 1.8em;
+ padding: 2.4em;
+ color: black;
}
-.navbar-brand{
- padding: 1.2em;
-}
.nav-link{
padding-right: 1rem;
@@ -69,7 +75,8 @@
}
.navbar{
- background-color: #123c84;
+ background-color: white;
+/* background-color: #123c84; */
padding: 0;
}
@@ -107,7 +114,7 @@
background-color: #428bca;
}
address@hidden screen and (max-width: 560px) {
+/address@hidden screen and (max-width: 560px) {
#update-search-result {
position: fixed;
bottom: 30px;
@@ -114,7 +121,7 @@
right: 30px;
z-index: 10;
}
-}
+} */
.advance-search-padding{
@@ -122,9 +129,9 @@
}
.search-button{
- border-right: 2px solid #428bca;
- border-top: 2px solid #428bca;
- border-bottom: 2px solid #428bca;
+ border-right: 2px solid #26348B;
+ border-top: 2px solid #26348B;
+ border-bottom: 2px solid #26348B;
}
.adv-search-button:hover{
@@ -186,7 +193,7 @@
}
.main-search .form-control{
- border: 2px solid #428bca;
+ border: 2px solid #26348B;
}
.control {
@@ -291,3 +298,23 @@
background-color: #428bca;
border-color: #007bff;
}
+
+
address@hidden (min-width: 768px) {
+ .modal-xl {
+ width: 90%;
+ max-width:1000px;
+ }
+}
+
+#fullSizeImage img{
+ width: 100%;
+}
+
+#images_container img{
+ cursor: pointer;
+}
+
+.navbar-brand{
+ padding: 0;
+}
\ No newline at end of file
Modified: branches/Version-2_0-branch/phpgwapi/templates/aalesund/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/aalesund/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/aalesund/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -51,6 +51,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
@@ -84,12 +85,14 @@
$javascripts[] = "/phpgwapi/templates/bookingfrontend/js/minid.js";
+ $logoimg = "/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png";
-
$bootstrapmainjs =
"/phpgwapi/templates/aalesund/bootstrap/js/bootstrap.min.js";
$bootstrapjs=
"/phpgwapi/templates/aalesund/bootstrap/js/bootstrap.bundle.min.js";
$samplejs = "/phpgwapi/templates/aalesund/js/sample.js";
+
+ $GLOBALS['phpgw']->template->set_var( 'logoimg', $webserver_url .
$logoimg );
$GLOBALS['phpgw']->template->set_var( 'samplejs', $webserver_url .
$samplejs );
$GLOBALS['phpgw']->template->set_var( 'bootstrapjs', $webserver_url .
$bootstrapjs );
$GLOBALS['phpgw']->template->set_var( 'bootstrapmainjs',
$webserver_url . $bootstrapmainjs );
Modified: branches/Version-2_0-branch/phpgwapi/templates/aalesund/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/aalesund/head.tpl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/aalesund/head.tpl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -39,7 +39,7 @@
</head>
<body class="">
- <nav class="navbar navbar-expand-md navbar-dark">
+ <nav class="navbar navbar-expand-md">
<div class="container">
<button class="navbar-toggler mr-auto active"
type="button" data-toggle="collapse" data-target="#Navbar">
@@ -46,13 +46,13 @@
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="{site_url}">
- Ålesund Kommune
+ <img src="{logoimg}" alt="Logo" style="height: 100px;">
</a>
<div class="collapse navbar-collapse text-center"
id="Navbar">
<ul class="navbar-nav ml-auto">
<li class="nav-item active"><a class="nav-link"
href="{site_url}">Hjem</a></li>
- <li class="nav-item active"><a class="nav-link"
href="#">Søk</a></li>
- <li class="nav-item active"><a class="nav-link"
href="#">Lokaler</a></li>
+ <!-- <li class="nav-item active"><a
class="nav-link" href="#">Søk</a></li>
+ <li class="nav-item active"><a class="nav-link"
href="#">Lokaler</a></li> -->
<li class="nav-item active"><a class="nav-link"
href="{manual_url}">{manual_text}</a></li>
<li class="nav-item active"><a id="login"
class="nav-link" href="{login_url}">{login_text}</a><span
id="change"></span></li>
</ul>
Copied:
branches/Version-2_0-branch/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png
(from rev 17509, trunk/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png)
===================================================================
(Binary files differ)
Copied: branches/Version-2_0-branch/phpgwapi/templates/aalesund/img/header2.jpg
(from rev 17509, trunk/phpgwapi/templates/aalesund/img/header2.jpg)
===================================================================
(Binary files differ)
Modified: branches/Version-2_0-branch/phpgwapi/templates/aalesund/js/sample.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/aalesund/js/sample.js
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/aalesund/js/sample.js
2018-01-09 09:12:00 UTC (rev 17510)
@@ -21,20 +21,31 @@
});
});
-$(function checkView() {
-$(window).scroll(function() {
- var top_of_element = $("#advance-search-container").offset().top;
- var bottom_of_element = $("#advance-search-container").offset().top +
$("#advance-search-container").outerHeight();
- var bottom_of_screen = $(window).scrollTop() + window.innerHeight;
- var top_of_screen = $(window).scrollTop();
- if((bottom_of_screen > top_of_element) && (top_of_screen <
bottom_of_element)){
- $("#update-search-result").show();
- }
- else {
- $("#update-search-result").hide();
- }
-});
-});
\ No newline at end of file
+function openModal(param){
+ $('#mediaModal').modal('show');
+ var src = $(param).attr('src');
+ $('#fullSizeImage').empty();
+ $('#fullSizeImage').append('<img src="'+ src +'" />');
+}
+
+
+//$(function checkView() {
+//
+//$(window).scroll(function() {
+// var top_of_element = $("#advance-search-container").offset().top;
+// var bottom_of_element = $("#advance-search-container").offset().top +
$("#advance-search-container").outerHeight();
+// var bottom_of_screen = $(window).scrollTop() + window.innerHeight;
+// var top_of_screen = $(window).scrollTop();
+//
+// if((bottom_of_screen > top_of_element) && (top_of_screen <
bottom_of_element)){
+// $("#update-search-result").show();
+// }
+// else {
+// $("#update-search-result").hide();
+// }
+//});
+//
+//});
\ No newline at end of file
Modified: branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -54,6 +54,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified:
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -51,6 +51,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
Modified:
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
2018-01-09 09:06:24 UTC (rev 17509)
+++
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
2018-01-09 09:12:00 UTC (rev 17510)
@@ -10,28 +10,43 @@
*/
body {
- font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
+ font-family: Raleway,Calibri,Candara,Segoe,Segoe
UI,Optima,Arial,sans-serif !important;
+ font-size: 16px;
}
address@hidden (min-width: 62em) {
+ .main-wrapper{
+ margin-left: auto;
+ margin-right: auto;
+ width: 1200px;
+ }
+
+ .footer-wrapper{
+ margin-left: auto;
+ margin-right: auto;
+ width: 1200px;
+ }
+
+ .custom-menu-screen{
+ display: none;
+ }
+}
.home-menu {
- background: rgb(231, 239,241);
+ background: white;
+ box-shadow: none;
}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6
-{
+h1,h2,h3,h4,h5,h6{
color: #2d6d8f;
- letter-spacing: 0.1em;
font-weight: normal;
- /* text-transform: uppercase;*/
+ font-style: normal;
+ /* text-transform: uppercase;*/
}
+
+
.pure-g [class*="pure-u"] {
- font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
+ font-family: Raleway,Calibri,Candara,Segoe,Segoe
UI,Optima,Arial,sans-serif;
}
.l-box-lrg {
@@ -43,10 +58,8 @@
text-align: center;
}
-.footer {
- background: #383838;
-}
+
.home-menu .pure-menu-heading {
color: #2d6d8f;
font-weight: 400;
@@ -63,7 +76,7 @@
.home-menu li a:hover,
.home-menu li a:focus {
background: none;
- /* border: none;*/
+ /* border: none;*/
color: #00acb8;
}
@@ -148,14 +161,14 @@
}
.custom-menu-screen {
- /* background-color: rgba(0, 0, 0, 0.5);*/
- background-color: rgb(231, 239,241);
+ /* background-color: rgba(0, 0, 0, 0.5);*/
+ background-color: white;
-webkit-transition: all 0.5s;
-moz-transition: all 0.5s;
-ms-transition: all 0.5s;
transition: all 0.5s;
height: 3em;
- width: 70em;
+ width: 100%;
position: absolute;
top: 0;
z-index: -1;
@@ -168,8 +181,75 @@
transform: translateY(-44px);
}
address@hidden (max-width: 62em) {
+.float-right-top-menu {
+ float: right;
+ margin-top: 0px;
+ position: absolute;
+}
+.header-line {
+ background: #DFF8F5;
+ overflow: hidden;
+}
+
+.header-line .img-content {
+ float: right;
+ margin-right: 1em;
+ padding-right: 1em;
+ width: 45%;
+ min-width: 300px;
+}
+
+.header-line .text-content {
+ margin-left: 1em;
+ padding: 1em;
+ float: left;
+ width: 45%;
+}
+
+
+
address@hidden (max-width: 650px){
+ .header-line .img-content {
+ width: 100%;
+ margin: 0px;
+ padding: 0px;
+ }
+
+
+ .img-content img{
+ width: 100%;
+ }
+
+ .header-line .text-content {
+ width: 100%;
+ margin: 0px;
+ padding: 1em;
+ }
+
+ .footer-center{
+ width: 100%;
+ }
+
+
+ .footer-left{
+ width: 100%;
+ text-align: left;
+ padding-left: 2em;
+ }
+}
+
+
address@hidden (min-width: 650px){
+ .footer-left {
+ float: left;
+ width: 25%;
+ text-align: left;
+ padding-left: 2em;
+ }
+}
+
address@hidden (max-width: 62em) {
.custom-menu {
display: block;
}
@@ -182,7 +262,7 @@
.custom-menu-bottom {
position: absolute;
width: 100%;
- border-top: 1px solid #eee;
+ /* border-top: 1px solid #eee; */
background-color: #2d3e50\9;
z-index: 100;
}
@@ -215,4 +295,220 @@
overflow: hidden;
}
-}
\ No newline at end of file
+
+ .footer-right{
+ display: none;
+ }
+
+}
+
+.footer{
+ background: #E7EFF1;
+ white-space: nowrap;
+ position: absolute;
+ color: black;
+
+ width: 100%;
+}
+
+.footer a{
+ color: #2D6D8F;
+}
+
+.footer a:hover{
+ color: #00acb8;
+}
+
+
address@hidden (min-width: 62em) {
+ .img-logo img {
+ max-width: 75%;
+ height: auto;
+ padding-left: 0.8em;
+ }
+
+ .custom-menu{
+ width: 50%;
+ }
+
+ .costum-menu-right{
+ margin-bottom: 110px;
+ position: relative;
+ }
+
+
+ .pure-menu-list{
+ margin-right: 2em;
+ }
+
+ .costum-menu-border{
+ border-left: solid #2D6D8F 0.15em;
+ }
+
+ .pure-menu-nav a{
+ padding-right: 0.4em !important;
+ padding-left: 0.2em !important;
+ }
+ .pure-u-lg-1-2 {
+ width: 49%
+ }
+
+ .search-left-field{
+ margin-right: 1%;
+ }
+
+ .search-right-field{
+ margin-left: 1%;
+ }
+}
+
+.footer-center {
+ float: left;
+ width: 42%;
+ text-align: left;
+ padding-left: 2em;
+}
+
+.footer-right {
+ float: right;
+ width: 33%;
+ text-align: left;
+ padding-left: 2em;
+}
+
+.footer-left img{
+ width: 80%;
+ height: auto;
+}
+
+.select-box ul {
+ list-style-type: none;
+ padding: 0px;
+}
+
+.img-desc img{
+ height: 336px;
+ width: 560px;
+ padding-top: 5px;
+}
+
+.images dt{
+ margin: 0px 0px 20px 0px !important;
+ font-style: normal !important;
+
+}
+
+
+
+
+.search-searchterm, .search-building input{
+ width: 100%;
+ max-width: none !important;
+ margin-top: 1em;
+}
+
+#field_searchterm, .search-building input{
+ /* Firefox */
+ width: -moz-calc(100% - 30px);
+ /* WebKit */
+ width: -webkit-calc(100% - 30px);
+ /* Opera */
+ width: -o-calc(100% - 30px);
+ /* Standard */
+ width: calc(100% - 30px);
+ max-width: none;
+ height: 25px;
+
+}
+
+#submit_searchterm{
+ width: 30px;
+ height: 25px;
+ background:
url('http://aktivby.alesund.kommune.no/phpgwapi/templates/bookingfrontend/images/search_icon.png');
+ background-repeat: no-repeat;
+ background-color: #00ACB8;
+ background-position: center;
+ border: none;
+ display: inline;
+ position: absolute;
+}
+
+#submit_building{
+ width: 30px;
+ height: 25px;
+ background:
url('http://aktivby.alesund.kommune.no/phpgwapi/templates/bookingfrontend/images/search_icon.png');
+ background-repeat: no-repeat;
+ background-color: #00ACB8;
+ background-position: center;
+ border: none;
+ display: inline;
+ position: absolute;
+ pointer-events: none;
+}
+
+
+.search-line .heading {
+ border-bottom: none !important;
+}
+
+
+.control {
+ display: block;
+ position: relative;
+ padding-left: 30px;
+ margin-bottom: 5px;;
+ cursor: pointer;
+ font-size: 18px;
+}
+.control input {
+ position: absolute;
+ z-index: -1;
+ opacity: 0;
+}
+.control__indicator {
+ position: absolute;
+ top: 2px;
+ left: 0;
+ height: 20px;
+ width: 20px;
+ background: white;
+ border: solid 1px gray;
+}
+.control:hover input ~ .control__indicator{
+ background: #E7EFF1;
+}
+.control input:checked ~ .control__indicator {
+ background: #00ACB8;
+}
+.control__indicator:after {
+ content: '';
+ position: absolute;
+ display: none;
+}
+.control input:checked ~ .control__indicator:after {
+ display: block;
+}
+.control--checkbox .control__indicator:after {
+ left: 7px;
+ top: 3px;
+ width: 3px;
+ height: 8px;
+ border: solid #fff;
+ border-width: 0 2px 2px 0;
+ transform: rotate(45deg);
+}
+
+#result{
+ list-style-type: none;
+ padding-left: 0.2em;
+}
+
+
+.resource-button{
+ background-color: #00ACB8;
+ color: white;
+ border: none;
+ padding: .5em;
+ font-weight: bold;
+}
+
Modified: branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -67,6 +67,7 @@
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
}
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
Modified: branches/Version-2_0-branch/phpgwapi/templates/idsociety/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/idsociety/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/idsociety/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -26,6 +26,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified:
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -23,6 +23,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified: branches/Version-2_0-branch/phpgwapi/templates/portico/css/base.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/css/base.css
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/css/base.css
2018-01-09 09:12:00 UTC (rev 17510)
@@ -535,3 +535,13 @@
font-weight: bold;
text-align: center;
}
+
+.historyTable th:first-child{
+ width: 20%;
+}
+
+.historyTable{
+ border-collapse:separate;
+ border-spacing:1.2em;
+ text-align: left;
+}
\ No newline at end of file
Modified: branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -45,6 +45,15 @@
$stylesheets = array();
+ // added aalesund stylesheet
+ $stylesheets[] =
"/phpgwapi/templates/aalesund/bootstrap/css/bootstrap.min.css";
+ $stylesheets[] = "/phpgwapi/templates/aalesund/css/bootstrap.css";
+ $stylesheets[] = "/phpgwapi/templates/aalesund/css/ionicons.css";
+
+ // // // // // // // // // //
+
+
+
// $stylesheets[] = "/phpgwapi/js/materialize/css/materialize.min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/global.css";
// $stylesheets[] = "/phpgwapi/templates/pure/css/demo_mmenu.css";
@@ -51,11 +60,16 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/phpgwapi/templates/base/css/base.css";
$stylesheets[] = "/phpgwapi/templates/portico/css/base.css";
-
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
+
+
+
+
+
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
{
$stylesheets[] =
"/phpgwapi/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
@@ -175,7 +189,7 @@
echo '<body>';
register_shutdown_function('parse_footer_end_noframe');
}
-
+
function parse_footer_end_noframe()
{
$javascript_end =
$GLOBALS['phpgw']->common->get_javascript_end();
Modified:
branches/Version-2_0-branch/phpgwapi/templates/probusiness/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/probusiness/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/probusiness/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -16,6 +16,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -47,6 +47,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
// $stylesheets[] = "/phpgwapi/templates/base/css/base.css";
Modified: branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -27,6 +27,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
Modified: branches/Version-2_0-branch/phpgwapi/templates/verdilak/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/verdilak/head.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/phpgwapi/templates/verdilak/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -30,6 +30,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified: branches/Version-2_0-branch/preferences/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/preferences/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/preferences/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -187,4 +187,5 @@
number of assigned controls on home page preferences no Antall
tildelte kontroller på hjemmeskjerm
filter tickets on assigned to me preferences no Filtrer
meldinger på tildelt til meg.
Do you want av CSV download button for main tables? preferences no
Ønsker du en CSV nedlastingsknapp for hovedtabeller?
-CSV download button preferences no CSV nedlastingsknapp
\ No newline at end of file
+CSV download button preferences no CSV nedlastingsknapp
+help off preferences no Slå av hjelp
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.menu.inc.php 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/property/inc/class.menu.inc.php 2018-01-09
09:12:00 UTC (rev 17510)
@@ -683,7 +683,7 @@
),
'request_condition' => array
(
- 'text' => lang('Request
condition_type'),
+ 'text' => lang('Request
condition type'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index',
'type' =>
'r_condition_type'))
),
Modified: branches/Version-2_0-branch/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiadmin_entity.inc.php
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/property/inc/class.uiadmin_entity.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
@@ -2345,7 +2345,7 @@
$data = array
(
'delete_url' =>
$GLOBALS['phpgw']->link('/index.php', $link_data),
- 'lang_confirm_msg' => lang('do you really want
to convert to eav'),
+ 'lang_confirm_msg' => lang('do you really want
to convert to eav?'),
'lang_delete' => lang('yes'),
'lang_cancel' => lang('no')
);
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -149,7 +149,7 @@
aesthetics property no Estetikk
again property no igjen
agreement property no Avtale
-agreement attributes property no Avtale attributter
+agreement attributes property no Avtale egenskaper
agreement code property no Avtale kode
agreement group property no Avtale gruppe
agreement group code property no Avtale gruppe kode
@@ -207,18 +207,18 @@
attach file property no Legg til som vedlegg
attachments property no Vedlegg
attribute property no Verdier
-list entity attribute group property no List attributtgrupper
-attribute group property no Attributt grupper
-attribute has been edited property no Attributt er rettet
-attribute has been saved property no Attributt er lagret
-attribute has not been deleted property no Attributt er IKKE
slettet
-attribute has not been edited property no Attributt er IKKE endret
-attribute has not been saved property no Attributt er IKKE lagret
-attribute id property no Attributt-id
-attributes property no Attributter
-attributes for the attrib property no Verdier for atributter
-attributes for the entity category property no Attributter for
entitet-kategori
-attributes for the location type property no Attributter for
lokaliserings type
+list entity attribute group property no List egenskapgrupper
+attribute group property no Egenskap grupper
+attribute has been edited property no Egenskap er rettet
+attribute has been saved property no Egenskap er lagret
+attribute has not been deleted property no Egenskap er IKKE slettet
+attribute has not been edited property no Egenskap er IKKE endret
+attribute has not been saved property no Egenskap er IKKE lagret
+attribute id property no Egenskap-id
+attributes property no Egenskaper
+attributes for the attrib property no Verdier for egenskaper
+attributes for the entity category property no Egenskaper for
entitet-kategori
+attributes for the location type property no Egenskaper for
lokaliserings type
attributes for the standard property no verdier for standard
a unique code for this activity property no En unik kode fo
denne aktiviteten
authorities demands property no Myndighetskrav
@@ -303,10 +303,10 @@
check to inherit from this location property no Merk av for å
arve fra denne lokalisering
Check to publish text at frontend property no Merk av for å
publisere i frontend
check to reset the query property no Merk av for å nulle
spørring
-check to show this attribue in lookup forms property no Merk av
for å vise denne attributten i loaliseringsskjema
-check to show this attribute in entity list property no Merk av
for å vise denne attributten i oversikt
-check to show this attribute in list property no Merk av for å
vise denne attributten i oversikt
-check to show this attribute in location list property no Merk av
for å vise denne attributten i oversikt
+check to show this attribue in lookup forms property no Merk av
for å vise denne egenskapen i loaliseringsskjema
+check to show this attribute in entity list property no Merk av
for å vise denne egenskapen i oversikt
+check to show this attribute in list property no Merk av for å
vise denne egenskapen i oversikt
+check to show this attribute in location list property no Merk av
for å vise denne egenskapen i oversikt
check to update the email-address for this vendor property no
kryss av for å oppdatere adressa til denne leverandøren
Check to activate period property no Merk for å aktivere
periode
Check to close period property no Merk for å avslutte periode
@@ -496,7 +496,7 @@
delete the actor property no Slett aktør
delete the agreement property no Slett avtale
delete the apartment property no slett leilighet
-delete the attrib property no slett attributt
+delete the attrib property no slett egenskap
delete the budget account property no Slett kostnadsart
delete the building property no slett bygning
delete the category property no Slett kategori
@@ -602,7 +602,7 @@
edit agreement property no Endre avtale
edit agreement group property no Rette avtale gruppe
edit apartment property no Endre leilighet
-edit attribute property no Endre attributt
+edit attribute property no Endre egenskap
edit budget account property no Rette kostnadsart
edit building property no Endre bygning
edit categories property no Endre kategorier
@@ -640,7 +640,7 @@
edit the agreement_group property no Endre avtalegruppe
edit the alarm property no Endre alarm
edit the apartment property no Endre leilighet
-edit the attrib property no Endre attributt
+edit the attrib property no Endre egenskap
edit the budget account property no Endre kostnadsart
edit the building property no Endre bygning
edit the category property no Endre kategorien
@@ -678,9 +678,9 @@
enable property no Aktiver
enabled property no Aktiv
enable file upload property no Aktiver opplasting av filer
-enable history for this attribute property no Aktiver
historikk for denne attributten
+enable history for this attribute property no Aktiver
historikk for denne egenskapen
enable link from location detail property no Aktiver link
fra detaljer for areal
-enables help message for this attribute property no
Hjelpetekst for denne attributten
+enables help message for this attribute property no
Hjelpetekst for denne egenskapen
enable start project from this category property no
Aktiviser mulighet for å starte prosjekt herfra
end property no Slutt
end date property no Sluttdato
@@ -694,7 +694,7 @@
enter a description of the request property no Gi en
beskrivelse av tilstanden
enter a description of the standard property no Gi en
beskrivelse av standarden
enter a description of the status property no Angi en
beskrivelse av statusen
-enter a description the attribute property no Gi en
beskrivelse av attributten
+enter a description the attribute property no Gi en
beskrivelse av egenskapen
enter a description the budget account property no Angi en
beskrivelse av kostnadsarten
enter a description the category property no Angi en
beskrivelse av kategorien
enter a description the method property no Angi en beskrivelse av
metoden
@@ -737,8 +737,8 @@
enter project name property no Angi prosjektnavn
enter quantity of unit property no Angi mengde
enter request title property no Angi beskrivende navn for tiltak
-enter the attribute id property no Angi attributt-id
-enter the attribute value for this entity property no Angi
attributt verdi for denne posten
+enter the attribute id property no Angi egenskap-id
+enter the attribute value for this entity property no Angi
egenskap verdi for denne posten
enter the billable hour for the task property no Angi egne timer
for oppgaven
enter the budget property no Angi budsjett
enter the budget account property no Angi kostnadsart
@@ -884,7 +884,7 @@
highest property no Høyest
history property no Historikk
history not allowed for this datatype property no Historikk er
ikke tilgjengelig for denne datatypen
-history of this attribute property no Historie for denne
attributten
+history of this attribute property no Historie for denne
egenskapen
hits property no Treff
hour property no Time
hour %1 has been deleted property no Post %1 er slettet
@@ -1004,7 +1004,7 @@
list alarm property no Oversikt alarm
list apartment property no List leilighet
list async method property no List async-metode
-list attribute property no List attributter
+list attribute property no List egenskaper
listbox property no Listbox
list budget property no Oversikt budsjett
list budget account property no list kostnadsart
@@ -1017,7 +1017,7 @@
list deviation property no List avvik
list document property no list dokumenter
list documents property no Oversikt dokument
-list entity attribute property no List entitets-attributter
+list entity attribute property no List entitets-egenskaper
list entity custom function property no List egendefinerte
funskjoner for entiteter
list entity type property no List entitet-type
list entrance property no list inngang
@@ -1027,7 +1027,7 @@
list hours property no List timer
list investment property no List investeringer
list invoice property no List bilag
-list location attribute property no List lokaliserings
attributter
+list location attribute property no List lokaliserings
egenskaper
list location standard property no List lokaliserings standard
list meter property no List måler
list obligations property no Oversikt regnskap
@@ -1225,7 +1225,7 @@
override fraction of common costs property no
Overstyringsfaktor for felleskostnader
overview property no Oversikt
owner property no Eier
-owner attributes property no Eier attributter
+owner attributes property no Eier egenskaper
owner categories property no Eier kategorier
owner type property no Eiertype
paid property no Betalt
@@ -1393,9 +1393,9 @@
reminder property no Påminning
rental property no Utleie
rental agreement property no Utleieavtale
-rental agreement attributes property no Leieavtale-attributter
+rental agreement attributes property no Leieavtale-egenskaper
rental agreement categories property no Leieavtale-kategorier
-rental agreement item attributes property no Attributter for
utleie - detaljer
+rental agreement item attributes property no Egenskaper for
utleie - detaljer
rental type property no Utleietype
re-opened property no Gjenåpnet
repeat property no Serie
@@ -1405,7 +1405,7 @@
set the status of the request property no Sett status for behovet
reset approval property no Nullstill
project.request property no Behov
-request attributes property no Behov::attributter
+request attributes property no Behov egenskaper
request an email receipt property no Be om kvittering
request a confirmation email when your email is opened by the recipient
property no Be om epost som kvittering når mottaker åpner eposten.
request %1 has been edited property no Behov %1 er oppdatert
@@ -1452,7 +1452,7 @@
save the actor and return back to the list property no Lagre
aktøren og returner til oversikten
save the agreement and return back to the list property no Lagre
avtalen og returner til oversikten
save the apartment property no Lagre leilighet
-save the attribute property no Lagre attributt
+save the attribute property no Lagre egenskap
save the budget account property no Lagre budsjettkotntoen
save the building property no lagre bygning
save the category property no Lagre kategorien
@@ -1685,9 +1685,9 @@
serious consequences property no Store konsekvenser
service property no Tjeneste
service agreement property no Serviceavtale
-service agreement attributes property no Serviceavtale
attributter
+service agreement attributes property no Serviceavtale egenskaper
service agreement categories property no Serviceavtale kategorier
-service agreement item attributes property no Attributter for
serviceavtaler - detaljer
+service agreement item attributes property no Egenskaper for
serviceavtaler - detaljer
set grants property no Sett tillatelser
set new status property no Sett ny status
set tax property no Angi MVA
@@ -1765,7 +1765,7 @@
template %1 is added property no Mal %1 er lagt til
template id property no Mal-id
tenant property no Leietaker
-tenant attributes property no Leietaker attributter
+tenant attributes property no Leietaker egenskaper
tenant categories property no Leietaker kategorier
.tenant_claim property no Leietaker krav
tenant claim property no Leietaker krav
@@ -1806,7 +1806,7 @@
this agreement group code is already registered! property no
Denne avtale-gruppe-koden er allerede registert!
this apartment_id id does not exist! property no Denne
leilighet-id eksisterer ikke
this apartment is already registered! property no Denne
leiligheten er allrerede registert
-this attribute turn up as disabled in the form property no Denne
attributten vises som inaktivt i skjemaet
+this attribute turn up as disabled in the form property no Denne
egenskapen vises som inaktivt i skjemaet
this building id does not exist! property no Denne
bygnings-id eksisterer ikke
this building_id id does not exist! property no Denne
bygnings-id eksisterer ikke
this building is already registered! property no denne bygningen
er allrerede registert
@@ -1881,7 +1881,7 @@
values property no Verdier
varchar property no varchar
vendor property no Leverandør
-vendor attributes property no Leverandør attributter
+vendor attributes property no Leverandør egenskaper
vendor categories property no Leverandør kategorier
vendor global categories property no Globale leverandør
kategorier
vendor has been added property no Leverandør er lagt til
@@ -1914,7 +1914,7 @@
view template detail property no Vis mal-detaljer
view tender property no Vis beskrivelse
view the apartment property no Vis leilighet
-view the attrib property no Vis attributt
+view the attrib property no Vis egenskap
view the budget account property no Vis kostnadsart
view the building property no Vis bygning
view the category property no Vis kategorien
@@ -1990,7 +1990,7 @@
you are not approved for this dimb: %1 property no Du mangler
rettigheter for dette ansvarsstedet: %1
you have entered an invalid end date ! property no Du har angitt
en ugyldig slutt dato
you have entered an invalid start date ! property no Du har
angitt en ugyldig start dato
-you have no edit right for this project property no Du har
ikke editeringsrettigheter for dette prosjektet
+you have no edit right for this project property no Du har
ikke redigeringsrettigheter for dette prosjektet
you do not have permission to approve this order property no
Du har ikke rettighteter for a godkjenne bestillingen
you have to select a budget responsible for this invoice in order to add the
invoice property no Du må velge en anviser for å kunne legge til
en faktura
you have to select a budget responsible for this invoice in order to make the
import property no Du må velge en anviser for å importere
@@ -2053,7 +2053,7 @@
modified on common no Oppdatert
property type property no Type
hjemmel common no Hjemmel
-record has been edited common no Data er editert
+record has been edited common no Data er redigert
external project property no Eksternt prosjekt
unspsc code common no UNSPSC-kode
order received property no Varemottak
@@ -2093,14 +2093,14 @@
file name property no Filnavn
row property no Rad
download preview components property no Last ned
forhåndsvisning av komponenter
-new attributes property no Nye attributter
+new attributes property no Nye egenskaper
new categories property no Nye kategorier
save profile property no Lagre profil
-columns and attributes property no Kolonner og attributter
-attribute name for component id property no Attributtnavn
for komponent id
+columns and attributes property no Kolonner og egenskaper
+attribute name for component id property no Egenskapnavn
for komponent id
category template property no Kategori mal
profile property no Profil
-new attribute property no Ny attributt
+new attribute property no Ny egenskap
report property no Rapport
canceled property no Kansellert
substitute property no Vikar
@@ -2168,7 +2168,7 @@
list report definitions property no List rapportdefinisjon
location contact property no Lokasjonskontakt
location has been updated property no Lokasjon er oppdatert
-mandatory actual cost property no Obligatorisk faktis kostnad
+mandatory actual cost property no Obligatorisk faktisk kostnad
mandatory project group property no Obligatorisk
prosjektgruppe
mine documents property no Mine dokumenter
mine tasks property no Mine oppgaver
@@ -2186,7 +2186,7 @@
please enter a multiplier ! property no Angi en multiplikator
please enter a status ! property no Angi en status
print the ticket property no Skriv ut melding
-project attributes property no Prosjektatributter
+project attributes property no Prosjektegenskaper
project status property no Prosjektstatus
projekt property no Prosjekt
reporting property no Rapportering
@@ -2212,7 +2212,7 @@
target property no Mål
target project property no Mål-prosjekt
tenant category property no Leietakerkategori
-ticket attributes property no Meldingsattributter
+ticket attributes property no Meldingsegenskaper
ticket config property no Meldingskonfigurasjon
ticket priority property no Meldingsprioritet
ticket status property no Meldingsstatus
@@ -2223,7 +2223,7 @@
directory property no Katalog
select template property no Velg mal
select parent property no Velg forelder
-attribute groups property no Attributtgrupper
+attribute groups property no Egenskapgrupper
sms text property no SMS-tekst
character left property no Resterende tegn
delivery address property no Leveringsadresse
@@ -2244,4 +2244,152 @@
refund property no Refusjon
both property no Begge
condition survey location level property no
Tilstandsanalyse lokasjonsnivå
-condition survey import category property no
Tilstandsanalyse importkategori
\ No newline at end of file
+condition survey import category property no
Tilstandsanalyse importkategori
+show overdue projects on main screen property no Vis prosjekter
over tiden på hovedskjermen
+link to projects you are assigned to property no Knytt til
prosjekter du er tildelt
+show open tenant claims on main screen property no Vis åpne
leietaker krav på hovedskjermen
+link to claims you are assigned to property no Knytt til krav
du er tildelt
+the default group to assign a ticket in helpdesk-submodule property
no Standardgruppen for å tildele en billett i helpdesk-submodule
+budget account as listbox property no Budsjettkonto som
listeboks
+the input type for budget account property no Input typen for
budsjettkonto
+default unspsc code property no Standard unspsc kode
+contact block 1 property no Kontakt blokk 1
+contact block 2 property no Kontakt blokk 2
+check missing project budget property no Sjekk manglende
prosjekt budsjett
+request condition_type property no Forespør betingelsestype
+pending action type property no Venter på handlingstype
+use acl for document types. (not implementet) property no Bruk
acl for dokumenttyper . (Ikke implementert)
+org unit id property no Organsisasjonsnummer
+order footer header property no Overskrift for
bestillings-avslutnings-tekst
+order footer property no bestillings-avslutnings-tekst
+order logo property no Logo på bestilling
+order logo width property no Bredde for logo på bestilling
+SMS client order notice property no SMS-varsling til kunde
+none selected property no Ingen valgt
+dimb responsible 1 property no kostnadsstedsansvarlig 1
+dimb responsible 2 property no kostnadsstedsansvarlig 2
+invoicehandler property no Fakturahåndterer
+invoice acl property no Kontroll av fakturarettigheter
+project status on approval property no Prosjektstatus ved
godkjenning
+project status on last order closed property no Prosjektstatus
ved siste ordre lukket
+workorder status on approval property no Arbeidsordre status ved
godkjenning
+ticket status on approval property no Meldingsstatus ved
godkjenning
+approval amount limit property no Godkjenningsgrense
+approval level property no Godkjenningsnivå
+workorder status on ordered property no Arbeidsordre status ved
bestilling
+request status on project hookup property no Behovsstatus
ved prosjektoppkobling
+request status on ticket hookup property no Behovsstatus
ved meldingsoppkobling
+workorder status that are to be set when invoice is processed property
no Arbeidsordre status som skal settes når fakturaen er behandlet
+workorder reopen status that are to be set when invoice is processed
property no Arbeidsordre gjenåpne-status som skal settes når
fakturaen er behandlet
+require building part at workorder property no Krever
bygningsdel på arbeidsordre
+require vendor at workorder property no Krever leverandør på
arbeidsordre
+delay operation workorder end date property no Utsett
sluttdato for driftsarbeidsordre
+last day in year property no siste dag i året
+enable unspsc kode property no Aktiver unspsc kode
+enable order service id property no Aktiver dimensjonen
tjeneste i bestilling
+default municipal number property no Standard kommunenummer
+tax property no MVA
+enter the location of files url property no Skriv inn
adressen til filene (url)
+path to external files for use with location property no Sti til
eksterne filer for bruk med plassering
+on windows use property no På Windows bruk
+max recursive level at external files property no Maks rekursivt
nivå på eksterne filer
+filter at level at external files property no Filter på nivå
ved eksterne filer
+enter map url property no Skriv inn kart url
+enter gab location level property no Skriv inn
matrikkel-lokasjonsnivå
+default value is property no Standardverdi er
+enter gab url property no Skriv inn matrikkel url
+gab url paramtres property no Matrikkel url parametre
+suppress old tenant property no Deaktiver leietaker
+show billable hours property no Vis egne timer
+open translates to property no Åpen oversetter til
+tts assign group candidates property no Tts tildele
gruppekandidater
+tts disable assign to user on add property no Tts deaktivere
tilordne til bruker på legg til
+tts simplified group property no Tts forenklet gruppe
+tts simplified categories property no Tts forenklet kategorier
+mail notification property no E-post varsling
+owner notification project property no Prosjekteier varsles
+owner notification tts property no Eier varsling tts
+assigned notification tts property no Tildelt varsling tts
+group notification tts property no Gruppe varsling tts
+tts file upload property no Tts filopplasting
+mandatory title tts property no Obligatorisk tittel for
meldinger (tts)
+tts finnish date property no Tts ferdig dato
+tts order contact at location property no Tts bestille kontakt på
stedet
+send response tts property no Sende svar tts
+project suppress meter property no Prosjekt: deaktiver måler
+project suppress coordination property no Prosjekt: deaktiver
koordinering
+project optional category property no Prosjekt: valgfri
kategori
+request show dates property no Behov: vis datoer
+request location level property no Behov: lokasjonsnivå
+request coordinator text property no Behov: koordinatortekst
+meter table property no Målertabell
+receive workorder status by sms property no Motta
arbeidsordre status via SMS
+use acl for accessing location based information property no
Bruk acl for å få tilgang til plasseringbasert informasjon
+bypass acl for accessing tickets property no Bypass acl for
å få tilgang til meldinger
+bypass acl for accessing entities property no Bypass acl for
å få tilgang til generiske entiteter
+use acl for helpdesk categories property no Bruk acl for
meldingskategorier
+use location at workorder property no Bruk lokasjon på
arbeidsordre
+budget at project level property no Budsjett på prosjektnivå
+common budget account at project level property no Felles
budsjettkonto på prosjektnivå
+update project budget from order property no Oppdater
prosjektbudsjett fra ordre
+disallow multiple condition types at demands property no Ikke
tillat flere tilstandstyper på behov
+list location level property no List lokasjonsnivå
+ntlm alternative host property no Alternativ serverhost ved ntlm
(filopplasting)
+uploader filetypes property no Opplastingsfiltyper
+filter buildingpart property no Filter for bygningsdel
+condition survey import category property no Importkategori
for tilstandsanalyse
+initial status that are to be set when condition survey are imported
property no Innledende status som skal settes når tilstandsanalysen
blir importert
+hidden status that are to be set when condition survey are imported
property no Skjulte statuser som skal settes når tilstandsanalyse
blir importert
+obsolete status that are to be set for old records when condition survey are
imported property no Foreldet status som skal settes for gamle
poster når tilstandsundersøkelsen blir importert
+NO property no NEI
+YES property no JA
+None property no Ingen
+location_id property no Lokasjons ID
+entity property no Entitet
+short description property no Kort beskrivelse
+do you really want to convert to eav property no Er du sikker på
at du vil konvertere til eav?
+appname property no modulnavn
+add attribute property no Legg til egenskap
+column name property no Kolonnenavn
+input text property no Ledetekst
+statustext property no Statustekst
+no group property no Ingen gruppe
+no datatype property no Ingen datatype
+precision property no Presisjon
+scale property no Scale
+nullable property no Nullverdier
+select nullable property no Velg nullverdi
+show in list property no Vis i liste
+include in search property no Inkluder i søk
+true property no Sant
+false property no Falsk
+history property no Historie
+help property no Hjelp
+do you really want to recalculate all actual cost for all workorders
property no Vil du omregne alle faktiske kostnader for alle
arbeidsordre?
+custom function property no Egendefinerte funksjoner
+list custom function property no Liste over egendefinerte
funksjoner
+pre commit property no Før lagring til databasen
+client side property no Klientside
+location property no Lokasjon
+list custom attribute property no Liste over egendefinerte
egenskaper
+client-side property no Klientside
+default ticket categories property no Default meldingskategori
+default assign to tts property no Default tildele til, meldinger
+default group tts property no Default gruppe for meldinger
+dimb role property no DimB Rolle
+process code property no Årsakskode
+add timer property no Legg til tidsplan
+migrate property no Migrer
+list available domains property no Liste over domener
+db_host property no Db_server
+db_name property no Db_navn
+db_type property no Db_type
+distribute property no Distribuer
+distribute year property no Distribuerings år
+settings property no Innstillinger
+ask for workorder approval by email property no Be om
betillingsgodkjenning via e-post
+ask for project approval by email property no Be om
prosjektgodkjenning via e-post
+TTS default interface property no TTS default interface
+FM settings property no Innstillinger for eiendomsforvaltning
+pending action type property no Handlingstyper
+comma separated email addresses to be notified about tenant claim
property no Kommmaseparert liste over hvem som skal ha e-post om
leietakerkrav
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/setup/phpgw_no_bh.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no_bh.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/property/setup/phpgw_no_bh.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -159,16 +159,16 @@
async method property no async metode
async method has been saved property no async metode er lagret
Attribute property no Verdier
-Attribute has been edited property no Attributt er rettet
-Attribute has been saved property no Attributt er lagret
-Attribute has NOT been deleted property no Attributt er IKKE
slettet
-Attribute has NOT been edited property no Attributt er IKKE endret
-Attribute has NOT been saved property no Attributt er IKKE lagret
-Attribute ID property no Attributt ID
-Attributes property no Attributter
-attributes for the attrib property no Verdier for atributter
-attributes for the entity category property no Attributter for
entitet-kategori
-attributes for the location type property no Attributter for
lokaliserings type
+Attribute has been edited property no Egenskap er rettet
+Attribute has been saved property no Egenskap er lagret
+Attribute has NOT been deleted property no Egenskap er IKKE slettet
+Attribute has NOT been edited property no Egenskap er IKKE endret
+Attribute has NOT been saved property no Egenskap er IKKE lagret
+Attribute ID property no Egenskap ID
+Attributes property no Egenskaper
+attributes for the attrib property no Verdier for egenskaper
+attributes for the entity category property no Egenskaper for
entitet-kategori
+attributes for the location type property no Egenskaper for
lokaliserings type
attributes for the standard property no verdier for standard
A unique code for this activity property no En unik kode fo
denne aktiviteten
authorities demands property no Offentlige pålegg
@@ -237,10 +237,10 @@
Check to delete this request from this project property no Merk
for a slette dette tiltaket fra dette reklamasjonssaket
check to inherit from this location property no Merk av for å
arve fra denne lokalisering
check to reset the query property no Merk av for å nulle
spørring
-check to show this attribue in lookup forms property no Merk av
for å vise denne attributten i loaliseringsskjema
-check to show this attribute in entity list property no Merk av
for å vise denne attributten i oversikt
-check to show this attribute in list property no Merk av for å
vise denne attributten i oversikt
-check to show this attribute in location list property no Merk av
for å vise denne attributten i oversikt
+check to show this attribue in lookup forms property no Merk av
for å vise denne egenskapen i loaliseringsskjema
+check to show this attribute in entity list property no Merk av
for å vise denne egenskapen i oversikt
+check to show this attribute in list property no Merk av for å
vise denne egenskapen i oversikt
+check to show this attribute in location list property no Merk av
for å vise denne egenskapen i oversikt
Check to update the email-address for this vendor property no
kryss av for å oppdatere adressa til denne levedrandøren
Choice property no Valg
Choose a category property no Velg en kategori
@@ -367,7 +367,7 @@
delete the actor property no Slett aktør
delete the agreement property no Slett avtale
delete the apartment property no slett leilighet
-delete the attrib property no slett attributt
+delete the attrib property no slett egenskap
delete the budget account property no Slett budsjettkonto
delete the building property no slett bygning
delete the category property no Slett kategori
@@ -456,7 +456,7 @@
edit agreement property no rette avtale
edit agreement group property no Rette avtale gruppe
edit apartment property no rette leilighet
-edit attribute property no endre attributt
+edit attribute property no endre egenskap
edit budget account property no Rette budsjettkonto
edit building property no rette bygning
edit category property no Rette kategori
@@ -489,7 +489,7 @@
edit the agreement_group property no Rette avtalegruppe
edit the alarm property no Rette alarm
edit the apartment property no rette leilighet
-edit the attrib property no rette attributt
+edit the attrib property no rette egenskap
edit the budget account property no Rette budsjettkonto
edit the building property no rette bygning
edit the category property no Rette kategorien
@@ -528,8 +528,8 @@
Enable property no Aktiver
Enabled property no Aktiv
Enable file upload property no Aktiver opplasting av filer
-Enables help message for this attribute property no
Hjelpetekst for denne attributten
-Enable history for this attribute property no Aktiver
historikk for denne attributten
+Enables help message for this attribute property no
Hjelpetekst for denne egenskapen
+Enable history for this attribute property no Aktiver
historikk for denne egenskapen
Enable link from location detail property no Aktiver link
fra detaljer for areal
Enable start project from this category property no
Aktiviser mulighet for å starte reklamasjonssak herfra
end property no slutt
@@ -545,7 +545,7 @@
Enter a description of the request property no gi en
beskrivelse av anmodningen
Enter a description of the standard property no gi en
beskrivelse av standarden
Enter a description of the status property no Angi en
beskrivelse av statusen
-Enter a description the attribute property no gi en
beskrivelse av attributten
+Enter a description the attribute property no gi en
beskrivelse av egenskapen
Enter a description the budget account property no Angi en
beskrivelse av budsjettkontoen
Enter a description the category property no Angi en
beskrivelse av kategorien
Enter a description the method property no Angi en beskrivelse av
metoden
@@ -586,8 +586,8 @@
Enter Project Name property no Angi Reklamasjonssak navn
Enter quantity of unit property no angi mengde
Enter request Title property no angi tittel for anmodning
-Enter the attribute ID property no angi attributt ID
-Enter the attribute value for this entity property no angi
attributt verdi for denne posten
+Enter the attribute ID property no angi egenskap ID
+Enter the attribute value for this entity property no angi
egenskap verdi for denne posten
Enter the budget property no Angi budsjett
Enter the budget account property no Angi budsjettkonto
Enter the category ID property no Angi kategori ID
@@ -709,7 +709,7 @@
Highest property no Høyest
History property no Historikk
History not allowed for this datatype property no Historikk er
ikke tilgjengelig for denne datatypen
-history of this attribute property no Historie for denne
attributten
+history of this attribute property no Historie for denne
egenskapen
hour property no Time
Hour property no Time
hour %1 has been deleted property no post %1 er slettet
@@ -820,7 +820,7 @@
list agreement group property no List avtalegruppe
list apartment property no list leilighet
list async method property no List async-metode
-list attribute property no List attributter
+list attribute property no List egenskaper
ListBox property no ListBox
list budget account property no list budsjett konto
list building property no list bygning
@@ -829,7 +829,7 @@
list custom function property no List egendefinerte funksjoner
list deviation property no List avvik
list document property no list dokumenter
-list entity attribute property no List entitet-attributter
+list entity attribute property no List entitet-egenskaper
list entity custom function property no List egendefinerte
funskjoner for entiteter
list entity type property no List entitet-type
list entrance property no list inngang
@@ -839,7 +839,7 @@
list hours property no List timer
list investment property no List investeringer
list invoice property no List bilag
-list location attribute property no List lokaliserings
attributter
+list location attribute property no List lokaliserings
egenskaper
list location standard property no List lokaliserings standard
list meter property no List måler
list paid invoice property no List betalte bilag
@@ -1132,7 +1132,7 @@
Save the actor and return back to the list property no Lagre
aktøren og returner til oversikten
Save the agreement and return back to the list property no Lagre
avtalen og returner til oversikten
Save the apartment property no lagre leilighet
-Save the attribute property no lagre attributt
+Save the attribute property no lagre egenskap
Save the budget account property no Lagre budsjettkotntoen
Save the building property no lagre bygning
Save the category property no Lagre kategorien
@@ -1450,7 +1450,7 @@
This agreement group code is already registered! property no
Denne avtale-gruppe-koden er allerede registert!
This apartment_id ID does not exist! property no Denne leilighet
ID eksisterer ikke
This apartment is already registered! property no denne
leiligheten er allrerede registert
-This attribute turn up as disabled in the form property no Denne
attributten vises som inaktivt i skjemaet
+This attribute turn up as disabled in the form property no Denne
egenskapen vises som inaktivt i skjemaet
This Building ID does not exist! property no Denne bygnings
ID eksisterer ikke
This building_id ID does not exist! property no Denne bygnings
ID eksisterer ikke
This building is already registered! property no denne bygningen
er allrerede registert
@@ -1552,7 +1552,7 @@
view template detail property no vis mal-detaljer
View tender property no Vis anbud
view the apartment property no vis leilighet
-view the attrib property no vis attributt
+view the attrib property no vis egenskap
view the budget account property no Vis budsjettkonto
view the building property no vis bygning
view the category property no Vis kategorien
@@ -1614,7 +1614,7 @@
yes property no Ja
You have entered an invalid end date ! property no Du har angitt
en ugyldig slutt dato
You have entered an invalid start date ! property no Du har
angitt en ugyldig start dato
-You have no edit right for this project property no Du har
ikke editeringsrettigheter for dette reklamasjonssaket
+You have no edit right for this project property no Du har
ikke redigeringsrettigheter for dette reklamasjonssaket
You have to select a budget responsible for this invoice in order to add the
invoice property no Du må velge en budsjettansvarlig for å kunne
legge til en faktura
You have to select a budget responsible for this invoice in order to make the
import property no Du må velge en budsjettansvarlig for å
importere
You have to select the Conversion for this import property no
Du må velge importformat
Modified: branches/Version-2_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/config.tpl
2018-01-09 09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/property/templates/base/config.tpl
2018-01-09 09:12:00 UTC (rev 17510)
@@ -482,7 +482,7 @@
</tr>
<tr>
-
<td>{lang_Ask_for_workorder_approval_by_e-mail}.</td>
+
<td>{lang_Ask_for_workorder_approval_by_email}.</td>
<td>
<select
name="newsettings[workorder_approval]">
<option value=""
{selected_workorder_approval_}>NO</option>
@@ -492,7 +492,7 @@
</tr>
<tr>
-
<td>{lang_Ask_for_project_approval_by_e-mail}.</td>
+
<td>{lang_Ask_for_project_approval_by_email}.</td>
<td>
<select
name="newsettings[project_approval]">
<option value=""
{selected_project_approval_}>NO</option>
@@ -549,7 +549,7 @@
<tr>
- <td>{lang_lang_request_coordinator}:</td>
+ <td>{lang_request_coordinator_text}:</td>
<td><input
name="newsettings[lang_request_coordinator]"
value="{value_lang_request_coordinator}"></td>
</tr>
@@ -558,7 +558,7 @@
<td><input name="newsettings[meter_table]"
value="{value_meter_table}"></td>
</tr>
<tr>
-
<td>{lang_email_addresses_(comma-separated)_to_be_notified_about_tenant_claim_(empty_for_no_notify)}:</td>
+
<td>{lang_comma_separated_email_addresses_to_be_notified_about_tenant_claim}:</td>
<td>
<input
name="newsettings[tenant_claim_notify_mails]"
value="{value_tenant_claim_notify_mails}" size="40">
</td>
Modified: branches/Version-2_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tts.xsl 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/property/templates/base/tts.xsl 2018-01-09
09:12:00 UTC (rev 17510)
@@ -691,7 +691,7 @@
<xsl:value-of select="$lang_sms_text"/>
</a>
</label>
- <textarea
class="pure-input-1-2" rows="{textarearows}" id="response_text"
name="values[response_text]" onKeyUp="javascript: SmsCountKeyUp(160);"
onKeyDown="javascript: SmsCountKeyDown(160);" wrap="virtual">
+ <textarea
class="pure-input-1-2" rows="{textarearows}" id="response_text"
name="values[response_text]" onKeyUp="javascript: SmsCountKeyUp(804);"
onKeyDown="javascript: SmsCountKeyDown(804);" wrap="virtual">
<xsl:attribute name="title">
<xsl:value-of select="$lang_sms_text"/>
</xsl:attribute>
@@ -701,7 +701,7 @@
<label>
<xsl:value-of select="php:function('lang', 'character left')"/>
</label>
- <input
type="text" readonly="readonly" size="3" maxlength="3"
name="charNumberLeftOutput" id="charNumberLeftOutput" value="160">
+ <input
type="text" readonly="readonly" size="3" maxlength="3"
name="charNumberLeftOutput" id="charNumberLeftOutput" value="804">
</input>
</div>
</xsl:when>
Modified: branches/Version-2_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/rental/setup/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/rental/setup/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -431,7 +431,7 @@
payer_id rental no Fakturamottaker
percent rental no Prosent
period rental no Periode
-permission_denied_edit_contract rental no Du mangler rettigheter
for å legge til å editere kontrakten
+permission_denied_edit_contract rental no Du mangler rettigheter
for å legge til å redigere kontrakten
permission_denied_new_contract rental no Du mangler rettigheter for å
legge til å opprette nye kontrakter
permission_denied_view_contract rental no Du mangler rettigheter
for å legge til å se kontrakten
permission_denied_add_document rental no Du mangler rettigheter for å
legge til et dokumenent
Modified: branches/Version-2_0-branch/setup/lang/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/setup/lang/phpgw_no.lang 2018-01-09
09:06:24 UTC (rev 17509)
+++ branches/Version-2_0-branch/setup/lang/phpgw_no.lang 2018-01-09
09:12:00 UTC (rev 17510)
@@ -253,7 +253,7 @@
possible solutions setup no Possible Solutions
post-install dependency failure setup no Post-install Dependency
Failure
potential problem setup no Potential Problem
-preferences setup no Preferences
+preferences setup no Innstillinger
problem resolution setup no Problem resolution
process setup no Process
processing upgrade for %1 setup no processing upgrade for %1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17510] Stable: Merge 17492:17509 from trunk,
sigurdne <=