[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17511] dev-bkbygg: Merge 17502:17510 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17511] dev-bkbygg: Merge 17502:17510 from trunk |
|
Date: |
Tue, 9 Jan 2018 04:21:12 -0500 (EST) |
Revision: 17511
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17511
Author: sigurdne
Date: 2018-01-09 04:21:12 -0500 (Tue, 09 Jan 2018)
Log Message:
-----------
dev-bkbygg: Merge 17502:17510 from trunk
Modified Paths:
--------------
branches/dev-bkbygg/admin/setup/phpgw_no.lang
branches/dev-bkbygg/admin/templates/base/config.tpl
branches/dev-bkbygg/booking/setup/phpgw_no.lang
branches/dev-bkbygg/phpgwapi/doc/Vagrantfile
branches/dev-bkbygg/phpgwapi/inc/class.uicommon_jquery.inc.php
branches/dev-bkbygg/phpgwapi/setup/phpgw_no.lang
branches/dev-bkbygg/phpgwapi/templates/aalesund/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/bkbooking/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/bookingfrontend/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/frontend/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/idsociety/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/mobilefrontend/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/portico/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/probusiness/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/pure/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/simple/head.inc.php
branches/dev-bkbygg/phpgwapi/templates/verdilak/head.inc.php
branches/dev-bkbygg/property/templates/base/tts.xsl
Property Changed:
----------------
branches/dev-bkbygg/
branches/dev-bkbygg/booking/
Index: branches/dev-bkbygg
===================================================================
--- branches/dev-bkbygg 2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg 2018-01-09 09:21:12 UTC (rev 17511)
Property changes on: branches/dev-bkbygg
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
-/branches/stavangerkommune:12743-12875,12986
\ No newline at end of property
+/branches/stavangerkommune:12743-12875,12986
+/trunk:17503-17510
\ No newline at end of property
Modified: branches/dev-bkbygg/admin/setup/phpgw_no.lang
===================================================================
--- branches/dev-bkbygg/admin/setup/phpgw_no.lang 2018-01-09 09:12:00 UTC
(rev 17510)
+++ branches/dev-bkbygg/admin/setup/phpgw_no.lang 2018-01-09 09:21:12 UTC
(rev 17511)
@@ -137,3 +137,4 @@
data admin no Data
settings admin no Innstillinger
color selector admin no Farge velger
+would you like to check for a new version when admins login admin no
Vil du sjekke om det finnes ny versjon når administratorer logger inn
\ No newline at end of file
Modified: branches/dev-bkbygg/admin/templates/base/config.tpl
===================================================================
--- branches/dev-bkbygg/admin/templates/base/config.tpl 2018-01-09 09:12:00 UTC
(rev 17510)
+++ branches/dev-bkbygg/admin/templates/base/config.tpl 2018-01-09 09:21:12 UTC
(rev 17511)
@@ -12,8 +12,8 @@
<tbody>
<!-- END header -->
<!-- BEGIN body -->
- <tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_check_for_a_new_version_when_admins_login_?}:</td>
+ <!--tr class="pure-table-odd">
+
<td>{lang_Would_you_like_to_check_for_a_new_version_when_admins_login}?:</td>
<td>
<select
name="newsettings[checkfornewversion]">
<option
value="">{lang_No}</option>
@@ -20,20 +20,20 @@
<option
value="True"{selected_checkfornewversion_True}>{lang_Yes}</option>
</select>
</td>
- </tr>
+ </tr-->
<tr>
-
<td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td>
+ <td>{lang_Timeout_for_sessions_in_seconds}
(default 14400 = 4 hours):</td>
<td><input size="8"
name="newsettings[sessions_timeout]" value="{value_sessions_timeout}"></td>
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td>
+
<td>{lang_Timeout_for_application_session_data_in_seconds} (default 86400 = 1
day):</td>
<td><input size="8"
name="newsettings[sessions_app_timeout]"
value="{value_sessions_app_timeout}"></td>
</tr>
<tr>
-
<td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td>
+
<td>{lang_Would_you_like_to_show_each_applications_upgrade_status}?:</td><td>
<select
name="newsettings[checkappversions]">
<option
value="">{lang_No}</option>
<option
value="Admin"{selected_checkappversions_Admin}>{lang_Admins}</option>
@@ -43,7 +43,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array_?}:</td>
+
<td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array}?:</td>
<td>
<select
name="newsettings[cache_phpgw_info]">
<option
value="">{lang_No}</option>
@@ -58,7 +58,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
+
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_at_login_time}?:</td>
<td>
<select
name="newsettings[disable_autoload_langfiles]">
<option
value="">{lang_Yes}</option>
@@ -68,7 +68,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_cache_data_in_shared_memory_?}:</td>
+
<td>{lang_Would_you_like_phpGroupWare_to_cache_data_in_shared_memory}?:</td>
<td>
<select name="newsettings[shm_enable]">
<option
value="">{lang_No}</option>
@@ -82,7 +82,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_SMTP_server_hostname_(or_IP_address)}:</td>
+
<td>{lang_SMTP_server_hostname_or_IP_address}:</td>
<td><input name="newsettings[smtp_server]"
value="{value_smtp_server}" /></td>
</tr>
@@ -214,7 +214,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries_?}:</td>
+
<td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries}?:</td>
<td>
<select
name="newsettings[deny_user_grants_access]">
<option
value="">{lang_No}</option>
@@ -224,7 +224,7 @@
</tr>
<tr>
-
<td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
+
<td>{lang_How_many_days_should_entries_stay_in_the_access_log_before_they_get_deleted}?
(default 90):</td>
<td>
<input
name="newsettings[max_access_log_age]" value="{value_max_access_log_age}"
size="5">
</td>
@@ -231,7 +231,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
+
<td>{lang_After_how_many_unsuccessful_attempts_to_login_an_account_should_be_blocked}?
(default 3):</td>
<td>
<input
name="newsettings[num_unsuccessful_id]" value="{value_num_unsuccessful_id}"
size="5">
</td>
@@ -238,7 +238,7 @@
</tr>
<tr>
-
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
+
<td>{lang_After_how_many_unsuccessful_attempts_to_login_an_IP_should_be_blocked}?
(default 3):</td>
<td>
<input
name="newsettings[num_unsuccessful_ip]" value="{value_num_unsuccessful_ip}"
size="5">
</td>
@@ -245,7 +245,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
+
<td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked}? (default
30):</td>
<td>
<input name="newsettings[block_time]"
value="{value_block_time}" size="5">
</td>
@@ -252,7 +252,7 @@
</tr>
<tr>
-
<td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
+
<td>{lang_comma_separated_admin_email_addresses_to_be_notified_about_the_blocking}:</td>
<td>
<input name="newsettings[admin_mails]"
value="{value_admin_mails}" size="40">
</td>
@@ -259,7 +259,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
+
<td>{lang_Disable_auto_completion_of_the_login_form_}:</td>
<td>
<select
name="newsettings[autocomplete_login]">
<option
value="">{lang_No}</option>
Index: branches/dev-bkbygg/booking
===================================================================
--- branches/dev-bkbygg/booking 2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/booking 2018-01-09 09:21:12 UTC (rev 17511)
Property changes on: branches/dev-bkbygg/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16846
-/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
\ No newline at end of property
+/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
+/trunk/booking:17503-17510
\ No newline at end of property
Modified: branches/dev-bkbygg/booking/setup/phpgw_no.lang
===================================================================
--- branches/dev-bkbygg/booking/setup/phpgw_no.lang 2018-01-09 09:12:00 UTC
(rev 17510)
+++ branches/dev-bkbygg/booking/setup/phpgw_no.lang 2018-01-09 09:21:12 UTC
(rev 17511)
@@ -19,6 +19,7 @@
add another date booking no Legg til dato
add boundary booking no Legg til rammetid
add comment booking no Legg til kommentar
+comment booking no Kommentar
add document booking no Legg til dokument
add new event booking no Legg til arrangement
event settings booking no Innstillinger for arrangement
Modified: branches/dev-bkbygg/phpgwapi/doc/Vagrantfile
===================================================================
--- branches/dev-bkbygg/phpgwapi/doc/Vagrantfile 2018-01-09 09:12:00 UTC
(rev 17510)
+++ branches/dev-bkbygg/phpgwapi/doc/Vagrantfile 2018-01-09 09:21:12 UTC
(rev 17511)
@@ -126,18 +126,18 @@
sudo apt-get install -y less vim-tiny
sudo apt-get install -y subversion
sudo apt-get install -y apg
- # sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/
`lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
- # wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | sudo
apt-key add -
- sudo apt-get update
- sudo apt-get install -y postgresql postgresql-contrib
+ sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/
`lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
+ wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | sudo
apt-key add -
+ sudo apt-get update
+ sudo apt-get install -y postgresql-9.6 postgresql-client-9.6
postgresql-contrib-9.6
# fix permissions
echo "-------------------- fixing listen_addresses on postgresql.conf"
- sudo sed -i "s/#listen_address.*/listen_addresses '*'/"
/etc/postgresql/9.5/main/postgresql.conf
+ sudo sed -i "s/#listen_address.*/listen_addresses '*'/"
/etc/postgresql/9.6/main/postgresql.conf
echo "-------------------- fixing postgres pg_hba.conf file"
# replace the ipv4 host line with the above line
- sudo cat >> /etc/postgresql/9.5/main/pg_hba.conf <<EOF
+ sudo cat >> /etc/postgresql/9.6/main/pg_hba.conf <<EOF
# Accept all IPv4 connections - FOR DEVELOPMENT ONLY!!!
host all all 0.0.0.0/0 md5
EOF
Modified: branches/dev-bkbygg/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/inc/class.uicommon_jquery.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/inc/class.uicommon_jquery.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -387,6 +387,7 @@
'sortAscending' => $sort_asc,
'sortDescending' => $sort_desc
)),
+ 'select' => json_encode(array('rows' =>
array('0'=> '','_'=> '%d ' . lang('rows selected'))))
),
'lengthmenu' => array('_' =>
json_encode($lengthmenu)),
'lengthmenu_allrows' => array('_' =>
json_encode(array(-1, lang('all')))),
Modified: branches/dev-bkbygg/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/dev-bkbygg/phpgwapi/setup/phpgw_no.lang 2018-01-09 09:12:00 UTC
(rev 17510)
+++ branches/dev-bkbygg/phpgwapi/setup/phpgw_no.lang 2018-01-09 09:21:12 UTC
(rev 17511)
@@ -286,3 +286,4 @@
color selector common no Fargevelger
select all common no Velg alle
hidden common no Gjemt
+rows selected common no rader er valgt
Modified: branches/dev-bkbygg/phpgwapi/templates/aalesund/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/aalesund/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/aalesund/head.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -51,6 +51,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
Modified: branches/dev-bkbygg/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/bkbooking/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/bkbooking/head.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -54,6 +54,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified: branches/dev-bkbygg/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/bookingfrontend/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/bookingfrontend/head.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -51,6 +51,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
Modified: branches/dev-bkbygg/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/frontend/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/frontend/head.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -67,6 +67,7 @@
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
}
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
Modified: branches/dev-bkbygg/phpgwapi/templates/idsociety/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/idsociety/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/idsociety/head.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -26,6 +26,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified: branches/dev-bkbygg/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/mobilefrontend/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/mobilefrontend/head.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -23,6 +23,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified: branches/dev-bkbygg/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/portico/head.inc.php 2018-01-09
09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/portico/head.inc.php 2018-01-09
09:21:12 UTC (rev 17511)
@@ -45,15 +45,15 @@
$stylesheets = array();
- // added aalesund stylesheet
- $stylesheets[] =
"/phpgwapi/templates/aalesund/bootstrap/css/bootstrap.min.css";
- $stylesheets[] = "/phpgwapi/templates/aalesund/css/bootstrap.css";
- $stylesheets[] = "/phpgwapi/templates/aalesund/css/ionicons.css";
+ // added aalesund stylesheet
+ $stylesheets[] =
"/phpgwapi/templates/aalesund/bootstrap/css/bootstrap.min.css";
+ $stylesheets[] = "/phpgwapi/templates/aalesund/css/bootstrap.css";
+ $stylesheets[] = "/phpgwapi/templates/aalesund/css/ionicons.css";
// // // // // // // // // //
-
-
-
+
+
+
// $stylesheets[] = "/phpgwapi/js/materialize/css/materialize.min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/global.css";
// $stylesheets[] = "/phpgwapi/templates/pure/css/demo_mmenu.css";
@@ -60,14 +60,15 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/phpgwapi/templates/base/css/base.css";
$stylesheets[] = "/phpgwapi/templates/portico/css/base.css";
-
-
-
-
+
+
+
+
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
{
$stylesheets[] =
"/phpgwapi/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
@@ -188,7 +189,7 @@
echo '<body>';
register_shutdown_function('parse_footer_end_noframe');
}
-
+
function parse_footer_end_noframe()
{
$javascript_end =
$GLOBALS['phpgw']->common->get_javascript_end();
Modified: branches/dev-bkbygg/phpgwapi/templates/probusiness/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/probusiness/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/probusiness/head.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -16,6 +16,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified: branches/dev-bkbygg/phpgwapi/templates/pure/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/pure/head.inc.php 2018-01-09
09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/pure/head.inc.php 2018-01-09
09:21:12 UTC (rev 17511)
@@ -47,6 +47,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
// $stylesheets[] = "/phpgwapi/templates/base/css/base.css";
Modified: branches/dev-bkbygg/phpgwapi/templates/simple/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/simple/head.inc.php 2018-01-09
09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/simple/head.inc.php 2018-01-09
09:21:12 UTC (rev 17511)
@@ -27,6 +27,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
Modified: branches/dev-bkbygg/phpgwapi/templates/verdilak/head.inc.php
===================================================================
--- branches/dev-bkbygg/phpgwapi/templates/verdilak/head.inc.php
2018-01-09 09:12:00 UTC (rev 17510)
+++ branches/dev-bkbygg/phpgwapi/templates/verdilak/head.inc.php
2018-01-09 09:21:12 UTC (rev 17511)
@@ -30,6 +30,7 @@
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/jquery.dataTables.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/DataTables/css/dataTables.jqueryui.min.css";
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
Modified: branches/dev-bkbygg/property/templates/base/tts.xsl
===================================================================
--- branches/dev-bkbygg/property/templates/base/tts.xsl 2018-01-09 09:12:00 UTC
(rev 17510)
+++ branches/dev-bkbygg/property/templates/base/tts.xsl 2018-01-09 09:21:12 UTC
(rev 17511)
@@ -691,7 +691,7 @@
<xsl:value-of select="$lang_sms_text"/>
</a>
</label>
- <textarea
class="pure-input-1-2" rows="{textarearows}" id="response_text"
name="values[response_text]" onKeyUp="javascript: SmsCountKeyUp(160);"
onKeyDown="javascript: SmsCountKeyDown(160);" wrap="virtual">
+ <textarea
class="pure-input-1-2" rows="{textarearows}" id="response_text"
name="values[response_text]" onKeyUp="javascript: SmsCountKeyUp(804);"
onKeyDown="javascript: SmsCountKeyDown(804);" wrap="virtual">
<xsl:attribute name="title">
<xsl:value-of select="$lang_sms_text"/>
</xsl:attribute>
@@ -701,7 +701,7 @@
<label>
<xsl:value-of select="php:function('lang', 'character left')"/>
</label>
- <input
type="text" readonly="readonly" size="3" maxlength="3"
name="charNumberLeftOutput" id="charNumberLeftOutput" value="160">
+ <input
type="text" readonly="readonly" size="3" maxlength="3"
name="charNumberLeftOutput" id="charNumberLeftOutput" value="804">
</input>
</div>
</xsl:when>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17511] dev-bkbygg: Merge 17502:17510 from trunk,
sigurdne <=