[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17478] Stable: Merge 17431:17477 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17478] Stable: Merge 17431:17477 from trunk |
|
Date: |
Tue, 2 Jan 2018 03:18:58 -0500 (EST) |
Revision: 17478
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17478
Author: sigurdne
Date: 2018-01-02 03:18:55 -0500 (Tue, 02 Jan 2018)
Log Message:
-----------
Stable: Merge 17431:17477 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/about.php
branches/Version-2_0-branch/activitycalendarfrontend/index.php
branches/Version-2_0-branch/admin/inc/class.menu.inc.php
branches/Version-2_0-branch/booking/frontend.php
branches/Version-2_0-branch/booking/inc/class.uiasync_settings.inc.php
branches/Version-2_0-branch/booking/setup/default_records.inc.php
branches/Version-2_0-branch/booking/setup/phpgw_no.lang
branches/Version-2_0-branch/booking/templates/base/organization_edit.xsl
branches/Version-2_0-branch/bookingfrontend/index.php
branches/Version-2_0-branch/bookingfrontend/js/aalesund/application.js
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/application_new.xsl
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building.xsl
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/search.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
branches/Version-2_0-branch/controller/js/controller/component.index.js
branches/Version-2_0-branch/controller/setup/phpgw_no.lang
branches/Version-2_0-branch/controller/templates/base/component.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/create_case_message.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/add_check_list.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
branches/Version-2_0-branch/eventplannerfrontend/session.php
branches/Version-2_0-branch/frontend/inc/class.uidelegates.inc.php
branches/Version-2_0-branch/frontend/setup/phpgw_no.lang
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-active-record.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-active-recordx.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-csvlib.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-datadict.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-error.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-errorhandler.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-errorpear.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-exceptions.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-iterator.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-lib.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-pager.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-pear.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-perf.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-php4.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-time.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/adodb.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/composer.json
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-access.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-mssqlnative.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-sqlite.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/docs/changelog.md
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-access.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2oci.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2ora.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssql_n.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssqlnative.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqlpo.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci8quercus.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_sqlite.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_sqlsrv.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres9.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlite3.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/perf/perf-db2.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/perf/perf-informix.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/perf/perf-mssql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/perf/perf-mssqlnative.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/perf/perf-mysql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/perf/perf-oci8.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/perf/perf-postgres.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/pivottable.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/rsfilter.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/server.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-compress-gzip.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-cryptsession.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-cryptsession2.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-session-clob.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-session-clob2.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-session.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/adodb-session2.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/old/adodb-session-clob.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/session/old/adodb-session.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/toexport.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/tohtml.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.acl.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_addr.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_addr_type.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_categories.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_central.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_comm.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_comm_descr.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_comm_type.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_note.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_note_type.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_org.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_org_person.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_others.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_person.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contact_types.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contacts_shared.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.contacts_sql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db_adodb.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.html2text.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.mailer_smtp.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.send.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.sql_builder.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.sql_entity.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/LICENSE
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/README.md
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/VERSION
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/get_oauth_token.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-eo.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-fr.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-id.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-nb.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-nl.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-pt_br.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-tr.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-zh_cn.php
branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/ChangeLog
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/NEWS
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/composer.json
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/debugger/action.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/debugger/common.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/debugger/controller.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/debugger/index.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/agesort.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/introspect.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/mail.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/which.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/wrap.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/server/discuss.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/server/proxy.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/server/server.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/vardemo.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/lib/xmlrpc.inc
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/lib/xmlrpc_wrappers.inc
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/lib/xmlrpcs.inc
branches/Version-2_0-branch/phpgwapi/templates/aalesund/css/sample.css
branches/Version-2_0-branch/phpgwapi/templates/aalesund/footer.tpl
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/img/header.jpg
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/css/frontend.css
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
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/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/phpsysinfo/.gitignore
branches/Version-2_0-branch/phpsysinfo/.htaccess
branches/Version-2_0-branch/phpsysinfo/.travis.yml
branches/Version-2_0-branch/phpsysinfo/CHANGELOG.md
branches/Version-2_0-branch/phpsysinfo/README.md
branches/Version-2_0-branch/phpsysinfo/data/ModelTranslation.txt
branches/Version-2_0-branch/phpsysinfo/data/distros.ini
branches/Version-2_0-branch/phpsysinfo/data/languages.ini
branches/Version-2_0-branch/phpsysinfo/gfx/body.gif
branches/Version-2_0-branch/phpsysinfo/gfx/images/AIX.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Alpine.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Chakra.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Deepin.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/DragonFly.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Eisfair.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/HPUX.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Mageia.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Minix.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/NetBSD.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Oracle.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/PCLinuxOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/PLD.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Pear.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/SMS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Sabayon.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Salix.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Slackware.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/StartOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Synology.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Vector.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Win8.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/antiX.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/elementaryOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/gNewSense.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/iycc.png
branches/Version-2_0-branch/phpsysinfo/gfx/next.gif
branches/Version-2_0-branch/phpsysinfo/gfx/prev.gif
branches/Version-2_0-branch/phpsysinfo/gfx/treeTable/tv-collapsable-last.gif
branches/Version-2_0-branch/phpsysinfo/gfx/treeTable/tv-expandable-last.gif
branches/Version-2_0-branch/phpsysinfo/gfx/treeTable/tv-expandable.gif
branches/Version-2_0-branch/phpsysinfo/includes/autoloader.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/class.CommonFunctions.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/class.Parser.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/interface/class.PSI_Interface_OS.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/interface/class.PSI_Interface_Output.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/interface/class.PSI_Interface_Plugin.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/interface/class.PSI_Interface_Sensor.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/interface/class.PSI_Interface_UPS.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/js/class.JavaScriptPacker.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.coretemp.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.hddtemp.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.healthd.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.hwsensors.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.k8temp.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.lmsensors.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.mbm5.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.mbmon.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.pitemp.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.sensors.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.AIX.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.Android.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.BSDCommon.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.Darwin.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.DragonFly.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.FreeBSD.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.HPUX.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.Haiku.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.Linux.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.Minix.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.NetBSD.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.OS.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.OpenBSD.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.SunOS.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.WINNT.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/output/class.Output.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/output/class.Template.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/output/class.Webpage.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/output/class.WebpageXML.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/output/class.WebpageXSLT.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/plugin/class.PSI_Plugin.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/class.MBInfo.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/class.System.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/class.UPSInfo.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/device/class.CpuDevice.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/device/class.DiskDevice.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/device/class.HWDevice.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/device/class.NetDevice.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/device/class.SensorDevice.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/to/device/class.UPSDevice.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/ups/class.apcupsd.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/ups/class.nut.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/ups/class.ups.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/xml/class.SimpleXMLExtended.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/xml/class.XML.inc.php
branches/Version-2_0-branch/phpsysinfo/index.php
branches/Version-2_0-branch/phpsysinfo/js/jQuery/README
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery-1.js
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.dataTables.js
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.jgrowl.js
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.js
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.nyroModal.js
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.treeTable.js
branches/Version-2_0-branch/phpsysinfo/js/phpSysInfo/phpsysinfo.js
branches/Version-2_0-branch/phpsysinfo/js.php
branches/Version-2_0-branch/phpsysinfo/language/ast.xml
branches/Version-2_0-branch/phpsysinfo/language/bg.xml
branches/Version-2_0-branch/phpsysinfo/language/cz.xml
branches/Version-2_0-branch/phpsysinfo/language/da.xml
branches/Version-2_0-branch/phpsysinfo/language/de.xml
branches/Version-2_0-branch/phpsysinfo/language/en.xml
branches/Version-2_0-branch/phpsysinfo/language/es.xml
branches/Version-2_0-branch/phpsysinfo/language/et.xml
branches/Version-2_0-branch/phpsysinfo/language/fi.xml
branches/Version-2_0-branch/phpsysinfo/language/fr.xml
branches/Version-2_0-branch/phpsysinfo/language/gl.xml
branches/Version-2_0-branch/phpsysinfo/language/gr.xml
branches/Version-2_0-branch/phpsysinfo/language/hu.xml
branches/Version-2_0-branch/phpsysinfo/language/is.xml
branches/Version-2_0-branch/phpsysinfo/language/it.xml
branches/Version-2_0-branch/phpsysinfo/language/ja.xml
branches/Version-2_0-branch/phpsysinfo/language/ko.xml
branches/Version-2_0-branch/phpsysinfo/language/language.php
branches/Version-2_0-branch/phpsysinfo/language/nl.xml
branches/Version-2_0-branch/phpsysinfo/language/no.xml
branches/Version-2_0-branch/phpsysinfo/language/pl.xml
branches/Version-2_0-branch/phpsysinfo/language/pt-br.xml
branches/Version-2_0-branch/phpsysinfo/language/pt-pt.xml
branches/Version-2_0-branch/phpsysinfo/language/ro.xml
branches/Version-2_0-branch/phpsysinfo/language/ru.xml
branches/Version-2_0-branch/phpsysinfo/language/sk.xml
branches/Version-2_0-branch/phpsysinfo/language/sl.xml
branches/Version-2_0-branch/phpsysinfo/language/sv.xml
branches/Version-2_0-branch/phpsysinfo/language/th.xml
branches/Version-2_0-branch/phpsysinfo/language/tr.xml
branches/Version-2_0-branch/phpsysinfo/language/translation-plugin.xsd
branches/Version-2_0-branch/phpsysinfo/language/translation.xsd
branches/Version-2_0-branch/phpsysinfo/language/tw.xml
branches/Version-2_0-branch/phpsysinfo/language/uk.xml
branches/Version-2_0-branch/phpsysinfo/language/zh.xml
branches/Version-2_0-branch/phpsysinfo/phpsysinfo.ini
branches/Version-2_0-branch/phpsysinfo/phpsysinfo.ini.new
branches/Version-2_0-branch/phpsysinfo/phpsysinfo.xslt
branches/Version-2_0-branch/phpsysinfo/phpsysinfo3.xsd
branches/Version-2_0-branch/phpsysinfo/plugins/bat/class.bat.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/bat/js/bat.js
branches/Version-2_0-branch/phpsysinfo/plugins/bat/lang/cz.xml
branches/Version-2_0-branch/phpsysinfo/plugins/bat/lang/en.xml
branches/Version-2_0-branch/phpsysinfo/plugins/bat/lang/fr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/bat/lang/pl.xml
branches/Version-2_0-branch/phpsysinfo/plugins/bat/lang/ru.xml
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/class.mdstatus.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/js/mdstatus.js
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/lang/cz.xml
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/lang/de.xml
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/lang/en.xml
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/lang/fr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/lang/gr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/lang/ru.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/class.ps.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/ps/js/ps.js
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/cz.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/de.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/en.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/fr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/gr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/pl.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/ru.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/class.psstatus.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/css/psstatus.css
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/js/psstatus.js
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/cz.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/de.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/en.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/fr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/gr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/pl.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/ru.xml
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/class.quotas.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/css/quotas.css
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/js/quotas.js
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/lang/cz.xml
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/lang/de.xml
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/lang/en.xml
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/lang/fr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/lang/pl.xml
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/lang/ru.xml
branches/Version-2_0-branch/phpsysinfo/plugins/smart/class.smart.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/smart/css/smart.css
branches/Version-2_0-branch/phpsysinfo/plugins/smart/js/smart.js
branches/Version-2_0-branch/phpsysinfo/plugins/smart/lang/cz.xml
branches/Version-2_0-branch/phpsysinfo/plugins/smart/lang/en.xml
branches/Version-2_0-branch/phpsysinfo/plugins/smart/lang/fr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/smart/lang/gr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/smart/lang/pl.xml
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/class.snmppinfo.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/js/snmppinfo.js
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/lang/cz.xml
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/lang/en.xml
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/lang/pl.xml
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/lang/ru.xml
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/class.updatenotifier.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/js/updatenotifier.js
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/lang/cz.xml
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/lang/en.xml
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/lang/fr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/lang/pl.xml
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/lang/ru.xml
branches/Version-2_0-branch/phpsysinfo/setup/setup.inc.php
branches/Version-2_0-branch/phpsysinfo/setup/tables_update.inc.php
branches/Version-2_0-branch/phpsysinfo/templates/aqua.css
branches/Version-2_0-branch/phpsysinfo/templates/clean.css
branches/Version-2_0-branch/phpsysinfo/templates/cream.css
branches/Version-2_0-branch/phpsysinfo/templates/html/error_config.html
branches/Version-2_0-branch/phpsysinfo/templates/html/index_all.html
branches/Version-2_0-branch/phpsysinfo/templates/html/index_dynamic.html
branches/Version-2_0-branch/phpsysinfo/templates/jstyle_blue.css
branches/Version-2_0-branch/phpsysinfo/templates/jstyle_green.css
branches/Version-2_0-branch/phpsysinfo/templates/nextgen.css
branches/Version-2_0-branch/phpsysinfo/templates/phpsysinfo.css
branches/Version-2_0-branch/phpsysinfo/templates/plugin/jquery.dataTables.css
branches/Version-2_0-branch/phpsysinfo/templates/two.css
branches/Version-2_0-branch/phpsysinfo/tools/check.sh
branches/Version-2_0-branch/phpsysinfo/tools/phpsysinfo.ini
branches/Version-2_0-branch/phpsysinfo/xml.php
branches/Version-2_0-branch/property/inc/class.uiadmin_entity.inc.php
branches/Version-2_0-branch/property/inc/class.uiagreement.inc.php
branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
branches/Version-2_0-branch/property/inc/class.uis_agreement.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
branches/Version-2_0-branch/property/setup/default_records.inc.php
branches/Version-2_0-branch/property/setup/tables_current.inc.php
branches/Version-2_0-branch/registration/main.php
branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
branches/Version-2_0-branch/sms/inc/class.uisms.inc.php
Added Paths:
-----------
branches/Version-2_0-branch/bookingfrontend/js/aalesund/booking.js
branches/Version-2_0-branch/bookingfrontend/js/aalesund/search.js
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/application.xsl
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building_schedule.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/aalesund/resource_schedule.xsl
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql2012.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/drivers/adodb-text.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/lang/adodb-id.inc.php
branches/Version-2_0-branch/phpgwapi/inc/adodb/lang/adodb-oc.inc.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/SECURITY.md
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-ba.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-rs.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/src/
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/INSTALL.md
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/README.md
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/getstatename.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/proxy.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/demo1.xml
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/demo2.xml
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/demo3.xml
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/license.txt
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/pakefile.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/src/
branches/Version-2_0-branch/phpgwapi/js/DataTables/AutoFill/
branches/Version-2_0-branch/phpgwapi/js/DataTables/Buttons/
branches/Version-2_0-branch/phpgwapi/js/DataTables/ColReorder/
branches/Version-2_0-branch/phpgwapi/js/DataTables/DataTables/
branches/Version-2_0-branch/phpgwapi/js/DataTables/FixedColumns/
branches/Version-2_0-branch/phpgwapi/js/DataTables/FixedHeader/
branches/Version-2_0-branch/phpgwapi/js/DataTables/JSZip/
branches/Version-2_0-branch/phpgwapi/js/DataTables/KeyTable/
branches/Version-2_0-branch/phpgwapi/js/DataTables/Responsive/
branches/Version-2_0-branch/phpgwapi/js/DataTables/RowGroup/
branches/Version-2_0-branch/phpgwapi/js/DataTables/RowReorder/
branches/Version-2_0-branch/phpgwapi/js/DataTables/Scroller/
branches/Version-2_0-branch/phpgwapi/js/DataTables/Select/
branches/Version-2_0-branch/phpgwapi/js/DataTables/pdfmake/
branches/Version-2_0-branch/phpsysinfo/data/cpus.ini
branches/Version-2_0-branch/phpsysinfo/data/osnames.ini
branches/Version-2_0-branch/phpsysinfo/data/raspberry.ini
branches/Version-2_0-branch/phpsysinfo/gfx/ajax-loader.gif
branches/Version-2_0-branch/phpsysinfo/gfx/attention.gif
branches/Version-2_0-branch/phpsysinfo/gfx/blank.gif
branches/Version-2_0-branch/phpsysinfo/gfx/bullet_toggle_minus.gif
branches/Version-2_0-branch/phpsysinfo/gfx/bullet_toggle_plus.gif
branches/Version-2_0-branch/phpsysinfo/gfx/down_black.gif
branches/Version-2_0-branch/phpsysinfo/gfx/down_gray.gif
branches/Version-2_0-branch/phpsysinfo/gfx/favicon.gif
branches/Version-2_0-branch/phpsysinfo/gfx/favicon.ico
branches/Version-2_0-branch/phpsysinfo/gfx/images/4MLinux.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Amazon.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/BOSS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Calculate.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Canaima.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Cloud.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Container.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/CoreOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Devuan.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Generations.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Gobo.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Handy.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/HipServ.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/KaOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Korora.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/LFS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Lakka.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/LibreELEC.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Lunar.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Mer.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/NeoKylin.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/NixOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/OpenELEC.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/OpenMamba.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/OpenMandriva.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Parsix.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Pisi.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/PureOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/QNX.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/QTS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Qubes.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Raspbian.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/RedFlag.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/RedHat.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/SMEServer.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/SUSE.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/SalentOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Semplice.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/SliTaz.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Solus.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/SolydXK.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/SteamOS.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Tails.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Tanglu.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/TinyCore.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Tizen.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/UltimateEdition.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Void.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/VortexBox.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Zenwalk.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/openSUSE.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/pfSense.png
branches/Version-2_0-branch/phpsysinfo/gfx/logo_32.gif
branches/Version-2_0-branch/phpsysinfo/gfx/reload.gif
branches/Version-2_0-branch/phpsysinfo/gfx/right_black.gif
branches/Version-2_0-branch/phpsysinfo/gfx/right_gray.gif
branches/Version-2_0-branch/phpsysinfo/gfx/sort_asc.gif
branches/Version-2_0-branch/phpsysinfo/gfx/sort_both.gif
branches/Version-2_0-branch/phpsysinfo/gfx/sort_desc.gif
branches/Version-2_0-branch/phpsysinfo/includes/error/class.PSI_Error.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.freeipmi.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.hwmon.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.ipmitool.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.ipmiutil.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.ohm.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.qtssnmp.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.speedfan.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.thermalzone.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/os/class.QNX.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/ups/class.pmset.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/ups/class.powersoftplus.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/ups/class.snmpups.inc.php
branches/Version-2_0-branch/phpsysinfo/js/jQuery/README_bootstrap
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.ifixpng.js
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.timer.js
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.treegrid.js
branches/Version-2_0-branch/phpsysinfo/js/phpSysInfo/phpsysinfo_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/js/vendor/
branches/Version-2_0-branch/phpsysinfo/language/ca.xml
branches/Version-2_0-branch/phpsysinfo/language/he.xml
branches/Version-2_0-branch/phpsysinfo/plugins/bat/bat_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/plugins/bat/js/bat_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/plugins/bat/lang/de.xml
branches/Version-2_0-branch/phpsysinfo/plugins/bat/lang/ro.xml
branches/Version-2_0-branch/phpsysinfo/plugins/dmraid/
branches/Version-2_0-branch/phpsysinfo/plugins/iptables/
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/gfx/harddrivewarn.png
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/js/mdstatus_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/lang/ro.xml
branches/Version-2_0-branch/phpsysinfo/plugins/mdstatus/mdstatus_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/plugins/pingtest/
branches/Version-2_0-branch/phpsysinfo/plugins/ps/js/ps_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/ro.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/lang/uk.xml
branches/Version-2_0-branch/phpsysinfo/plugins/ps/ps_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/gfx/offline.gif
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/gfx/online.gif
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/js/psstatus_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/ro.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/lang/uk.xml
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/psstatus_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/js/quotas_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/lang/ro.xml
branches/Version-2_0-branch/phpsysinfo/plugins/quotas/quotas_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/plugins/smart/js/smart_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/plugins/smart/lang/ro.xml
branches/Version-2_0-branch/phpsysinfo/plugins/smart/smart_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/js/snmppinfo_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/lang/de.xml
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/lang/fr.xml
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/lang/ro.xml
branches/Version-2_0-branch/phpsysinfo/plugins/snmppinfo/snmppinfo_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/js/updatenotifier_bootstrap.js
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/lang/de.xml
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/lang/ro.xml
branches/Version-2_0-branch/phpsysinfo/plugins/updatenotifier/updatenotifier_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/plugins/uprecords/
branches/Version-2_0-branch/phpsysinfo/read_config.php
branches/Version-2_0-branch/phpsysinfo/templates/base/config.tpl
branches/Version-2_0-branch/phpsysinfo/templates/blue/bar.png
branches/Version-2_0-branch/phpsysinfo/templates/blue/barwarn.png
branches/Version-2_0-branch/phpsysinfo/templates/blue/bg.png
branches/Version-2_0-branch/phpsysinfo/templates/blue/title.png
branches/Version-2_0-branch/phpsysinfo/templates/blue.css
branches/Version-2_0-branch/phpsysinfo/templates/cleansyn.css
branches/Version-2_0-branch/phpsysinfo/templates/dark_bootstrap.css
branches/Version-2_0-branch/phpsysinfo/templates/green_bootstrap.css
branches/Version-2_0-branch/phpsysinfo/templates/html/index_bootstrap.html
branches/Version-2_0-branch/phpsysinfo/templates/idash/
branches/Version-2_0-branch/phpsysinfo/templates/idash.css
branches/Version-2_0-branch/phpsysinfo/templates/lingruby/
branches/Version-2_0-branch/phpsysinfo/templates/lingruby.css
branches/Version-2_0-branch/phpsysinfo/templates/phpsysinfo_bootstrap.css
branches/Version-2_0-branch/phpsysinfo/templates/phpsysinfo_bootstrap.css.new
branches/Version-2_0-branch/phpsysinfo/templates/schabau.css
branches/Version-2_0-branch/phpsysinfo/templates/vendor/
branches/Version-2_0-branch/phpsysinfo/tools/checkdistro.php
branches/Version-2_0-branch/phpsysinfo/tools/cputest.php
branches/Version-2_0-branch/phpsysinfo/tools/distrotest.php
branches/Version-2_0-branch/phpsysinfo/tools/speedfan/
Removed Paths:
-------------
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/PHPMailerAutoload.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/changelog.md
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/class.phpmailer.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/class.phpmaileroauth.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/class.phpmaileroauthgoogle.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/class.pop3.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/class.smtp.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/composer.json
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/composer.lock
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/docs/
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/examples/
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/extras/
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-br.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-cz.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-dk.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-no.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-se.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-sr.php
branches/Version-2_0-branch/phpgwapi/inc/phpmailer/test/
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/INSTALL
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/Makefile
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/README
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/debugger/index.html
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/client.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/comment.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/simple_call.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/client/zopetest.php
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/demo1.txt
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/demo2.txt
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/demo/demo3.txt
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/doc/
branches/Version-2_0-branch/phpgwapi/inc/xmlrpc/test/
branches/Version-2_0-branch/phpgwapi/js/DataTables/Contributing.md
branches/Version-2_0-branch/phpgwapi/js/DataTables/Readme.md
branches/Version-2_0-branch/phpgwapi/js/DataTables/extensions/
branches/Version-2_0-branch/phpgwapi/js/DataTables/license.txt
branches/Version-2_0-branch/phpgwapi/js/DataTables/media/
branches/Version-2_0-branch/phpgwapi/templates/desktop/
branches/Version-2_0-branch/phpgwapi/templates/idots/
branches/Version-2_0-branch/phpgwapi/templates/justweb/
branches/Version-2_0-branch/phpgwapi/templates/linux-at-work.de/
branches/Version-2_0-branch/phpsysinfo/config.php
branches/Version-2_0-branch/phpsysinfo/gfx/attention.png
branches/Version-2_0-branch/phpsysinfo/gfx/bullet_toggle_minus.png
branches/Version-2_0-branch/phpsysinfo/gfx/bullet_toggle_plus.png
branches/Version-2_0-branch/phpsysinfo/gfx/favicon.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/CloudLinux.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Redhat.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Suse.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/Tinycore.png
branches/Version-2_0-branch/phpsysinfo/gfx/images/lfs.png
branches/Version-2_0-branch/phpsysinfo/gfx/reload.png
branches/Version-2_0-branch/phpsysinfo/gfx/sort_asc.png
branches/Version-2_0-branch/phpsysinfo/gfx/sort_both.png
branches/Version-2_0-branch/phpsysinfo/gfx/sort_desc.png
branches/Version-2_0-branch/phpsysinfo/includes/error/class.Error.inc.php
branches/Version-2_0-branch/phpsysinfo/includes/mb/class.ipmi.inc.php
branches/Version-2_0-branch/phpsysinfo/js/jQuery/jquery.timers.js
branches/Version-2_0-branch/phpsysinfo/plugins/BAT/class.bat.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/BAT/js/
branches/Version-2_0-branch/phpsysinfo/plugins/BAT/lang/
branches/Version-2_0-branch/phpsysinfo/plugins/MDStatus/
branches/Version-2_0-branch/phpsysinfo/plugins/PS/class.ps.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/PS/js/
branches/Version-2_0-branch/phpsysinfo/plugins/PS/lang/
branches/Version-2_0-branch/phpsysinfo/plugins/PSStatus/
branches/Version-2_0-branch/phpsysinfo/plugins/Quotas/class.quotas.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/Quotas/css/
branches/Version-2_0-branch/phpsysinfo/plugins/Quotas/js/
branches/Version-2_0-branch/phpsysinfo/plugins/Quotas/lang/
branches/Version-2_0-branch/phpsysinfo/plugins/SMART/class.smart.inc.php
branches/Version-2_0-branch/phpsysinfo/plugins/SMART/css/
branches/Version-2_0-branch/phpsysinfo/plugins/SMART/js/
branches/Version-2_0-branch/phpsysinfo/plugins/SMART/lang/
branches/Version-2_0-branch/phpsysinfo/plugins/ipmiinfo/
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/gfx/offline.png
branches/Version-2_0-branch/phpsysinfo/plugins/psstatus/gfx/online.png
branches/Version-2_0-branch/phpsysinfo/plugins/smart/lang/ru.xml
branches/Version-2_0-branch/phpsysinfo/templates/base/config.tpl
branches/Version-2_0-branch/property/js/jquery/
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-02 08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch 2018-01-02 08:18:55 UTC (rev 17478)
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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/about.php
===================================================================
--- branches/Version-2_0-branch/about.php 2018-01-02 08:03:04 UTC (rev
17477)
+++ branches/Version-2_0-branch/about.php 2018-01-02 08:18:55 UTC (rev
17478)
@@ -101,7 +101,10 @@
$infos = '';
while
(@list($user,$domain) = $emails)
{
- if
(isset($infos) && $infos) $infos .= '<br />';
+ if
(isset($infos) && $infos)
+ {
+
$infos .= '<br />';
+ }
$name =
$names ? array_shift($names) : $user;
$infos
.= "<a href=\"mailto:$user at $domain\"
onClick=\"document.location='mailto:$user'+'@'+'$domain'; return
false;\">$name</a>";
array_shift($emails); array_shift($emails);
@@ -154,4 +157,3 @@
$GLOBALS['phpgw']->common->phpgw_header(true);
$GLOBALS['phpgw']->template->pparse('out','phpgw_about');
$GLOBALS['phpgw']->common->phpgw_footer();
-?>
Modified: branches/Version-2_0-branch/activitycalendarfrontend/index.php
===================================================================
--- branches/Version-2_0-branch/activitycalendarfrontend/index.php
2018-01-02 08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/activitycalendarfrontend/index.php
2018-01-02 08:18:55 UTC (rev 17478)
@@ -76,17 +76,20 @@
$GLOBALS['phpgw']->preferences->verify_basic_settings();
/* * ******* Optional classes, which can be disabled for
performance increases ******** */
- while ($phpgw_class_name = each($GLOBALS['phpgw_info']['flags']))
+ if(is_array($GLOBALS['phpgw_info']['flags']))
{
- if (preg_match('/enable_/', $phpgw_class_name[0]))
+ foreach ($GLOBALS['phpgw_info']['flags'] as $phpgw_class_name
=> $dummy)
{
- $enable_class = str_replace('enable_', '',
$phpgw_class_name[0]);
- $enable_class = str_replace('_class', '',
$enable_class);
- $GLOBALS['phpgw']->$enable_class =
createObject("phpgwapi.{$enable_class}");
+ if (preg_match('/enable_/', $phpgw_class_name))
+ {
+ $enable_class = str_replace('enable_', '',
$phpgw_class_name);
+ $enable_class = str_replace('_class', '',
$enable_class);
+ $GLOBALS['phpgw']->$enable_class =
createObject("phpgwapi.{$enable_class}");
+ }
}
+ unset($enable_class);
+ reset($GLOBALS['phpgw_info']['flags']);
}
- unset($enable_class);
- reset($GLOBALS['phpgw_info']['flags']);
/* *
***********************************************************************\
* These lines load up the templates class
*
Modified: branches/Version-2_0-branch/admin/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/admin/inc/class.menu.inc.php 2018-01-02
08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/admin/inc/class.menu.inc.php 2018-01-02
08:18:55 UTC (rev 17478)
@@ -73,7 +73,7 @@
'location_id' =>
$GLOBALS['phpgw']->locations->get_id('admin', 'vfs_filedata')
)
)
- );
+ );
$menus['admin']['file_attribs'] = array
(
@@ -113,8 +113,8 @@
array('menuaction' => 'admin.uiaccounts.global_message'))
);
}
-
- if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
+
+ if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['home_screen_message'] = array
(
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2018-01-02 08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/booking 2018-01-02 08:18:55 UTC (rev 17478)
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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/booking/frontend.php
===================================================================
--- branches/Version-2_0-branch/booking/frontend.php 2018-01-02 08:03:04 UTC
(rev 17477)
+++ branches/Version-2_0-branch/booking/frontend.php 2018-01-02 08:18:55 UTC
(rev 17478)
@@ -168,7 +168,8 @@
if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'] &&
$last_loginid !== '')
{
reset($GLOBALS['phpgw_domain']);
- list($default_domain) = each($GLOBALS['phpgw_domain']);
+ $_phpgw_domains = array_keys($GLOBALS['phpgw_domain']);
+ $default_domain = $_phpgw_domains[0];
if ($_COOKIE['last_domain'] != $default_domain &&
!empty($_COOKIE['last_domain']))
{
Modified: branches/Version-2_0-branch/booking/inc/class.uiasync_settings.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiasync_settings.inc.php
2018-01-02 08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/booking/inc/class.uiasync_settings.inc.php
2018-01-02 08:18:55 UTC (rev 17478)
@@ -36,7 +36,7 @@
}
$tabs = array();
- $tabs['generic'] = array('label' => lang('Async
Settings'), 'link' => '#async_settings');
+ $tabs['generic'] = array('label' => lang('Asynchronous
Tasks'), 'link' => '#async_settings');
$active_tab = 'generic';
Modified: branches/Version-2_0-branch/booking/setup/default_records.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/setup/default_records.inc.php
2018-01-02 08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/booking/setup/default_records.inc.php
2018-01-02 08:18:55 UTC (rev 17478)
@@ -242,14 +242,14 @@
$account->lid = 'booking_group';
$account->firstname = 'Booking';
$account->lastname = 'Group';
- $rental_group = $GLOBALS['phpgw']->accounts->create($account,
array(), array(), $modules);
+ $booking_group = $GLOBALS['phpgw']->accounts->create($account,
array(), array(), $modules);
}
else
{
- $rental_group =
$GLOBALS['phpgw']->accounts->name2id('booking_group');
+ $booking_group =
$GLOBALS['phpgw']->accounts->name2id('booking_group');
}
- $aclobj->set_account_id($rental_group, true);
+ $aclobj->set_account_id($booking_group, true);
$aclobj->add('booking', '.office', 7);
$aclobj->add('booking', 'run', 1);
$aclobj->add('property', '.', 1);
@@ -258,3 +258,28 @@
$aclobj->add('preferences', '.', 1);
$aclobj->add('preferences', 'run', 1);
$aclobj->save_repository();
+
+ if (!$GLOBALS['phpgw']->accounts->exists('booking_admin'))
+ {
+ $account = new phpgwapi_group();
+ $account->lid = 'booking_admin';
+ $account->firstname = 'Booking Admin';
+ $account->lastname = 'Group';
+ $booking_admin = $GLOBALS['phpgw']->accounts->create($account,
array(), array(), $modules);
+ }
+ else
+ {
+ $booking_admin =
$GLOBALS['phpgw']->accounts->name2id('booking_admin');
+ }
+
+ $aclobj->set_account_id($booking_admin, true);
+ $aclobj->add('booking', 'admin', 15);
+ $aclobj->add('booking', '.office', 15);
+ $aclobj->add('booking', 'run', 1);
+ $aclobj->add('property', 'admin', 15);
+ $aclobj->add('property', '.', 1);
+ $aclobj->add('property', 'run', 1);
+ $aclobj->add('preferences', 'changepassword', 1);
+ $aclobj->add('preferences', '.', 1);
+ $aclobj->add('preferences', 'run', 1);
+ $aclobj->save_repository();
Modified: branches/Version-2_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/booking/setup/phpgw_no.lang 2018-01-02
08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/booking/setup/phpgw_no.lang 2018-01-02
08:18:55 UTC (rev 17478)
@@ -21,6 +21,8 @@
add comment booking no Legg til kommentar
add document booking no Legg til dokument
add new event booking no Legg til arrangement
+event settings booking no Innstillinger for arrangement
+application event settings booking no interntildeling/tildeling
e-post oppsett for søknad
add permission booking no Legg til rettighet
edit permission booking no Endre til rettighet
admin 1 booking no Bookingansvarlig 1
Modified:
branches/Version-2_0-branch/booking/templates/base/organization_edit.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/organization_edit.xsl
2018-01-02 08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/booking/templates/base/organization_edit.xsl
2018-01-02 08:18:55 UTC (rev 17478)
@@ -39,7 +39,9 @@
<div class="pure-u-1
pure-u-sm-1-2 pure-u-md-1-3 pure-u-lg-1-4">
<div
class="pure-control-group">
<label
for="field_name">
+ <h4>
<xsl:value-of select="php:function('lang', 'Organization')" />
+ </h4>
</label>
<xsl:if
test="currentapp = 'booking'">
<input
id="inputs" name="name" type="text" class="pure-u-1">
@@ -93,17 +95,6 @@
</xsl:if>
</div>
<div
class="pure-control-group">
- <label
for="field_customer_number">
-
<xsl:value-of select="php:function('lang', 'Customer number')" />
- </label>
- <xsl:if
test="currentapp = 'booking'">
- <input
name="customer_number" type="text" id="field_customer_number"
value="{organization/customer_number}" class="pure-u-1"/>
- </xsl:if>
- <xsl:if
test="currentapp != 'booking'">
- <input
name="customer_number" type="text" id="field_customer_number" readonly="true"
value="{organization/customer_number}" class="pure-u-1"/>
- </xsl:if>
- </div>
- <div
class="pure-control-group">
<label
for="field_homepage">
<xsl:value-of select="php:function('lang', 'Homepage')" />
</label>
@@ -133,6 +124,7 @@
</xsl:attribute>
</input>
</div>
+
</div>
<div class="pure-u-1
pure-u-sm-1-2 pure-u-md-1-3 pure-u-lg-1-4">
<div
class="pure-control-group">
@@ -151,6 +143,17 @@
<xsl:copy-of select="phpgw:option_checkbox(organization/customer_internal,
'customer_internal')"/>
</xsl:if>
</div>
+ <div
class="pure-control-group">
+ <label
for="field_customer_number">
+
<xsl:value-of select="php:function('lang', 'Customer number')" />
+ </label>
+ <xsl:if
test="currentapp = 'booking'">
+ <input
name="customer_number" type="text" id="field_customer_number"
value="{organization/customer_number}" class="pure-u-1"/>
+ </xsl:if>
+ <xsl:if
test="currentapp != 'booking'">
+ <input
name="customer_number" type="text" id="field_customer_number" readonly="true"
value="{organization/customer_number}" class="pure-u-1"/>
+ </xsl:if>
+ </div>
<div
class="pure-control-group">
<label
for="field_street">
<xsl:value-of select="php:function('lang', 'Street')"/>
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2018-01-02 08:03:04 UTC (rev
17477)
+++ branches/Version-2_0-branch/bookingfrontend 2018-01-02 08:18:55 UTC (rev
17478)
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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/bookingfrontend/index.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/index.php 2018-01-02
08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/bookingfrontend/index.php 2018-01-02
08:18:55 UTC (rev 17478)
@@ -106,17 +106,20 @@
$GLOBALS['phpgw']->preferences->verify_basic_settings();
/* * ******* Optional classes, which can be disabled for
performance increases ******** */
- while ($phpgw_class_name = each($GLOBALS['phpgw_info']['flags']))
+ if(is_array($GLOBALS['phpgw_info']['flags']))
{
- if ( preg_match('/enable_/', $phpgw_class_name[0]))
+ foreach ($GLOBALS['phpgw_info']['flags'] as $phpgw_class_name
=> $dummy)
{
- $enable_class = str_replace('enable_', '',
$phpgw_class_name[0]);
- $enable_class = str_replace('_class', '',
$enable_class);
- $GLOBALS['phpgw']->$enable_class =
createObject("phpgwapi.{$enable_class}");
+ if (preg_match('/enable_/', $phpgw_class_name))
+ {
+ $enable_class = str_replace('enable_', '',
$phpgw_class_name);
+ $enable_class = str_replace('_class', '',
$enable_class);
+ $GLOBALS['phpgw']->$enable_class =
createObject("phpgwapi.{$enable_class}");
+ }
}
+ unset($enable_class);
+ reset($GLOBALS['phpgw_info']['flags']);
}
- unset($enable_class);
- reset($GLOBALS['phpgw_info']['flags']);
/* *
***********************************************************************\
* These lines load up the templates class
*
Modified: branches/Version-2_0-branch/bookingfrontend/js/aalesund/application.js
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/js/aalesund/application.js
2018-01-02 08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/bookingfrontend/js/aalesund/application.js
2018-01-02 08:18:55 UTC (rev 17478)
@@ -319,7 +319,7 @@
}
else
{
- createTable(container, url, colDefs, 'results');
+ createTable(container, url, colDefs, 'results', 'table
table-hover table-borderless');
}
}
@@ -331,7 +331,7 @@
}
else
{
- createTable(container, url, colDefs);
+ createTable(container, url, colDefs, '', 'table table-hover
table-borderless');
}
}
Copied: branches/Version-2_0-branch/bookingfrontend/js/aalesund/booking.js
(from rev 17477, trunk/bookingfrontend/js/aalesund/booking.js)
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/js/aalesund/booking.js
(rev 0)
+++ branches/Version-2_0-branch/bookingfrontend/js/aalesund/booking.js
2018-01-02 08:18:55 UTC (rev 17478)
@@ -0,0 +1,170 @@
+$(document).ready(function ()
+{
+ $("#field_activity").change(function ()
+ {
+ var oArgs = {menuaction:
'bookingfrontend.uiapplication.get_activity_data', activity_id: $(this).val()};
+ var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ var html_agegroups = '';
+ var html_audience = '';
+ if (data != null)
+ {
+ var agegroups = data.agegroups;
+ for (var i = 0; i < agegroups.length;
++i)
+ {
+ html_agegroups += "<tr>";
+ html_agegroups += "<th>" +
agegroups[i]['name'] + "</th>";
+ html_agegroups += "<td>";
+ html_agegroups += "<input
class=\"input50\" type=\"text\" name='male[" + agegroups[i]['id'] + "]'
value='0'></input>";
+ html_agegroups += "</td>";
+ html_agegroups += "<td>";
+ html_agegroups += "<input
class=\"input50\" type=\"text\" name='female[" + agegroups[i]['id'] + "]'
value='0'></input>";
+ html_agegroups += "</td>";
+ html_agegroups += "</tr>";
+ }
+
$("#agegroup_tbody").html(html_agegroups);
+
+ var audience = data.audience;
+ var checked = '';
+ for (var i = 0; i < audience.length;
++i)
+ {
+ checked = '';
+ if (initialAudience)
+ {
+ for (var j = 0; j <
initialAudience.length; ++j)
+ {
+ if
(audience[i]['id'] == initialAudience[j])
+ {
+ checked
= " checked='checked'";
+ }
+ }
+ }
+ html_audience += "<li>";
+ html_audience += "<label>";
+ html_audience += "<input
type=\"radio\" name=\"audience[]\" value='" + audience[i]['id'] + "'" + checked
+ "></input>";
+ html_audience +=
audience[i]['name'];
+ html_audience += "</label>";
+ html_audience += "</li>";
+ }
+ $("#audience").html(html_audience);
+ }
+ }
+ });
+ });
+});
+
+$(window).on('load', function()
+{
+ var building_id = $('#field_building_id').val();
+ var organization_id = $('#field_org_id').val();
+ var building_id_selection;
+ var organization_id_selection;
+ if (!group_id)
+ {
+ var group_id = "";
+ }
+ if (building_id)
+ {
+ populateTableChkResources(building_id, initialSelection);
+ building_id_selection = building_id
+ }
+ if (organization_id)
+ {
+ populateSelectGroup(organization_id, group_id);
+ organization_id_selection = organization_id;
+ }
+});
+
+if ($.formUtils)
+{
+ $.formUtils.addValidator({
+ name: 'target_audience',
+ validatorFunction: function (value, $el, config, languaje,
$form)
+ {
+ var n = 0;
+ $('#audience input[name="audience[]"]').each(function ()
+ {
+ if ($(this).is(':checked'))
+ {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Please choose at least 1 target audience',
+ errorMessageKey: ''
+ });
+
+ $.formUtils.addValidator({
+ name: 'number_participants',
+ validatorFunction: function (value, $el, config, languaje,
$form)
+ {
+ var n = 0;
+ $('#agegroup_tbody input').each(function ()
+ {
+ if ($(this).val() != "" && $(this).val() > 0)
+ {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Number of participants is required',
+ errorMessageKey: ''
+ });
+
+ $.formUtils.addValidator({
+ name: 'application_resources',
+ validatorFunction: function (value, $el, config, language,
$form)
+ {
+ var n = 0;
+ $('#resources_container table
input[name="resources[]"]').each(function ()
+ {
+ if ($(this).is(':checked'))
+ {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Please choose at least 1 resource',
+ errorMessageKey: 'application_resources'
+ });
+}
+
+function populateTableChk(url, container, colDefs)
+{
+ createTable(container, url, colDefs, 'results');
+}
+
+function populateTableChkResources(building_id, selection)
+{
+ alert("test");
+ var url = phpGWLink('bookingfrontend/', {menuaction:
'bookingfrontend.uiresource.index_json', sort: 'name', filter_building_id:
building_id}, true);
+ var container = "resources_container";
+ var colDefsResources = [{label: '', object: [{type: 'input', attrs: [
+ {name: 'type', value:
'checkbox'}, {name: 'name', value: 'resources[]'}
+ ]}
+ ], value: 'id', checked: selection}, {key: 'name',
label: lang['Name']}, {key: 'type', label: lang['Resource Type']}
+ ];
+ populateTableChk(url, container, colDefsResources);
+}
+
+function populateSelectGroup(organization_id, selection)
+{
+ var url = phpGWLink('bookingfrontend/', {menuaction:
'booking.uigroup.index', filter_organization_id: organization_id}, true);
+ var container = $('#group_container');
+ var attr = [
+ {name: 'name', value: 'group_id'}, {name: 'data-validation',
value: 'required'}
+ ];
+ populateSelect(url, selection, container, attr);
+}
Copied: branches/Version-2_0-branch/bookingfrontend/js/aalesund/search.js (from
rev 17477, trunk/bookingfrontend/js/aalesund/search.js)
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/js/aalesund/search.js
(rev 0)
+++ branches/Version-2_0-branch/bookingfrontend/js/aalesund/search.js
2018-01-02 08:18:55 UTC (rev 17478)
@@ -0,0 +1,279 @@
+var filter_tree = null;
+var building_id_selection = "";
+var search_types = [];
+var search_type_string = "";
+var part_of_town_string = "";
+var part_of_towns = [];
+var top_level_string = "";
+var top_levels = [];
+var selected_building_id = null;
+
+var selected_criteria = [];
+$(document).ready(function ()
+{
+
+ $("#loading").dialog({
+ hide: 'slide',
+// show: 'slide',
+ autoOpen: false
+ });
+
+ update_autocompleteHelper = function ()
+ {
+ oArgs = {
+ menuaction: 'bookingfrontend.uibuilding.index',
+ filter_part_of_town_id: part_of_town_string
+ };
+ var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
+ JqueryPortico.autocompleteHelper(requestUrl,
'field_building_name', 'field_building_id', 'building_container');
+ }
+
+ $("#submit_searchterm").on('click', function ()
+ {
+ update_search(selected_criteria, true);
+ });
+
+ $('#field_searchterm').keydown(function (event)
+ {
+ var keypressed = event.keyCode || event.which;
+ if (keypressed == 13)
+ {
+ update_search(selected_criteria, true);
+ }
+ });
+
+ $("#update-search-result").on('click',function(){
+ update_search(selected_criteria, true);
+ });
+
+ // $("#search_type :checkbox").on('click', function ()
+ // {
+ // update_search(selected_criteria, true);
+ //
+ // });
+ // $("#top_level :checkbox").on('click', function ()
+ // {
+ // update_search(selected_criteria, true);
+ //
+ // });
+ //
+ // $("#part_of_town :checkbox").on('click', function ()
+ // {
+ // selected_building_id = null;
+ // update_search(selected_criteria);
+ //
+ // });
+ //initate autocomplete;
+ update_autocompleteHelper();
+
+// Filter tree
+ $("#treeDiv1").jstree({
+ core: {
+ multiple: true,
+ data: filter_tree,
+ check_callback: true,
+ themes: {"stripes": true}
+ },
+ checkbox: {whole_node: true, three_state: false, cascade:
"up+down+undetermined"},
+ plugins: ["themes", "checkbox"]
+ });
+
+
+ $("#treeDiv1").bind("deselect_node.jstree", function (event, data)
+ {
+ if (typeof (data.event) == 'undefined')
+ {
+ return false;
+ }
+ update_activity_top_level(data, true);
+
+ update_search(selected_criteria, true);
+
+ });
+
+
+ $("#treeDiv1").bind("select_node.jstree", function (event, data)
+ {
+ if (typeof (data.event) == 'undefined')
+ {
+ return false;
+ }
+ update_activity_top_level(data, false);
+
+ update_search(selected_criteria, true);
+ });
+
+
+ update_activity_top_level = function (data, deselect)
+ {
+//console.log(data);
+ var parents = data.node.parents;
+ var level = parents.length;
+// var activity_top_level = 0;
+ if (!deselect)
+ {
+ //Top node
+ if (level < 2)
+ {
+ activity_location =
data.node.original.activity_location;
+ $("#" + activity_location).prop("checked",
true);
+ }
+ else
+ {
+ //Find top node
+ var top_node_id = parents[(level - 2)];
+ var treeInst = $('#treeDiv1').jstree(true);
+ top_node = treeInst.get_node(top_node_id)
+ activity_location =
top_node.original.activity_location;
+ $("#" + activity_location).prop("checked",
true);
+
+ }
+ }
+// else
+// {
+// if (level < 2)
+// {
+// activity_location =
data.node.original.activity_location;
+// $("#" + activity_location).prop( "checked",
false );
+// }
+// }
+
+ // var href = data.node.a_attr.href;
+ // if (href == "#")
+ {
+ selected_criteria =
$("#treeDiv1").jstree('get_selected', true);
+ }
+
+ }
+ update_search = function (selected_criteria, keep_building)
+ {
+
+ var criteria = [];
+
+ var keep_building_for_now = keep_building || false;
+
+ for (var i = 0; i < selected_criteria.length; ++i)
+ {
+ criteria.push(selected_criteria[i].original);
+ }
+// console.log(criteria);
+
+ if (!keep_building_for_now)
+ {
+ $('#field_building_id').val('');
+ $("#field_building_name").val('');
+ }
+ search_types = [];
+ $("#search_type :checkbox:checked").each(function ()
+ {
+ search_types.push($(this).val());
+ });
+ search_type_string = search_types.join(',');
+
+ part_of_towns = [];
+ $("#part_of_town :checkbox:checked").each(function ()
+ {
+ part_of_towns.push($(this).val());
+ });
+ part_of_town_string = part_of_towns.join(',');
+
+ top_levels = [];
+// $("#top_level :checkbox:checked").each(function () {
+// top_levels.push($(this).val());
+// });
+
+ $("#top_level :checkbox").each(function ()
+ {
+ if ($(this).prop("checked") == true)
+ {
+ top_levels.push($(this).val());
+ }
+ else
+ {
+// Not working
+// $("#treeDiv1").jstree("uncheck_node", "j1_" +
$(this).val());
+ }
+ });
+
+ top_level_string = top_levels.join(',');
+
+
+
+ update_autocompleteHelper();
+
+// var activity_top_level = $('#activity_top_level').val();
+
+ var oArgs = {
+ menuaction: 'bookingfrontend.uisearch.query',
+// activity_top_level: activity_top_level,
+ building_id: selected_building_id,
+ filter_search_type: search_type_string,
+ filter_part_of_town: part_of_town_string,
+ filter_top_level: top_level_string,
+ };
+ var requestUrl = phpGWLink('bookingfrontend/', oArgs);
+
+ requestUrl += '&phpgw_return_as=stripped_html';
+ $.ajax({
+ type: 'POST',
+ data: {criteria: criteria, searchterm:
$("#field_searchterm").val()},
+ url: requestUrl,
+ beforeSend: function ()
+ {
+ $("#loading").dialog('open');
+ },
+ success: function (data)
+ {
+ if (data !== null)
+ {
+ $("#loading").dialog('close');
+// $('#loading').html("<p>Result Complete...</p>");
+ $(".no_result").hide();
+ $("#result").html(data);
+
$("#total_records_top").html($("#total_records").html());
+
+ $('html, body').animate({
+ scrollTop:
$("#total_records_top").offset().top
+ }, 1000);
+
+
+ }
+
+ }
+ });
+
+ }
+
+ $('#collapse1').on('click', function ()
+ {
+ $(this).attr('href', 'javascript:;');
+ $('#treeDiv1').jstree('close_all');
+ })
+
+ $('#expand1').on('click', function ()
+ {
+ $(this).attr('href', 'javascript:;');
+ $('#treeDiv1').jstree('open_all');
+ });
+
+ $('#reset').on('click', function ()
+ {
+ $(this).attr('href', 'javascript:;');
+ selected_building_id = null;
+ update_search(selected_criteria);
+ });
+
+});
+
+$(window).on('load', function()
+{
+ $("#field_building_name").on("autocompleteselect", function (event, ui)
+ {
+ var building_id = ui.item.value;
+ if (building_id != building_id_selection)
+ {
+ selected_building_id = building_id;
+ update_search(selected_criteria);
+ }
+ });
+});
Copied:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/application.xsl
(from rev 17477, trunk/bookingfrontend/templates/aalesund/application.xsl)
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/application.xsl
(rev 0)
+++
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/application.xsl
2018-01-02 08:18:55 UTC (rev 17478)
@@ -0,0 +1,574 @@
+<func:function name="phpgw:conditional">
+ <xsl:param name="test"/>
+ <xsl:param name="true"/>
+ <xsl:param name="false"/>
+
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$test">
+ <xsl:value-of select="$true"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$false"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
+</func:function>
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+ <div class="container-fluid main-container application-background">
+ <div class="container">
+
+ <div class="row">
+ <div class="col-lg-12">
+
+ <ul class="pathway">
+
+ <li>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="application/applications_link"/>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang',
'Applications')" />
+ </a>
+ </li>
+ <li>#<xsl:value-of select="application/id"/></li>
+ <li>
+ <xsl:if test="frontend and
application/status='ACCEPTED'">
+ <form method="POST">
+ <input type="hidden" name="print"
value="ACCEPTED"/>
+ <input type="submit"
value="{php:function('lang', 'Print as PDF')}" />
+ </form>
+ </xsl:if>
+ </li>
+ </ul>
+ <xsl:call-template name="msgbox"/>
+ </div>
+
+
+ <div class="col-lg-12">
+ <xsl:if test="not(frontend)">
+ <div style="border: 3px solid red; padding: 3px 4px
3px 4px">
+ <xsl:choose>
+ <xsl:when test="not(application/case_officer)">
+ <xsl:value-of select="php:function('lang',
'In order to work with this application, you must first')"/>
+ <xsl:text> </xsl:text>
+ <a href="#assign">
+ <xsl:value-of
select="php:function('lang', 'assign yourself')"/>
+ </a>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="php:function('lang',
'as the case officer responsible for this application.')"/>
+ </xsl:when>
+ <xsl:when test="application/case_officer and
not(application/case_officer/is_current_user)">
+ <xsl:value-of select="php:function('lang',
'The user currently assigned as the responsible case officer for this
application is')"/>'<xsl:text> </xsl:text>
+ <xsl:value-of
select="application/case_officer/name"/>'.
+ <br/>
+ <xsl:value-of select="php:function('lang',
'In order to work with this application, you must therefore first')"/>
+ <xsl:text> </xsl:text>
+ <a href="#assign">
+ <xsl:value-of
select="php:function('lang', 'assign yourself')"/>
+ </a>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="php:function('lang',
'as the case officer responsible for this application.')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="style">display:none</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </xsl:if>
+
+ <xsl:if test="not(frontend)">
+ <dl class="proplist-col">
+ <dt>
+ <xsl:value-of select="php:function('lang',
'Status')" />
+ </dt>
+ <dd>
+ <xsl:value-of select="php:function('lang',
string(application/status))"/>
+ </dd>
+ </dl>
+ <dl class="proplist-col">
+ <dt>
+ <xsl:value-of select="php:function('lang',
'Created')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="php:function('pretty_timestamp', application/created)"/>
+ </dd>
+ </dl>
+ <dl class="proplist-col">
+ <dt>
+ <xsl:value-of select="php:function('lang',
'Modified')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="php:function('pretty_timestamp', application/modified)"/>
+ </dd>
+ </dl>
+ </xsl:if>
+ <xsl:if test="frontend">
+ <dl class="proplist">
+ <span style="font-size: 110%; font-weight:
bold;">Din søknad har status <xsl:value-of select="php:function('lang',
string(application/status))"/></span>
+ <span class="text">, opprettet <xsl:value-of
select="php:function('pretty_timestamp', application/created)"/>, sist endret
<xsl:value-of select="php:function('pretty_timestamp',
application/modified)"/></span>
+ <span class="text">
+ <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>
+ </dl>
+ </xsl:if>
+
+ <div class="form-group">
+ <div class="heading">
+ <xsl:value-of select="php:function('lang', 'Add a
comment')" />
+ </div>
+
+ <form method="POST">
+ <textarea name="comment" class="form-control"
rows="6"></textarea>
+ <br/>
+ <input type="submit" class="btn btn-default"
value="{php:function('lang', 'Add comment')}" />
+ </form>
+
+ </div>
+
+ </div>
+
+ <!-- Steg 1 -->
+
+ <div class="col-lg-12 application-group bg-light">
+ <div class="col-lg-12">
+ <div class="heading">1. <xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></div>
+ <xsl:for-each select="application/comments[author]">
+
+ <xsl:value-of
select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/>
+
+ <xsl:choose>
+ <xsl:when
test='contains(comment,"bookingfrontend.uidocument_building.download")'>
+
+ <xsl:value-of select="comment"
disable-output-escaping="yes"/>
+
+ </xsl:when>
+ <xsl:otherwise>
+
+ <div style="width: 80%;">
+ <xsl:value-of select="comment"
disable-output-escaping="yes"/>
+ </div>
+
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </div>
+
+
+ <!-- Steg 1.1 -->
+
+
+ <div class="heading no-border">
+ 1.1 <xsl:value-of select="php:function('lang',
'attachments')" />
+ </div>
+ <div class="col-lg-12">
+ <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'>
+ <xsl:value-of select="document/name"/>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>mime size</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-allowing">
+ <xsl:text>jpg, png, gif, xls, xlsx, doc,
docx, txt, pdf, odt, ods</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-max-size">
+ <xsl:text>2M</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:text>Max 2M:: jpg, png, gif, xls,
xlsx, doc, docx, txt, pdf, odt, ods</xsl:text>
+ </xsl:attribute>
+ </input>
+ <br/>
+ <br/>
+ <input type="submit" class="btn btn-default"
value="{php:function('lang', 'Add attachment')}" />
+ </form>
+
+ </div>
+ </div>
+
+ <!-- Steg 2 -->
+
+
+ <div class="col-lg-12 application-group bg-light">
+
+ <div class="heading">2. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
+
+ <xsl:value-of select="php:function('lang',
'Activity')" />
+
+
+ <xsl:value-of select="application/activity_name"/>
+
+
+ <xsl:value-of select="php:function('lang',
'Information about the event')" />
+
+
+ <div style="width: 80%;">
+ <xsl:value-of disable-output-escaping="yes"
select="application/description"/>
+ </div>
+
+ </div>
+
+
+
+
+
+
+ <!-- Steg 3 -->
+ <div class="col-lg-12 application-group bg-light">
+ <div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
+ <xsl:value-of select="php:function('lang',
'Building')" />
+
+ <xsl:value-of select="application/building_name"/>
+ (<a href="javascript: void(0)"
+ onclick="window.open('{application/schedule_link}',
+ '',
+ 'width=1048, height=600, scrollbars=yes');
+ return false;">
+ <xsl:value-of select="php:function('lang',
'Building schedule')" />
+ </a>)
+
+ <div id="resources_container"/>
+ </div>
+
+
+
+
+ <!-- Steg 4 -->
+ <div class="col-lg-12 application-group bg-light">
+
+ <div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
+ <script type="text/javascript">
+ var allocationParams = {};
+ var bookingParams = {};
+ var eventParams = {};
+ </script>
+ <xsl:for-each select="application/dates">
+
+ <span style="font-weight:bold;">
+ <xsl:value-of select="php:function('lang',
'From')" />: </span>
+ <span>
+ <xsl:value-of
select="php:function('pretty_timestamp', from_)"/>
+ </span>
+ <br/>
+
+ <span style="font-weight:bold;">
+ <xsl:value-of select="php:function('lang',
'To')" />: </span>
+ <span>
+ <xsl:value-of
select="php:function('pretty_timestamp', to_)"/>
+ </span>
+
+ <xsl:if test="../edit_link">
+ <script type="text/javascript">
+ 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('bookingfrontend/index.php', {menuaction:'booking.uiallocation.add'});
+ var bookingaddURL =
phpGWLink('bookingfrontend/index.php', {menuaction:'booking.uibooking.add'});
+ var eventaddURL =
phpGWLink('bookingfrontend/index.php', {menuaction:'booking.uievent.add'});
+ </script>
+ <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}]);">
+ <xsl:if
test="not(../case_officer/is_current_user)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+
+ <option>
+ <xsl:value-of
select="php:function('lang', '- Actions -')" />
+ </option>
+ <option>
+ <xsl:value-of
select="php:function('lang', 'Create allocation')" />
+ </option>
+ <option>
+ <xsl:value-of
select="php:function('lang', 'Create booking')" />
+ </option>
+ <option>
+ <xsl:value-of
select="php:function('lang', 'Create event')" />
+ </option>
+ </select>
+ </xsl:if>
+ </xsl:for-each>
+
+ </div>
+
+
+
+ <!-- Steg 5 -->
+ <div class="col-lg-12 application-group bg-light">
+
+ <div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
+
+ <xsl:value-of select="php:function('lang', 'Target
audience')" />
+
+
+ <ul>
+ <xsl:for-each select="audience">
+ <xsl:if test="../application/audience=id">
+ <li>
+ <xsl:value-of select="name"/>
+ </li>
+ </xsl:if>
+ </xsl:for-each>
+ </ul>
+
+
+ <xsl:value-of select="php:function('lang', 'Number of
participants')" />
+
+ <div class="col-lg-7 col-md-11 col-sm-12">
+ <table class="table table-borderless">
+ <thead>
+ <tr>
+ <th/>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'Male')" />
+ </th>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'Female')" />
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="agegroups">
+ <xsl:variable name="id">
+ <xsl:value-of select="id"/>
+ </xsl:variable>
+ <tr>
+ <th>
+ <xsl:value-of select="name"/>
+ </th>
+ <td>
+ <xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/>
+ </td>
+ <td>
+ <xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+
+ <!-- Steg 6 -->
+ <div class="col-lg-12 application-group bg-light">
+ <dl class="form-col">
+ <div class="heading">6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
+ <dt>
+ <label for="field_contact_name">
+ <xsl:value-of select="php:function('lang',
'Name')" />
+ </label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="application/contact_name"/>
+ </dd>
+ <dt>
+ <label for="field_contact_email">
+ <xsl:value-of select="php:function('lang',
'Email')" />
+ </label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="application/contact_email"/>
+ </dd>
+ <dt>
+ <label for="field_contact_phone">
+ <xsl:value-of select="php:function('lang',
'Phone')" />
+ </label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="application/contact_phone"/>
+ </dd>
+ </dl>
+ </div>
+
+ <!-- Steg 7 -->
+ <div class="col-lg-12 application-group bg-light">
+ <dl class="form-col">
+ <div class="heading">7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
+ <xsl:if test="application/customer_identifier_type
= 'organization_number'">
+ <dt>
+ <label for="field_organization_number">
+ <xsl:value-of
select="php:function('lang', 'organization number')" />
+ </label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="application/customer_organization_number"/>
+ </dd>
+ </xsl:if>
+ <xsl:if test="application/customer_identifier_type
= 'ssn'">
+ <dt>
+ <label for="field_ssn_number">
+ <xsl:value-of
select="php:function('lang', 'Date of birth or SSN')" />
+ </label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="application/customer_ssn"/>
+ </dd>
+ </xsl:if>
+ </dl>
+ </div>
+
+ <!-- Steg 8 -->
+ <div class="col-lg-12 application-group bg-light">
+
+ <div class="heading">
+ <br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" />
+ </div>
+ <xsl:if test="config/application_terms">
+ <p>
+ <xsl:value-of
select="config/application_terms"/>
+ </p>
+ </xsl:if>
+ <br />
+ <div id='regulation_documents'> </div>
+ <br />
+ <p>
+ <xsl:value-of select="php:function('lang',
'To borrow premises you must verify that you have read terms and conditions')"
/>
+ </p>
+
+ </div>
+
+ <xsl:if test="application/edit_link">
+ <button class="btn btn-default">
+ <xsl:if
test="application/case_officer/is_current_user">
+ <xsl:attribute
name="onclick">window.location.href='<xsl:value-of
select="application/edit_link"/>'</xsl:attribute>
+ </xsl:if>
+ <xsl:if
test="not(application/case_officer/is_current_user)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Edit')" />
+ </button>
+ </xsl:if>
+ <xsl:if test="not(frontend)">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <dl class="proplist">
+ <dt class="heading">
+ <xsl:value-of
select="php:function('lang', 'Associated items')" />
+ </dt>
+ <dd>
+ <div id="associated_container"/>
+ </dd>
+ </dl>
+ </div>
+ </div>
+ </xsl:if>
+
+ <xsl:if test="application/edit_link">
+ <dl class="proplist">
+ <dt class="heading">
+ <xsl:value-of select="php:function('lang',
'Actions')" />
+ </dt>
+ <dt>
+ <xsl:if
test="application/case_officer/is_current_user">
+ <form method="POST" style="display:inline">
+ <input type="hidden"
name="unassign_user"/>
+ <input type="submit"
value="{php:function('lang', 'Unassign me')}"/>
+ </form>
+ <form method="POST" style="display:inline">
+ <input type="hidden"
name="display_in_dashboard"
value="{phpgw:conditional(application/display_in_dashboard='1', '0', '1')}"/>
+ <input type="submit"
value="{php:function('lang',
phpgw:conditional(application/display_in_dashboard='1', 'Hide from my Dashboard
until new activity occurs', 'Display in my Dashboard'))}"/>
+ </form>
+ </xsl:if>
+
+ <xsl:if
test="not(application/case_officer/is_current_user)">
+ <a name="assign"/>
+ <form method="POST">
+ <input type="hidden"
name="assign_to_user"/>
+ <input type="hidden" name="status"
value="PENDING"/>
+ <input type="submit"
value="{php:function('lang', phpgw:conditional(application/case_officer,
'Re-assign to me', 'Assign to me'))}"/>
+
+ <xsl:if
test="application/case_officer">
+ <xsl:value-of
select="php:function('lang', 'Currently assigned to user:')"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="application/case_officer/name"/>
+ </xsl:if>
+ </form>
+ </xsl:if>
+ </dt>
+
+ <xsl:if test="application/status!='REJECTED'">
+ <dt>
+ <form method="POST">
+ <input type="hidden" name="status"
value="REJECTED"/>
+ <input onclick="return
confirm('{php:function('lang', 'Are you sure you want to delete?')}')"
type="submit" value="{php:function('lang', 'Reject application')}">
+ <xsl:if
test="not(application/case_officer)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+ </input>
+ </form>
+ </dt>
+ </xsl:if>
+ <xsl:if test="application/status='PENDING'">
+ <xsl:if test="num_associations='0'">
+ <input type="submit" disabled=""
value="{php:function('lang', 'Accept application')}"/>
+ <xsl:value-of select="php:function('lang',
'One or more bookings, allocations or events needs to be created before an
application can be Accepted')"/>
+ </xsl:if>
+ <xsl:if test="num_associations!='0'">
+ <dt>
+ <form method="POST">
+ <input type="hidden" name="status"
value="ACCEPTED"/>
+ <input type="submit"
value="{php:function('lang', 'Accept application')}">
+ <xsl:if
test="not(application/case_officer)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+ </input>
+ </form>
+ </dt>
+ </xsl:if>
+ </xsl:if>
+ <dd>
+ <br/>
+ <a href="{application/dashboard_link}">
+ <xsl:value-of select="php:function('lang',
'Back to Dashboard')" />
+ </a>
+ </dd>
+ </dl>
+ </xsl:if>
+
+ </div>
+ </div>
+ </div>
+
+ <script type="text/javascript">
+ var resourceIds = '<xsl:value-of select="application/resource_ids" />';
+ if (!resourceIds || resourceIds == "") {
+ resourceIds = false;
+ }
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resources',
'Resources Type', 'ID', 'Type', 'From', 'To', 'Document', 'Name')" />;
+ var app_id = <xsl:value-of select="application/id" />;
+ var building_id = <xsl:value-of select="application/building_id" />;
+ var resources = <xsl:value-of select="application/resources" />;
+
+ <![CDATA[
+ var resourcesURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uiresource.index_json', sort:'name'}, true) +'&' +
resourceIds;
+ var applicationURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uiapplication.associated',
filter_application_id:app_id}, true);
+ var documentURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'booking.uidocument_view.regulations', sort:'name'}, true) +
'&owner[]=building::' + building_id;
+ documentURL += '&owner[]=resource::'+ resources;
+ var attachmentsResourceURL =
phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_application.index', sort:'name',
no_images:1, filter_owner_id:app_id}, true);
+ ]]>
+
+ if (resourceIds) {
+ var colDefsResource = [{key: 'name', label: lang['Resources'],
formatter: genericLink}, {key: 'type', label: lang['Resource Type']}];
+ createTable('resources_container', resourcesURL, colDefsResource,
'results');
+ var colDefsApplication = [
+ {key: 'id', label: lang['ID'], formatter: genericLink},
+ {key: 'type', label: lang['Type']},
+ {key: 'from_', label: lang['From']},
+ {key: 'to_', label: lang['To']}
+ ];
+ createTable('associated_container', applicationURL,
colDefsApplication);
+ }
+
+ var colDefsDocument = [{key: 'name', label: lang['Document'],
formatter: genericLink}];
+ createTable('regulation_documents', documentURL, colDefsDocument);
+
+ var colDefsAttachmentsResource = [{key: 'name', label: lang['Name'],
formatter: genericLink}];
+ createTable('attachments_container', attachmentsResourceURL,
colDefsAttachmentsResource);
+
+ </script>
+</xsl:template>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/application_new.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/application_new.xsl
2018-01-02 08:03:04 UTC (rev 17477)
+++
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/application_new.xsl
2018-01-02 08:18:55 UTC (rev 17478)
@@ -1,592 +1,595 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
- <div class="container">
- <h3>
- <xsl:value-of select="php:function('lang', 'New application')"/>
- </h3>
- <xsl:call-template name="msgbox"/>
-
- <form action="" method="POST" id='application_form'
enctype='multipart/form-data' name="form">
- <xsl:if test="config/application_new_application">
- <p >
- <xsl:value-of select="config/application_new_application"/>
- </p>
- </xsl:if>
-
-
- <div class="row">
+ <div class="container-fluid main-container application-background">
+ <div class="container">
+ <form action="" method="POST" id='application_form'
enctype='multipart/form-data' name="form">
- <!-- Steg 1 -->
- <div class="col-lg-12 application-group">
+ <div class="row">
+ <div class="col-lg-12">
+ <h3>
+ <xsl:value-of select="php:function('lang', 'New
application')"/>
+ </h3>
+ <xsl:if test="config/application_new_application">
+ <p >
+ <xsl:value-of
select="config/application_new_application"/>
+ </p>
+ </xsl:if>
+
+ <xsl:call-template name="msgbox"/>
+ </div>
+
+
+ <!-- Steg 1 -->
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
+ <div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
- <div class="form-group">
- <label for="field_activity">
- <xsl:value-of select="php:function('lang',
'Activity')" />
+ <div class="form-group">
+ <label for="field_activity">
+ <xsl:value-of select="php:function('lang',
'Activity')" />
+ </label>
+ <xsl:if test="config/application_activities">
+ <p>
+ <xsl:value-of
select="config/application_activities"/>
+ </p>
+ </xsl:if>
+
+
+ <select name="activity_id" class="form-control
col-lg-4 col-md-7 col-sm-12" id="field_activity">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Please select an activity')" />
+ </xsl:attribute>
+ <option value="">
+ <xsl:value-of select="php:function('lang',
'-- select an activity --')" />
+ </option>
+ <xsl:for-each select="activities">
+ <option>
+ <xsl:if
test="../application/activity_id = id">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value">
+ <xsl:value-of select="id"/>
+ </xsl:attribute>
+ <xsl:value-of select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </div>
+
+ <label for="field_description">
+ <xsl:value-of select="php:function('lang',
'Information about the event')" />
</label>
- <xsl:if test="config/application_activities">
+ <xsl:if test="config/application_description">
<p>
- <xsl:value-of
select="config/application_activities"/>
+ <xsl:value-of
select="config/application_description"/>
</p>
</xsl:if>
-
-
- <select name="activity_id" class="form-control
col-lg-4 col-md-7 col-sm-12" id="field_activity">
- <xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Please select an activity')" />
- </xsl:attribute>
- <option value="">
- <xsl:value-of select="php:function('lang', '--
select an activity --')" />
- </option>
- <xsl:for-each select="activities">
- <option>
- <xsl:if test="../application/activity_id =
id">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="value">
- <xsl:value-of select="id"/>
- </xsl:attribute>
- <xsl:value-of select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </div>
-
- <label for="field_description">
- <xsl:value-of select="php:function('lang',
'Information about the event')" />
- </label>
- <xsl:if test="config/application_description">
- <p>
- <xsl:value-of
select="config/application_description"/>
- </p>
- </xsl:if>
- <div class="form-group">
- <textarea id="field_description" class="form-control"
rows="3" name="description">
- <xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Please enter a descripction')" />
- </xsl:attribute>
- <xsl:value-of select="application/description"/>
- </textarea>
- </div>
+ <div class="form-group">
+ <textarea id="field_description"
class="form-control" rows="3" name="description">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Please enter a descripction')" />
+ </xsl:attribute>
+ <xsl:value-of
select="application/description"/>
+ </textarea>
+ </div>
- <xsl:if test="config/application_equipment">
- <p>
- <xsl:value-of
select="config/application_equipment"/>
- </p>
- </xsl:if>
+ <xsl:if test="config/application_equipment">
+ <p>
+ <xsl:value-of
select="config/application_equipment"/>
+ </p>
+ </xsl:if>
- <div class="form-group">
- <textarea id="field_equipment" class="form-control"
rows="6" name="equipment">
- <xsl:value-of select="application/equipment"/>
- </textarea>
+ <div class="form-group">
+ <textarea id="field_equipment"
class="form-control" rows="6" name="equipment">
+ <xsl:value-of select="application/equipment"/>
+ </textarea>
+ </div>
+
</div>
-
- </div>
- <!-- Steg 2-->
- <div class="col-lg-12 application-group">
+ <!-- Steg 2-->
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">2. <xsl:value-of
select="php:function('lang', 'How many?')" /></div>
- <xsl:if test="config/application_howmany">
- <p>
- <xsl:value-of select="config/application_howmany"/>
- </p>
- </xsl:if>
+ <div class="heading">2. <xsl:value-of
select="php:function('lang', 'How many?')" /></div>
+ <xsl:if test="config/application_howmany">
+ <p>
+ <xsl:value-of
select="config/application_howmany"/>
+ </p>
+ </xsl:if>
- <label for="field_agegroups">
- <xsl:value-of select="php:function('lang', 'Estimated
number of participants')" />
- </label>
+ <label for="field_agegroups">
+ <xsl:value-of select="php:function('lang',
'Estimated number of participants')" />
+ </label>
- <input type="hidden" data-validation="number_participants">
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang', 'Number
of participants is required')" />
- </xsl:attribute>
- </input>
+ <input type="hidden"
data-validation="number_participants">
+ <xsl:attribute name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Number of participants is required')" />
+ </xsl:attribute>
+ </input>
- <div class="col-lg-7 col-md-11 col-sm-12">
- <table class="table table-borderless">
- <thead>
- <tr>
- <th/>
- <th>
- <xsl:value-of
select="php:function('lang', 'Male')" />
- </th>
- <th>
- <xsl:value-of
select="php:function('lang', 'Female')" />
- </th>
- </tr>
- </thead>
-
-
- <tbody>
- <xsl:for-each select="agegroups">
- <xsl:variable name="id">
- <xsl:value-of select="id"/>
- </xsl:variable>
+ <div class="col-lg-7 col-md-11 col-sm-12">
+ <table class="table table-borderless">
+ <thead>
<tr>
+ <th/>
<th>
- <xsl:value-of select="name"/>
+ <xsl:value-of
select="php:function('lang', 'Male')" />
</th>
- <td>
- <input type="text"
class="form-control">
- <xsl:attribute
name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/>
- </xsl:attribute>
- </input>
- </td>
- <td>
- <input type="text"
class="form-control">
- <xsl:attribute
name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/>
- </xsl:attribute>
- </input>
- </td>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'Female')" />
+ </th>
</tr>
- </xsl:for-each>
- </tbody>
- </table>
+ </thead>
+
+
+ <tbody>
+ <xsl:for-each select="agegroups">
+ <xsl:variable name="id">
+ <xsl:value-of select="id"/>
+ </xsl:variable>
+ <tr>
+ <th>
+ <xsl:value-of select="name"/>
+ </th>
+ <td>
+ <input type="text"
class="form-control">
+ <xsl:attribute
name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ <td>
+ <input type="text"
class="form-control">
+ <xsl:attribute
name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+
</div>
-
- </div>
- <!-- Steg 3-->
- <div class="col-lg-12 application-group">
+ <!-- Steg 3-->
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
- <xsl:if test="config/application_where">
- <p>
- <xsl:value-of select="config/application_where"/>
- </p>
- </xsl:if>
+ <div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
+ <xsl:if test="config/application_where">
+ <p>
+ <xsl:value-of
select="config/application_where"/>
+ </p>
+ </xsl:if>
- <label for="field_building">
- <xsl:value-of select="php:function('lang',
'Building')" />
- </label>
+ <label for="field_building">
+ <xsl:value-of select="php:function('lang',
'Building')" />
+ </label>
- <div class="autocomplete form-group">
- <input id="field_building_id" name="building_id"
type="hidden">
- <xsl:attribute name="value">
- <xsl:value-of
select="application/building_id"/>
- </xsl:attribute>
- <xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Please enter a building name')" />
- </xsl:attribute>
- </input>
- <input id="field_building_name" class="form-control
col-lg-4 col-md-7 col-sm-12" name="building_name" type="text">
- <xsl:attribute name="value">
- <xsl:value-of
select="application/building_name"/>
- </xsl:attribute>
- <xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Please enter a building name')" />
- </xsl:attribute>
- </input>
- <div id="building_container"/>
- </div>
+ <div class="autocomplete form-group">
+ <input id="field_building_id" name="building_id"
type="hidden">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="application/building_id"/>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Please enter a building name')" />
+ </xsl:attribute>
+ </input>
+ <input id="field_building_name"
class="form-control col-lg-4 col-md-7 col-sm-12" name="building_name"
type="text">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="application/building_name"/>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Please enter a building name')" />
+ </xsl:attribute>
+ </input>
+ <div id="building_container"/>
+ </div>
- <label for="field_resources">
- <xsl:value-of select="php:function('lang',
'Resources')" />
- </label>
+ <label for="field_resources">
+ <xsl:value-of select="php:function('lang',
'Resources')" />
+ </label>
- <input type="hidden"
data-validation="application_resources">
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang', 'Please
choose at least 1 resource')" />
- </xsl:attribute>
- </input>
- <div id="resources_container">
- <span class="select_first_text">
- <xsl:value-of select="php:function('lang', 'Select
a building first')" />
- </span>
+ <input type="hidden"
data-validation="application_resources">
+ <xsl:attribute name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Please choose at least 1 resource')" />
+ </xsl:attribute>
+ </input>
+ <div id="resources_container">
+ <span class="select_first_text">
+ <xsl:value-of select="php:function('lang',
'Select a building first')" />
+ </span>
- <!-- Fiksa tabel design, sett rett klasse på tabellen
som er appenda med js-->
+ <!-- Fiksa tabel design, sett rett klasse på
tabellen som er appenda med js-->
+ </div>
+
</div>
-
- </div>
- <!-- Steg 4-->
+ <!-- Steg 4-->
- <div class="col-lg-12 application-group">
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
- <xsl:if test="config/application_when">
- <p>
- <xsl:value-of select="config/application_when"/>
- </p>
- </xsl:if>
- <div class="form-group">
- <input type="hidden" class="form-control col-lg-4
col-md-7 col-sm-12" data-validation="application_dates">
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Invalid date')" />
- </xsl:attribute>
- </input>
- <xsl:for-each select="application/dates">
- <xsl:variable name="index" select="position()-2" />
- <xsl:choose>
- <xsl:when test="position() > 1">
- <div class="date-container">
- <a href="javascript:void(0);"
class="close-btn btnclose">
- <xsl:value-of
select="php:function('lang', 'remove date')" />
- </a>
+ <div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
+ <xsl:if test="config/application_when">
+ <p>
+ <xsl:value-of
select="config/application_when"/>
+ </p>
+ </xsl:if>
+ <div class="form-group">
+ <input type="hidden" class="form-control col-lg-4
col-md-7 col-sm-12" data-validation="application_dates">
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Invalid date')" />
+ </xsl:attribute>
+ </input>
+ <xsl:for-each select="application/dates">
+ <xsl:variable name="index"
select="position()-2" />
+ <xsl:choose>
+ <xsl:when test="position() > 1">
+ <div class="date-container">
+ <a href="javascript:void(0);"
class="close-btn btnclose">
+ <xsl:value-of
select="php:function('lang', 'remove date')" />
+ </a>
- <label for="start_date_{$index}">
- <xsl:value-of
select="php:function('lang', 'From')" />
- </label>
+ <label for="start_date_{$index}">
+ <xsl:value-of
select="php:function('lang', 'From')" />
+ </label>
- <input class="newaddedpicker
form-control col-lg-4 col-md-7 col-sm-12" id="start_date_{$index}" type="text"
name="from_[]">
- <xsl:attribute name="value">
- <xsl:value-of select="from_" />
- </xsl:attribute>
- <xsl:attribute name="readonly">
- <xsl:text>readonly</xsl:text>
- </xsl:attribute>
- </input>
+ <input class="newaddedpicker
form-control col-lg-4 col-md-7 col-sm-12" id="start_date_{$index}" type="text"
name="from_[]">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="from_" />
+ </xsl:attribute>
+ <xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </input>
- <label for="end_date_{$index}">
- <xsl:value-of
select="php:function('lang', 'To')" />
- </label>
+ <label for="end_date_{$index}">
+ <xsl:value-of
select="php:function('lang', 'To')" />
+ </label>
- <input class="newaddedpicker
form-control col-lg-4 col-md-7 col-sm-12" id="end_date_{$index}" type="text"
name="to_[]">
- <xsl:attribute name="value">
- <xsl:value-of select="to_"/>
- </xsl:attribute>
- <xsl:attribute name="readonly">
- <xsl:text>readonly</xsl:text>
- </xsl:attribute>
- </input>
+ <input class="newaddedpicker
form-control col-lg-4 col-md-7 col-sm-12" id="end_date_{$index}" type="text"
name="to_[]">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="to_"/>
+ </xsl:attribute>
+ <xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </input>
- </div>
- </xsl:when>
+ </div>
+ </xsl:when>
- <xsl:otherwise>
- <div class="form-group">
+ <xsl:otherwise>
+ <div class="form-group">
- <a href="javascript:void(0);" class="">
- <xsl:value-of
select="php:function('lang', 'remove date')" />
- </a>
+ <a href="javascript:void(0);"
class="">
+ <xsl:value-of
select="php:function('lang', 'remove date')" />
+ </a>
- <br/>
+ <br/>
- <div class="form-group col-lg-4
col-md-7 col-sm-12 no-padding-left">
- <label for="start_date">
- <xsl:value-of
select="php:function('lang', 'From')" />
- </label>
+ <div class="form-group col-lg-4
col-md-7 col-sm-12 no-padding-left">
+ <label for="start_date">
+ <xsl:value-of
select="php:function('lang', 'From')" />
+ </label>
- <input class="form-control"
id="start_date" type="text" name="from_[]">
- <xsl:attribute name="value">
- <xsl:value-of
select="from_" />
- </xsl:attribute>
- <xsl:attribute name="readonly">
-
<xsl:text>readonly</xsl:text>
- </xsl:attribute>
- </input>
- </div>
+ <input class="form-control"
id="start_date" type="text" name="from_[]">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="from_" />
+ </xsl:attribute>
+ <xsl:attribute
name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </input>
+ </div>
- <div class="form-group col-lg-4
col-md-7 col-sm-12 no-padding-left">
- <label for="end_date">
- <xsl:value-of
select="php:function('lang', 'To')" />
- </label>
+ <div class="form-group col-lg-4
col-md-7 col-sm-12 no-padding-left">
+ <label for="end_date">
+ <xsl:value-of
select="php:function('lang', 'To')" />
+ </label>
- <input class="form-control"
id="end_date" type="text" name="to_[]">
- <xsl:attribute name="value">
- <xsl:value-of
select="to_"/>
- </xsl:attribute>
- <xsl:attribute name="readonly">
-
<xsl:text>readonly</xsl:text>
- </xsl:attribute>
+ <input class="form-control"
id="end_date" type="text" name="to_[]">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="to_"/>
+ </xsl:attribute>
+ <xsl:attribute
name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
- </input>
+ </input>
+ </div>
</div>
- </div>
- <!--div id="dtBox"></div-->
- </xsl:otherwise>
+ <!--div id="dtBox"></div-->
+ </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </div>
+ </xsl:choose>
+ </xsl:for-each>
+ </div>
- <a href="javascript:void(0);" id="add-date-link">
- <xsl:value-of select="php:function('lang', 'Add
another date')" />
- </a>
+ <a href="javascript:void(0);" id="add-date-link">
+ <xsl:value-of select="php:function('lang', 'Add
another date')" />
+ </a>
- </div>
+ </div>
- <!-- Steg 5 -->
+ <!-- Steg 5 -->
- <div class="col-lg-12 application-group">
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
- <xsl:if test="config/application_who">
- <p>
- <xsl:value-of select="config/application_who"/>
- </p>
- </xsl:if>
+ <div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
+ <xsl:if test="config/application_who">
+ <p>
+ <xsl:value-of select="config/application_who"/>
+ </p>
+ </xsl:if>
- <label for="field_from">
- <xsl:value-of select="php:function('lang', 'Target
audience')" />
- </label>
+ <label for="field_from">
+ <xsl:value-of select="php:function('lang', 'Target
audience')" />
+ </label>
- <div class="custom-controls-stacked">
- <input type="hidden" data-validation="target_audience">
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Please choose at least 1 target audience')" />
- </xsl:attribute>
- </input>
+ <div class="custom-controls-stacked">
+ <input type="hidden"
data-validation="target_audience">
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Please choose at least 1 target audience')" />
+ </xsl:attribute>
+ </input>
- <xsl:for-each select="audience">
+ <xsl:for-each select="audience">
- <label class="custom-control custom-radio">
- <input type="radio"
class="custom-control-input" name="audience[]">
- <xsl:attribute name="value">
- <xsl:value-of select="id"/>
- </xsl:attribute>
- <xsl:if test="../application/audience=id">
- <xsl:attribute
name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <span class="custom-control-indicator"></span>
- <span class="custom-control-description">
- <xsl:value-of select="name"/>
- </span>
+ <label class="custom-control custom-radio">
+ <input type="radio"
class="custom-control-input" name="audience[]">
+ <xsl:attribute name="value">
+ <xsl:value-of select="id"/>
+ </xsl:attribute>
+ <xsl:if
test="../application/audience=id">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <span
class="custom-control-indicator"></span>
+ <span class="custom-control-description">
+ <xsl:value-of select="name"/>
+ </span>
- </label>
+ </label>
- </xsl:for-each>
+ </xsl:for-each>
+ </div>
+
</div>
-
- </div>
- <!-- Steg 6-->
+ <!-- Steg 6-->
- <div class="col-lg-12 application-group">
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
- <xsl:if test="config/application_contact_information">
- <p>
- <xsl:value-of
select="config/application_contact_information"/>
- </p>
- </xsl:if>
+ <div class="heading">6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
+ <xsl:if test="config/application_contact_information">
+ <p>
+ <xsl:value-of
select="config/application_contact_information"/>
+ </p>
+ </xsl:if>
- <div class="form-group col-lg-4 col-md-7 col-sm-12
no-padding-left">
- <label for="field_contact_name">
- <xsl:value-of select="php:function('lang',
'Name')" />
- </label>
+ <div class="form-group col-lg-4 col-md-7 col-sm-12
no-padding-left">
+ <label for="field_contact_name">
+ <xsl:value-of select="php:function('lang',
'Name')" />
+ </label>
- <input id="field_contact_name" class="form-control"
name="contact_name" type="text">
- <xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Please enter a contact name')" />
- </xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of
select="application/contact_name"/>
- </xsl:attribute>
- </input>
- </div>
+ <input id="field_contact_name"
class="form-control" name="contact_name" type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Please enter a contact name')" />
+ </xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="application/contact_name"/>
+ </xsl:attribute>
+ </input>
+ </div>
- <div class="form-group col-lg-4 col-md-7 col-sm-12
no-padding-left">
- <label for="field_contact_email">
- <xsl:value-of select="php:function('lang', 'E-mail
address')" />
- </label>
+ <div class="form-group col-lg-4 col-md-7 col-sm-12
no-padding-left">
+ <label for="field_contact_email">
+ <xsl:value-of select="php:function('lang',
'E-mail address')" />
+ </label>
- <input id="field_contact_email" class="form-control"
name="contact_email" type="text">
- <xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Please enter a contact email')" />
- </xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of
select="application/contact_email"/>
- </xsl:attribute>
- </input>
- </div>
+ <input id="field_contact_email"
class="form-control" name="contact_email" type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'Please enter a contact email')" />
+ </xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="application/contact_email"/>
+ </xsl:attribute>
+ </input>
+ </div>
- <div class="form-group col-lg-4 col-md-7 col-sm-12
no-padding-left">
- <label for="field_contact_email2">
- <xsl:value-of select="php:function('lang',
'Confirm e-mail address')" />
- </label>
+ <div class="form-group col-lg-4 col-md-7 col-sm-12
no-padding-left">
+ <label for="field_contact_email2">
+ <xsl:value-of select="php:function('lang',
'Confirm e-mail address')" />
+ </label>
- <input id="field_contact_email2" class="form-control"
name="contact_email2" type="text">
- <xsl:attribute name="data-validation">
- <xsl:text>confirmation</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-confirm">
- <xsl:text>contact_email</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'The e-mail addresses you entered do not match')" />
- </xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of
select="application/contact_email2"/>
- </xsl:attribute>
- </input>
- </div>
+ <input id="field_contact_email2"
class="form-control" name="contact_email2" type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>confirmation</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-confirm">
+ <xsl:text>contact_email</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'The e-mail addresses you entered do not match')" />
+ </xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="application/contact_email2"/>
+ </xsl:attribute>
+ </input>
+ </div>
- <div class="form-group col-lg-4 col-md-7 col-sm-12
no-padding-left">
- <label for="field_contact_phone">
- <xsl:value-of select="php:function('lang',
'Phone')" />
- </label>
+ <div class="form-group col-lg-4 col-md-7 col-sm-12
no-padding-left">
+ <label for="field_contact_phone">
+ <xsl:value-of select="php:function('lang',
'Phone')" />
+ </label>
- <input id="field_contact_phone" class="form-control"
name="contact_phone" type="text">
- <xsl:attribute name="value">
- <xsl:value-of
select="application/contact_phone"/>
- </xsl:attribute>
- </input>
- </div>
+ <input id="field_contact_phone"
class="form-control" name="contact_phone" type="text">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="application/contact_phone"/>
+ </xsl:attribute>
+ </input>
+ </div>
- </div>
+ </div>
- <!-- Steg 7-->
+ <!-- Steg 7-->
- <div class="col-lg-12 application-group">
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
- <xsl:if test="config/application_responsible_applicant">
- <p>
- <xsl:value-of
select="config/application_responsible_applicant"/>
- </p>
- </xsl:if>
- <xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
- <br />
- <xsl:if test="config/application_invoice_information">
- <p>
- <xsl:value-of
select="config/application_invoice_information"/>
- </p>
- </xsl:if>
- </div>
+ <div class="heading">7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
+ <xsl:if
test="config/application_responsible_applicant">
+ <p>
+ <xsl:value-of
select="config/application_responsible_applicant"/>
+ </p>
+ </xsl:if>
+ <xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
+ <br />
+ <xsl:if test="config/application_invoice_information">
+ <p>
+ <xsl:value-of
select="config/application_invoice_information"/>
+ </p>
+ </xsl:if>
+ </div>
- <!-- Steg 8 -->
+ <!-- Steg 8 -->
- <div class="col-lg-12 application-group">
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
- <input type="hidden"
data-validation="regulations_documents">
- <xsl:attribute name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang', 'You
must accept to follow all terms and conditions of lease first')" />
- </xsl:attribute>
- </input>
- <xsl:if test="config/application_terms">
- <p>
- <xsl:value-of select="config/application_terms"/>
- </p>
- </xsl:if>
- <br />
- <div id='regulation_documents'> </div>
- <br />
- <xsl:if test="config/application_terms2">
- <p>
- <xsl:value-of select="config/application_terms2"/>
- </p>
- </xsl:if>
- </div>
+ <div class="heading">8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
+ <input type="hidden"
data-validation="regulations_documents">
+ <xsl:attribute name="data-validation-error-msg">
+ <xsl:value-of select="php:function('lang',
'You must accept to follow all terms and conditions of lease first')" />
+ </xsl:attribute>
+ </input>
+ <xsl:if test="config/application_terms">
+ <p>
+ <xsl:value-of
select="config/application_terms"/>
+ </p>
+ </xsl:if>
+ <br />
+ <div id='regulation_documents'> </div>
+ <br />
+ <xsl:if test="config/application_terms2">
+ <p>
+ <xsl:value-of
select="config/application_terms2"/>
+ </p>
+ </xsl:if>
+ </div>
- <!-- Steg 9 -->
+ <!-- Steg 9 -->
- <div class="col-lg-12 application-group">
+ <div class="col-lg-12 application-group bg-light">
- <div class="heading">9. <xsl:value-of
select="php:function('lang', 'Attachment')" /></div>
+ <div class="heading">9. <xsl:value-of
select="php:function('lang', 'Attachment')" /></div>
- <label for="field_name">
- <xsl:value-of select="php:function('lang',
'Document')" />
- </label>
+ <label for="field_name">
+ <xsl:value-of select="php:function('lang',
'Document')" />
+ </label>
- <br/>
+ <br/>
- <input name="name" id='field_name' type='file' >
- <xsl:attribute name='title'>
- <xsl:value-of select="document/name"/>
- </xsl:attribute>
- <xsl:attribute name="data-validation">
- <xsl:text>mime size</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-allowing">
- <xsl:text>jpg, png, gif, xls, xlsx, doc, docx,
txt, pdf, odt, ods</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-max-size">
- <xsl:text>2M</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="data-validation-error-msg">
- <xsl:text>Max 2M:: jpg, png, gif, xls, xlsx, doc,
docx, txt, pdf, odt, ods</xsl:text>
- </xsl:attribute>
- </input>
+ <input name="name" id='field_name' type='file' >
+ <xsl:attribute name='title'>
+ <xsl:value-of select="document/name"/>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>mime size</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-allowing">
+ <xsl:text>jpg, png, gif, xls, xlsx, doc, docx,
txt, pdf, odt, ods</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-max-size">
+ <xsl:text>2M</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-error-msg">
+ <xsl:text>Max 2M:: jpg, png, gif, xls, xlsx,
doc, docx, txt, pdf, odt, ods</xsl:text>
+ </xsl:attribute>
+ </input>
- </div>
+ </div>
+
- <div class="col-lg-12 application-group">
+ <div class="col-lg-12" style="margin-top: 2em">
- <input type="submit" class="btn btn-default">
- <xsl:attribute name="value">
- <xsl:value-of select="php:function('lang',
'Send')"/>
- </xsl:attribute>
- </input>
+ <input type="submit" class="btn btn-main">
+ <xsl:attribute name="value">
+ <xsl:value-of select="php:function('lang',
'Send')"/>
+ </xsl:attribute>
+ </input>
- <a class="cancel" style="margin-left: 20px">
- <xsl:attribute name="href">
- <xsl:value-of select="application/cancel_link"/>
- </xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Cancel')"
/>
- </a>
- <p style="margin-top: 10px;">Trykker du
<strong>SEND</strong>-knappen får du opp en rød melding øverst om noen
opplysninger mangler, er alt OK kommer det opp en grønn melding. Det blir sendt
en bekreftelse til din e-post, og en lenke hvor du kan gå inn og se status og
legge til ekstra opplysninger i saken.<br />
- <br />
- Trykker du <strong>Avbryt</strong> blir søknaden ikke
sendt eller lagret, og du går tilbake til kalenderen.</p>
+ <a class="cancel" style="margin-left: 20px">
+ <xsl:attribute name="href">
+ <xsl:value-of
select="application/cancel_link"/>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang',
'Cancel')" />
+ </a>
+ <p style="margin-top: 10px;">Trykker du
<strong>SEND</strong>-knappen får du opp en rød melding øverst om noen
opplysninger mangler, er alt OK kommer det opp en grønn melding. Det blir sendt
en bekreftelse til din e-post, og en lenke hvor du kan gå inn og se status og
legge til ekstra opplysninger i saken.<br />
+ <br />
+ Trykker du <strong>Avbryt</strong> blir søknaden
ikke sendt eller lagret, og du går tilbake til kalenderen.</p>
+ </div>
+
</div>
-
- </div>
@@ -595,7 +598,8 @@
- </form>
+ </form>
+ </div>
</div>
<script type="text/javascript">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building.xsl
2018-01-02 08:03:04 UTC (rev 17477)
+++ branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building.xsl
2018-01-02 08:18:55 UTC (rev 17478)
@@ -25,7 +25,7 @@
<xsl:if test="deactivate_calendar=0">
<div>
- <button class="btn btn-default btn-md"
onclick="window.location.href='{schedule_link}'">
+ <button class="btn btn-main btn-md"
onclick="window.location.href='{schedule_link}'">
<xsl:value-of select="php:function('lang', 'Building
schedule')" />
</button>
- Søk ledig tid/informasjon om hva som skjer
@@ -57,7 +57,7 @@
</h3>
<xsl:if test="deactivate_sendmessage=0">
<div>
- <button class="resource-button"
onclick="window.location.href='{message_link}'">
+ <button class="btn btn-main"
onclick="window.location.href='{message_link}'">
<xsl:value-of
select="php:function('lang', 'Send message')" />
</button>
- Meldig til saksbehandler for bygg
@@ -177,9 +177,9 @@
paginatorTableBuilding_users.limit = 10;
createPaginatorTable('building_users_container',
paginatorTableBuilding_users);
- createTable('resources_container', resourcesURL,
colDefsResources, rResources);
- createTable('documents_container', documentURL,
colDefsDocument);
- createTable('building_users_container', building_usersURL,
colDefsBuilding_users, rBuilding_users, '', paginatorTableBuilding_users);
+ createTable('resources_container', resourcesURL,
colDefsResources, rResources, 'table table-hover');
+ createTable('documents_container', documentURL,
colDefsDocument, '', 'table table-hover');
+ createTable('building_users_container', building_usersURL,
colDefsBuilding_users, rBuilding_users, 'table table-hover',
paginatorTableBuilding_users);
$(window).on('load', function(){
// Load image
Copied:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building_schedule.xsl
(from rev 17477,
trunk/bookingfrontend/templates/aalesund/building_schedule.xsl)
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building_schedule.xsl
(rev 0)
+++
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/building_schedule.xsl
2018-01-02 08:18:55 UTC (rev 17478)
@@ -0,0 +1,90 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+ <div class="container">
+ <xsl:if test="backend != 'true'">
+ <ul class="pathway">
+ <li>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'Home')" />
+ </a>
+ </li>
+ <li>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="building/building_link"/>
+ </xsl:attribute>
+ <xsl:value-of
select="building/name"/>
+ </a>
+ </li>
+ <li>
+ <xsl:value-of
select="php:function('lang', 'Schedule')"/>
+ </li>
+ </ul>
+
+ <xsl:call-template name="msgbox"/>
+
+ <xsl:if test="building/deactivate_application=0">
+ <button class="btn btn-main"
onclick="schedule.newApplicationForm();">
+ <xsl:value-of
select="php:function('lang', 'New booking application')" />
+ </button>
+ - Søk ledig tid
+ </xsl:if>
+ </xsl:if>
+ <ul id="week-selector">
+ <li>
+ <a id="btnPrevWeek" class="moveWeek"
onclick="schedule.prevWeek(); return false">
+ <xsl:value-of
select="php:function('lang', 'Previous week')"/>
+ </a>
+ </li>
+ <li id="cal_container">
+ <div>
+ <span>
+ <xsl:value-of
select="php:function('lang', 'Week')" />: </span>
+ <label id="numberWeek"></label>
+ <input type="text" id="datepicker" />
+ <img id="pickerImg"
src="{building/picker_img}" />
+ </div>
+ </li>
+ <li>
+ <a id="btnPrevWeek" class="moveWeek"
onclick="schedule.nextWeek(); return false">
+ <xsl:value-of
select="php:function('lang', 'Next week')"/>
+ </a>
+ </li>
+ </ul>
+ <div id="schedule_container"/>
+ </div>
+ <div id="dialog_schedule"></div>
+
+ <script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
+ schedule.createDialogSchedule(300);
+ $(window).on('load', function() {
+ schedule.setupWeekPicker('cal_container');
+ schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
+ schedule.newApplicationUrl = '<xsl:value-of
select="building/application_link"/>';
+ schedule.includeResource = true;
+ schedule.colFormatter = 'frontendScheduleDateColumn';
+ var handleHistoryNavigation = function (state) {
+ schedule.date = parseISO8601(state);
+ schedule.renderSchedule('schedule_container',
schedule.datasourceUrl, schedule.date, schedule.colFormatter,
schedule.includeResource);
+ };
+
+ var initialRequest = getUrlData("date") || '<xsl:value-of
select="building/date"/>';
+
+ var state = getUrlData("date") || initialRequest;
+ schedule.state = state;
+ if (state){
+ handleHistoryNavigation(state);
+ schedule.week = $.datepicker.iso8601Week(schedule.date);
+ $('#cal_container #numberWeek').text(schedule.week);
+ $("#cal_container #datepicker").datepicker("setDate",
parseISO8601(state));
+ }
+ });
+ <xsl:if test="backend = 'true'">
+ $('header').hide();
+ </xsl:if>
+ </script>
+</xsl:template>
Copied:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/organization.xsl
(from rev 17477, trunk/bookingfrontend/templates/aalesund/organization.xsl)
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/organization.xsl
(rev 0)
+++
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/organization.xsl
2018-01-02 08:18:55 UTC (rev 17478)
@@ -0,0 +1,191 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+
+ <div class="container">
+ <ul class="pathway">
+ <li>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'Home')" />
+ </a>
+ </li>
+ <li>
+ <a href="{resource/building_link}">
+ <xsl:value-of
select="resource/building_name"/>
+ </a>
+ </li>
+ <li>
+ <xsl:value-of select="organization/name"/>
+ </li>
+ </ul>
+
+ <xsl:if test="organization/permission/write">
+ <span class="loggedin">
+ <button
onclick="window.location.href='{organization/edit_link}'">
+ <xsl:value-of
select="php:function('lang', 'edit')" />
+ </button>
+ </span>
+ </xsl:if>
+
+ <div class="row details-wrapper">
+
+ <div class="col-lg-7">
+ <xsl:if test="organization/description and
normalize-space(organization/description)">
+ <dl class="proplist description">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Description')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="organization/description" disable-output-escaping="yes"/>
+ </dd>
+ </dl>
+ </xsl:if>
+
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Contact information')" />
+ </h3>
+ <dl class="proplist contactinfo">
+
+ <xsl:if test="organization/homepage and
normalize-space(organization/homepage)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Homepage')" />
+ </dt>
+ <dd>
+ <a target="blank"
href="{organization/homepage}">
+ <xsl:value-of
select="organization/homepage" />
+ </a>
+ </dd>
+ </xsl:if>
+
+ <xsl:if test="organization/email and
normalize-space(organization/email)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Email')" />
+ </dt>
+ <dd>
+ <a
href="mailto:{organization/email}";>
+ <xsl:value-of
select="organization/email"/>
+ </a>
+ </dd>
+ </xsl:if>
+
+ <xsl:if test="organization/phone and
normalize-space(organization/phone)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Phone')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="organization/phone"/>
+ </dd>
+ </xsl:if>
+
+ <xsl:if test="organization/street and
normalize-space(organization/street)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Address')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="organization/street"/>
+ <br/>
+ <xsl:value-of
select="organization/zip_code"/>
+ <span> </span>
+ <xsl:value-of
select="organization/city"/>
+ <br/>
+ <xsl:value-of
select="organization/district"/>
+ </dd>
+ </xsl:if>
+
+ </dl>
+
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Groups')" />
+ </h3>
+ <div id="groups_container"/>
+
+ <a href="{organization/new_group_link}">
+ <xsl:value-of
select="php:function('lang', 'new group')" />
+ </a>
+
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'delegates')" />
+ </h3>
+ <div id="delegates_container"/>
+
+ <a href="{organization/new_delegate_link}">
+ <xsl:value-of
select="php:function('lang', 'new delegate')" />
+ </a>
+
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Used buildings')" />
+ </h3>
+ <div id="buildings_used_by_container"/>
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Documents')" />
+ </h3>
+ <div id="documents_container"/>
+ </div>
+ <div class="col-lg-5">
+ <dl class="images">
+ <div id="images_container"></div>
+ </dl>
+ <dl class="proplist-col 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>
+ <script type="text/javascript">
+ var organization_id = <xsl:value-of select="organization/id"/>;
+ var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Activity', 'Contact 1', 'Contact 2', 'email','phone', 'active')"/>;
+
+ <![CDATA[
+ var groupURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uigroup.index', sort:'name',
filter_organization_id: organization_id}, true);
+ var delegateURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidelegate.index', sort: 'name',
filter_organization_id: organization_id, filter_active:'-1'},true);
+ var buildingURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uibuilding.find_buildings_used_by', sort:'name',
organization_id: organization_id}, true);
+ var documentURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_organization.index', sort:'name',
no_images:1, filter_owner_id:organization_id}, true);
+ var document_organizationURL =
phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_organization.index_images',
sort:'name', filter_owner_id:organization_id}, true);
+ ]]>
+
+ var rBuilding = [{n: 'ResultSet'},{n: 'Result'}];
+
+ var colDefsGroup = [
+ {key: 'name', label: lang['Name'], formatter: genericLink},
+ {key: 'link', attrs: [{name: 'hidden'}]},
+ {key: 'activity_name', label: lang['Activity']},
+ {key: 'primary_contact_name', label: lang['Contact 1']},
+ {key: 'secondary_contact_name', label: lang['Contact 2']}
+ ];
+
+ var colDefsDelegate = [
+ {key: 'name', label: lang['Name'], formatter: genericLink},
+ {key: 'email', label: lang['email']},
+ {key: 'phone', label: lang['phone']},
+ {key: 'active', label: lang['active']}
+ ];
+
+ var colDefsBuilding = [{key: 'name', label: lang['Name'],
formatter: genericLink}];
+ var colDefsDocument = [{key: 'description', label:
lang['Name'], formatter: genericLink}];
+
+ createTable('groups_container', groupURL, colDefsGroup, '',
'table table-hover');
+ createTable('delegates_container', delegateURL,
colDefsDelegate, '', 'table table-hover');
+ createTable('buildings_used_by_container', buildingURL,
colDefsBuilding, rBuilding, 'table table-hover');
+
+ createTable('documents_container', documentURL,
colDefsDocument, '', 'table table-hover');
+ $(window).on('load', function(){
+ // Load image
+ JqueryPortico.booking.inlineImages('images_container',
document_organizationURL);
+ });
+
+ </script>
+
+</xsl:template>
+
+
+
Copied:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource.xsl
(from rev 17477, trunk/bookingfrontend/templates/aalesund/resource.xsl)
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource.xsl
(rev 0)
+++ branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource.xsl
2018-01-02 08:18:55 UTC (rev 17478)
@@ -0,0 +1,140 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+ <div class="container">
+ <xsl:for-each select="pathway">
+ <ul class="pathway">
+ <li>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'Home')" />
+ </a>
+ </li>
+ <li>
+ <a href="{building_link}">
+ <xsl:value-of
select="building_name"/>
+ </a>
+ </li>
+ <li>
+ <xsl:value-of select="resource_name"/>
+ </li>
+ </ul>
+ </xsl:for-each>
+
+ <div>
+ <button class="btn btn-main btn-md"
onclick="window.location.href='{resource/schedule_link}'">
+ <xsl:value-of select="php:function('lang',
'Resource schedule')" />
+ </button>
+ - Søk ledig tid/informasjon om hva som skjer
+ </div>
+ <div class="row details-wrapper">
+
+ <div class="col-lg-7">
+ <dl class="proplist-col main">
+ <xsl:if test="resource/description and
normalize-space(resource/description)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Description')" />
+ </dt>
+ <dd>
+ <xsl:value-of
disable-output-escaping="yes" select="resource/description"/>
+ </dd>
+ </xsl:if>
+ <xsl:if test="resource/activity_name
and normalize-space(resource/activity_name)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Activity')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="resource/activity_name"/>
+ </dd>
+ </xsl:if>
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Resource Type')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="php:function('lang', string(resource/type))"/>
+ </dd>
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Documents')" />
+ </h3>
+ <div id="documents_container"/>
+ </dl>
+ <div id="custom_fields"></div>
+ </div>
+ <input type= "hidden" id="field_activity_id"
value="{resource/activity_id}"/>
+
+ <div class="col-lg-5">
+ <dl class="images">
+ <div id="images_container">
+ </div>
+ </dl>
+ <dl class="images map">
+ <!--div id="images_container"></div-->
+ <xsl:if test="resource/building/street
and normalize-space(resource/building/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>
+ <script type="text/javascript">
+ var resource_id = <xsl:value-of select="resource/id"/>;
+ var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'category', 'Activity')"/>;
+ var address = '<xsl:value-of
select="resource/building/street"/>, <xsl:value-of
select="resource/building/zip_code"/>, <xsl:value-of
select="resource/building/city"/>';
+
+ <![CDATA[
+ var documentsResourceURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_resource.index', sort:'name',
no_images:1, filter_owner_id:resource_id}, true);
+ var documentsResourceImagesURL =
phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_resource.index_images', sort:'name',
filter_owner_id:resource_id}, true);
+ var iurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&output=embed&geocode=&q=' +
address;
+ var linkurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&geocode=&q=' + address;
+ ]]>
+
+ var colDefsDocumentsResource = [{key: 'name', label:
lang['Name'], formatter: genericLink}];
+
+ createTable('documents_container', documentsResourceURL,
colDefsDocumentsResource, '', 'table table-hover');
+ $(window).on('load', function(){
+ JqueryPortico.booking.inlineImages('images_container',
documentsResourceImagesURL);
+
+ // Load Google map
+ if( iurl.length > 0 ) {
+ $("#googlemapiframe").attr("src", iurl);
+ $("#googlemaplink").attr("href", linkurl);
+ }
+
+ });
+ <![CDATA[
+
+ $(document).ready(function () {
+
+ get_custom_fields();
+ });
+
+ get_custom_fields = function () {
+ var oArgs = {menuaction:
'bookingfrontend.uiresource.get_custom', resource_id: resource_id};
+ var requestUrl = phpGWLink('bookingfrontend/', oArgs);
+ requestUrl += "&phpgw_return_as=stripped_html";
+ var activity_id = $("#field_activity_id").val();
+ $.ajax({
+ type: 'POST',
+ data: {activity_id: activity_id},
+ dataType: 'html',
+ url: requestUrl,
+ success: function (data) {
+ if (data != null)
+ {
+ var custom_fields = data;
+
$("#custom_fields").html(custom_fields);
+ }
+ }
+ });
+ };
+ ]]>
+
+
+ </script>
+</xsl:template>
Copied:
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource_schedule.xsl
(from rev 17477,
trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl)
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource_schedule.xsl
(rev 0)
+++
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/resource_schedule.xsl
2018-01-02 08:18:55 UTC (rev 17478)
@@ -0,0 +1,89 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+ <div class="container">
+ <xsl:for-each select="pathway">
+ <ul class="pathway">
+ <li>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'Home')" />
+ </a>
+ </li>
+ <li>
+ <a href="{building_link}">
+ <xsl:value-of
select="building_name"/>
+ </a>
+ </li>
+ <li>
+ <a href="{resource_link}">
+ <xsl:value-of
select="resource_name"/>
+ </a>
+ </li>
+ <li>
+ <xsl:value-of select="lang_schedule"/>
+ </li>
+ </ul>
+ </xsl:for-each>
+
+
+ <button class="btn btn-main"
onclick="window.location.href='{resource/application_link}'">
+ <xsl:value-of select="php:function('lang', 'New booking
application')" />
+ </button>
+
+ <xsl:call-template name="msgbox"/>
+ <ul id="week-selector">
+ <li>
+ <a id="btnPrevWeek" class="moveWeek"
onclick="schedule.prevWeek(); return false">
+ <xsl:value-of
select="php:function('lang', 'Previous week')"/>
+ </a>
+ </li>
+ <li id="cal_container">
+ <div>
+ <span>
+ <xsl:value-of
select="php:function('lang', 'Week')" />: </span>
+ <label id="numberWeek"></label>
+ <input type="text" id="datepicker" />
+ <img id="pickerImg"
src="{resource/picker_img}" />
+ </div>
+ </li>
+ <li>
+ <a id="btnPrevWeek" class="moveWeek"
onclick="schedule.nextWeek(); return false">
+ <xsl:value-of
select="php:function('lang', 'Next week')"/>
+ </a>
+ </li>
+ </ul>
+
+ <div id="schedule_container"/>
+ </div>
+ <div id="dialog_schedule"></div>
+
+ <script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
+ schedule.createDialogSchedule(300);
+ $(window).on('load', function(){
+ schedule.setupWeekPicker('cal_container');
+ schedule.datasourceUrl = '<xsl:value-of
select="resource/datasource_url" />';
+ schedule.newApplicationUrl = '<xsl:value-of
select="resource/application_link" />';
+ schedule.includeResource = false;
+ schedule.colFormatter = 'frontendScheduleDateColumn';
+ var handleHistoryNavigation = function (state) {
+ schedule.date = parseISO8601(state);
+ schedule.renderSchedule('schedule_container',
schedule.datasourceUrl, schedule.date, schedule.colFormatter,
schedule.includeResource);
+ }
+
+ var initialRequest = getUrlData("date") || '<xsl:value-of
select="resource/date" />';
+
+ var state = getUrlData("date") || initialRequest;
+ if (state) {
+ handleHistoryNavigation(state);
+ schedule.week = $.datepicker.iso8601Week(schedule.date);
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17478] Stable: Merge 17431:17477 from trunk,
sigurdne <=