From aa62bad07b7505cecb4347c7c4425bbd7bbcfcc5 Mon Sep 17 00:00:00 2001 From: Jeroen van Riet Paap Date: Wed, 2 Mar 2016 15:33:18 +0100 Subject: little nl string fix --- view/nl/register_open_eml.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/nl/register_open_eml.tpl b/view/nl/register_open_eml.tpl index 4ee6756ef..6c15de192 100644 --- a/view/nl/register_open_eml.tpl +++ b/view/nl/register_open_eml.tpl @@ -1,4 +1,4 @@ -s met dit e-mailadres een account aangemaakt op {{$sitename}}. +Er is met dit e-mailadres een account aangemaakt op {{$sitename}}. De inloggegevens zijn als volgt: Hub: {{$siteurl}} -- cgit v1.2.3 From 5c22f59c4f758e474f4ff553fc5ada36a14fd474 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 2 Mar 2016 11:32:32 -0800 Subject: issue #305 --- include/notifier.php | 1 - include/ratenotif.php | 1 - version.inc | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 93cc77a1c..628847d54 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -68,7 +68,6 @@ require_once('include/html2plain.php'); require_once('include/cli_startup.php'); require_once('include/zot.php'); require_once('include/queue_fn.php'); -require_once('include/session.php'); require_once('include/datetime.php'); require_once('include/items.php'); require_once('include/bbcode.php'); diff --git a/include/ratenotif.php b/include/ratenotif.php index e94f30247..2c636c710 100644 --- a/include/ratenotif.php +++ b/include/ratenotif.php @@ -11,7 +11,6 @@ function ratenotif_run($argv, $argc){ $a = get_app(); - require_once("session.php"); require_once("datetime.php"); require_once('include/items.php'); require_once('include/Contact.php'); diff --git a/version.inc b/version.inc index 9881b9f45..9863e681b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-03-01.1323H +2016-03-02.1324H -- cgit v1.2.3 From 6f4c45a48912c9dfaaf7631c58849476878b4fe1 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 2 Mar 2016 15:36:14 -0800 Subject: UI cleanup for admin profile field management page --- mod/admin.php | 4 ++-- view/tpl/admin_profiles.tpl | 25 ++++++++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 2e2536af3..6ec722691 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1759,14 +1759,14 @@ function admin_page_profs(&$a) { $o = replace_macros(get_markup_template('admin_profiles.tpl'),array( '$title' => t('Profile Management'), '$basic' => array('basic',t('Basic Profile Fields'),$basic,''), - '$advanced' => array('advanced',t('Advanced Profile Fields'),$advanced,t('In addition to basic fields')), + '$advanced' => array('advanced',t('Advanced Profile Fields'),$advanced,t('(In addition to basic fields)')), '$all' => $all, '$all_desc' => t('All available fields'), '$cust_field_desc' => t('Custom Fields'), '$cust_fields' => $r, '$edit' => t('Edit'), '$drop' => t('Delete'), - '$new' => t('Create'), + '$new' => t('Create Custom Field'), '$submit' => t('Submit') )); diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl index 70fcc303b..8962c21b3 100644 --- a/view/tpl/admin_profiles.tpl +++ b/view/tpl/admin_profiles.tpl @@ -1,5 +1,14 @@
-

{{$title}}

+
 {{$new}}

{{$title}}

+
+
+ +
+ +
{{$all_desc}} +

+{{$all}} +
@@ -10,22 +19,20 @@
-
{{$all_desc}}
-
{{$all}}
+{{if $cust_fields}}

-
{{$cust_field_desc}}
- - +
{{$cust_field_desc}}
+
-{{if $cust_fields}} - +
{{foreach $cust_fields as $field}} - + {{/foreach}}
{{$field.field_desc}}{{$field.field_name}}{{$edit}} {{$drop}}
{{$field.field_name}}{{$field.field_desc}} {{$drop}}
{{/if}} +
-- cgit v1.2.3 From 436e91a1e13bc488003262dfffb0a7d273a3106a Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 2 Mar 2016 16:39:34 -0800 Subject: rename the menu entry and page to 'Profile Fields' to maintain consistency --- include/widgets.php | 2 +- mod/admin.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/widgets.php b/include/widgets.php index 3b8a5a7a3..0fc10dfc0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1297,7 +1297,7 @@ function widget_admin($arr) { 'plugins' => array(z_root() . '/admin/plugins/', t('Plugins'), 'plugins'), 'themes' => array(z_root() . '/admin/themes/', t('Themes'), 'themes'), 'queue' => array(z_root() . '/admin/queue', t('Inspect queue'), 'queue'), - 'profs' => array(z_root() . '/admin/profs', t('Profile Config'), 'profs'), + 'profs' => array(z_root() . '/admin/profs', t('Profile Fields'), 'profs'), 'dbsync' => array(z_root() . '/admin/dbsync/', t('DB updates'), 'dbsync') ); diff --git a/mod/admin.php b/mod/admin.php index 6ec722691..6300ac027 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1757,7 +1757,7 @@ function admin_page_profs(&$a) { $o = replace_macros(get_markup_template('admin_profiles.tpl'),array( - '$title' => t('Profile Management'), + '$title' => t('Profile Fields'), '$basic' => array('basic',t('Basic Profile Fields'),$basic,''), '$advanced' => array('advanced',t('Advanced Profile Fields'),$advanced,t('(In addition to basic fields)')), '$all' => $all, -- cgit v1.2.3