Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

syncing up

  • Loading branch information...
commit a198057b5477ee860946474b245f3086ee0d9c44 1 parent 2ca863f
Thomas Gillis authored
View
2  config/registration.php
@@ -4,7 +4,7 @@
'default'=>array(),
);
$config['layout'] = 'LayoutLogin';
-$config['layoutActions'] = array('index');
+$config['layoutActions'] = array('index', 'create', 'confirmed');
$config['resources']['css'] = array(
View
2  config/usermanagement.php
@@ -13,7 +13,7 @@
'modules/lattice/resources/js/LatticeCore.js',
'modules/lattice/resources/js/LatticeUI.js',
'modules/lattice/resources/js/LatticeModules.js',
- 'modules/usermanagement/resources/usermanagement.js',
+ 'modules/lattice/resources/usermanagement.js',
);
$config['layout'] = 'LayoutAdmin';
View
28 messages/validation/registration.php
@@ -0,0 +1,28 @@
+<?
+
+$errors = array(
+ 'password' => array(
+ 'not_empty' => 'Password cannot be empty',
+ 'min_length' => 'Password must be at least 8 characters long',
+ 'matches' => 'Password must match confirm password',
+ ),
+ 'username' => array(
+ 'not_empty' => 'Username cannot be empty',
+ 'min_length' => 'Username must be at least 4 characters long',
+ ),
+ 'email' => array(
+ 'not_empty' => 'Email must not be empty',
+ 'min_length' => 'Email must be at least 4 characters long',
+ 'email' => 'Email must be a valid email',
+ ),
+ 'firstName' => array(
+ 'not_empty' => 'First name cannot be empty',
+ 'min_length' => 'First name must be at least 4 characters long',
+ ),
+ 'lastName' => array(
+ 'not_empty' => 'Last name cannot be empty',
+ 'min_length' => 'Last name must be at least 4 characters long',
+ ),
+);
+
+return $errors;
View
12 messages/validation/user.php
@@ -1,12 +1,12 @@
<?
$errors = array(
- 'email' => array(
- 'email_available' => 'That email is not available.',
- ),
- 'username' => array(
- 'username_available' => 'That username is not available.',
- ),
+ 'email' => array(
+ 'email_available' => 'That email is not available.',
+ ),
+ 'username' => array(
+ 'username_available' => 'That username is not available.',
+ ),
);
return $errors;
View
4 views/navigationNode.php
@@ -1,6 +1,10 @@
<? $keys = array_keys($content);?>
<li title="<?=$content['title']; ?>" class="node <?=$content['nodeType'];?> <?=$content['contentType'];?> clearFix" id="node_<?=$content['id'];?>">
+<<<<<<< HEAD
<h5><?=$content['pageLength']?><? echo strlen($content['title']) > 23 ? substr($content['title'], 0, 23).'...' : $content['title']; ?></h5>
+=======
+ <h5><? echo strlen($content['title']) > 23 ? substr($content['title'], 0, 23).'...' : $content['title']; ?></h5>
+>>>>>>> 51399beea4565d4fb77b851918ff7592afe00101
<div class="methods">
<?if(isset($content['allowTogglePublish']) && $content['allowTogglePublish']=='true' ):?>
<a class="icon togglePublishedStatus <?echo $content[$keys[2]]?'published':'';?> " href="#" title="unpublish <?=$content['title'];?>">publish</a>
View
4 views/ui/clusters_wrapper.php
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
<div data-objectid="<?=$objectId;?>" class="module clearfix cluster classPath-lattice_modules_Cluster <?=(isset($objectTypeName))? $objectTypeName:null;?>">
+=======
+<div data-objectid="<?=$objectId;?>" class="module clearfix cluster classPath-lattice_modules_Cluster <?=$objectTypeName;?>">
+>>>>>>> 51399beea4565d4fb77b851918ff7592afe00101
<label><?=$label;?></label>
<div class="wrapper">
<?=$html;?>
Please sign in to comment.
Something went wrong with that request. Please try again.