Merge branch 'master' of https://github.com/redmatrix/hubzilla

7 files changed, 22 insertions, 17 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/include/widgets.php b/include/widgets.php
index 96d7b5cd0..ad54cb59e 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1317,7 +1317,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 2e2536af3..6300ac027 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1757,16 +1757,16 @@ 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')),
+		'$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/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
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}}
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 @@
 <div class="generic-content-wrapper">
-<h2>{{$title}}</h2>
+<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-xs pull-right" href="admin/profs/new"><i class="icon-plus-sign">&nbsp;{{$new}}</i></a><h2>{{$title}}</h2>
+<div class="clear"></div>
+</div>
+
+<div class="section-content-tools-wrapper">
+
+<div class="section-content-info-wrapper">{{$all_desc}}
+<br /><br />
+{{$all}}
+</div>
 
 <form action="admin/profs" method="post">
 
@@ -10,22 +19,20 @@
 
 </form>
 
-<div>{{$all_desc}}</div>
 
-<div>{{$all}}</div>
 
+{{if $cust_fields}}
 <br /><br />
-<div>{{$cust_field_desc}}</div>
-
-<button href="admin/profs/new">{{$new}}</button>
+<div><strong>{{$cust_field_desc}}</strong></div>
+<br />
 
-{{if $cust_fields}}
-<table>
+<table width="100%">
 {{foreach $cust_fields as $field}}
-<tr><td>{{$field.field_desc}}</td><td>{{$field.field_name}}</td><td><a href="admin/profs/{{$field.id}}" >{{$edit}}</a> <a href="admin/profs/drop/{{$field.id}}">{{$drop}}</a></td></tr>
+<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-xs" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="icon-trash"></i>&nbsp;{{$drop}}</a> <a class="btn btn-xs" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="icon-pencil"></i></a></td></tr>
 {{/foreach}}
 </table>
 {{/if}}
 
+</div>
 
 </div>