login fr updates

diff --git a/backoffice/tmpl/skeleton/login.tt b/backoffice/tmpl/skeleton/login.tt
index da3403d..39a2c25 100644 (file)
--- a/backoffice/tmpl/skeleton/login.tt
+++ b/backoffice/tmpl/skeleton/login.tt
@@ -22,8 +22,8 @@
                 </div>
               
               [% IF pagename == 'register' && registration_enabled == '1' %]
-              <h4>Vous n'avez pas un compte?</h4>
-              <h6 class="font-weight-light">Registrez vous encore aujourd'hui! </h6>
+              <h4>Vous n'avez pas encore de compte utilisateur?</h4>
+              <h6 class="font-weight-light">Enregistrez-vous encore aujourd'hui! </h6>
               <form class="pt-3" method="POST" >
                 <div class="form-group">
                   <label>Nom</label>
@@ -69,7 +69,7 @@
                   <button type="submit" name="btnregister" class="btn btn-block btn-primary btn-lg font-weight-medium auth-form-btn">Créer un compte</button>
                 </div>
                 <div class="text-center mt-4 font-weight-light">
-                  vous avez déjà un compte? <a href="[% abspath %]login.html" class="text-primary">se Connecter</a>
+                  vous avez déjà un compte? <a href="[% abspath %]login.html" class="text-primary">Se connecter</a>
                 </div>
                 </form>
               [% ELSIF pagename == 'forgotpassword' %]
@@ -92,14 +92,14 @@
                   <button type="submit" name="btnforgotpassword" class="btn btn-block btn-primary btn-lg font-weight-medium auth-form-btn" >Envoyer</button>
                 </div>
                 <div class="text-center mt-4 font-weight-light">
-                  <a href="[% basepath %]/login.html" class="text-primary">se Connecter</a>
+                  <a href="[% basepath %]/login.html" class="text-primary">Se connecter</a>
                 </div>
                 
               </form>
               [% ELSIF pagename == 'message' %]
               <div class="alert alert-[% messagetype %]">[% message %]</div>  
                 <div class="text-center mt-4 font-weight-light">
-                  <a href="[% basepath %]/login.html" class="text-primary">Se Connecter</a>
+                  <a href="[% basepath %]/login.html" class="text-primary">Se connecter</a>
                 </div>
                 [% IF registration_enabled == '1' %]
                 <div class="text-center mt-4 font-weight-light">
@@ -166,7 +166,7 @@
                   <a href="[% abspath %]forgotpassword.html" class="auth-link text-black">Mot de passe oublié?</a>
                 </div>
                 <div class="my-3">
-                  <button type="submit" name="btnlogin" class="btn btn-block btn-primary btn-lg font-weight-medium auth-form-btn" >se Connecter</button>
+                  <button type="submit" name="btnlogin" class="btn btn-block btn-primary btn-lg font-weight-medium auth-form-btn" >Se connecter</button>
                 </div>
                 [% IF registration_enabled == '1' %]
                 <div class="text-center mt-4 font-weight-light">

diff --git a/dev/lastupload.txt b/dev/lastupload.txt
index 62b016c..07f8857 100644 (file)
--- a/dev/lastupload.txt
+++ b/dev/lastupload.txt
@@ -1 +1 @@
-7c675b0 - 2019-07-09 08:34:29 +0200
+1cbbaf4 - 2019-07-09 09:23:45 +0200

diff --git a/dev/upload.conf b/dev/upload.conf
index cbe158b..b3e91bc 100644 (file)
--- a/dev/upload.conf
+++ b/dev/upload.conf
@@ -1,4 +1,4 @@
-SSHHOST=wwww422.your-server.de
+SSHHOST=www422.your-server.de
 SSHPORT=222
 SSHUSER=dksalu
 SSHREMOTEPATH=public_html/juridig_lu_v3

diff --git a/dev/upload_files.sh b/dev/upload_files.sh
index 3ab7f53..0a0c090 100644 (file)
--- a/dev/upload_files.sh
+++ b/dev/upload_files.sh
@@ -2,7 +2,7 @@
 NUPL="HEAD"
 CALLDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source upload.conf
-
+CDATE=`date +"%F %T"`
 LUPLTAG=`cat ${CALLDIR}/lastupload.txt | awk '{ print $1 }'`
 IFS=$'\n'
 echo ${LUPLTAG}
@@ -31,12 +31,14 @@ then
     if [[ $f != dev/* ]]
     then
       echo "UPLOADING: "$f
-      echo "scp -P ${SSHPORT} ${LOCALPATH}/$f ${SSHUSER}@${SSHHOST}:${SSHREMOTEPATH}/$f"
+      scp -P ${SSHPORT} ${LOCALPATH}/$f ${SSHUSER}@${SSHHOST}:${SSHREMOTEPATH}/$f
     else 
       echo "skipping file: "$f
     fi
   done
   echo `git log --pretty=format:"%h - %ai" | head -n 1` > ${CALLDIR}/lastupload.txt
+  git add -A
+  git commit -m "LIVE Upload ${CDATE}"
 else 
   echo "upload skipped!"
 fi