Ticket #480: patch-480-496-2.diff

build/manifests/jelix-dev.mn

@@ -116 +116 @@
-  command.class.php
-  utils.lib.php
-cd lib/jelix-scripts/templates
+  main.tpl.tpl
+  myHtmlResponse.class.php.tpl
-  module.xml.tpl
-  dao.xml.tpl
-  form.xml.tpl

build/manifests/jelix-lib.mn

@@ -214 +214 @@
-  crud_list.tpl
-  crud_edit.tpl
-  crud_view.tpl
+  check_install.tpl
+cd lib/jelix/core-modules/jelix/zones
+  check_install.zone.php
-
-cd lib/jelix/dao
-  jDaoRecordBase.class.php
@@ -470 +473 @@
-  jelix.css
-  tooltip.css
-  jform.css
+cd lib/jelix-www/design/images
+  logo_jelix_moyen.png
-cd lib/jelix-www/js
-  tooltip.js
-  jforms.js

lib/jelix-scripts/commands/createapp.cmd.php

@@ -91 +91 @@
-       $this->createFile(JELIX_APP_CONFIG_PATH.'dbprofils.ini.php','var/config/dbprofils.ini.php.tpl',$param);
-       $this->createFile(JELIX_APP_CONFIG_PATH.'index/config.ini.php','var/config/index/config.ini.php.tpl',$param);
-
+       $this->createFile(JELIX_APP_PATH.'responses/myHtmlResponse.class.php','myHtmlResponse.class.php.tpl',$param);
+
-       $param['rp_temp']= jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_TEMP_PATH, true);
-       $param['rp_var'] = jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_VAR_PATH,  true);
-       $param['rp_log'] = jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_LOG_PATH,  true);
@@ -111 +113 @@
-            $cmd = jxs_load_command('createmodule');
-            $cmd->init(array(),array('module'=>$GLOBALS['APPNAME']));
-            $cmd->run();
+            $this->createFile(JELIX_APP_PATH.'modules/'.$GLOBALS['APPNAME'].'/templates/main.tpl', 'main.tpl.tpl',$param);
-       }
-
-       if ($this->getOption('-withcmdline')) {

lib/jelix-scripts/templates/main.tpl.tpl

@@ +1 @@
+<h1>Bienvenue dans votre nouvelle application Jelix : {$appname}</h1>
+
+{{$MAIN}$MAIN}

lib/jelix-scripts/templates/myHtmlResponse.class.php.tpl

@@ +1 @@
+<?php 
+require_once (JELIX_LIB_RESPONSE_PATH.'jResponseHtml.class.php');
+
+class myHtmlResponse extends jResponseHtml {
+
+        protected function _commonProcess() {
+                $this->bodyTpl = '{$appname}~main';
+                $this->body->assignIfNone('MAIN','<p>no content</p>');
+                
+        }
+}
+?>

lib/jelix-scripts/templates/controller.tpl

@@ -14 +14 @@
-    */
-    function {$method}() {
-        $rep = $this->getResponse('html');
-
+
+
+
+
+
-        return $rep;
-    }
-}

lib/jelix-scripts/templates/var/config/defaultconfig.ini.php.tpl

@@ -1 +1 @@
-;<?php die(''); ?>
-;for security reasons , don't remove or modify the first line
+;this file doesn't list all possible properties. See lib/jelix/core/defaultconfig.ini.php for that
-
-locale = "fr_FR"
-charset = "UTF-8"
@@ -25 +26 @@
-;nom = nom_fichier_ini
-
-[responses]
+html=myHtmlResponse
-
-
-[error_handling]
-messageLogFormat = "%date%\t[%code%]\t%msg%\t%file%\t%line%\n"
-logFile = error.log

lib/jelix/checker.php

@@ -62 +62 @@
-        }else{
-            echo '<p>',$checker->messages->get('conclusion.ok'),'</p>';
-        }
+        echo "</p>";
-    }
-}
-$check = new jInstallCheck(new jHtmlInstallChecker);

lib/jelix/core-modules/jelix/templates/check_install.tpl

@@ +1 @@
+{meta_html css $j_jelixwww.'design/jelix.css'}
+
+<div class="logo"></div>
+
+<div class="nocss">
+        <p>If you see that message that's you should create the "jelix" alias to lib/jelix-www, in your web server configuration. See <a href="http://jelix.org/articles/manuel/installation/application#configuration-du-serveur">Installation documentation</a>.</p>
+</div>
+
+{$check}
+
+<h2>This is a temporary page</h2>
+<p>
+
+<h2>Some links</h2>
+<ul>
+        <li><a href="http://www.jelix.org" title="official Jelix's site">Official Jelix's site</li>
+        <li><a href="http://jelix.org/articles/manuel" title="Jelix's documenation">Jelix's documenation</li>
+        <li><a href="http://www.jelix.org" title="official jelix's site">Official Jelix's site</li>
+</ul>

lib/jelix/core-modules/jelix/zones/check_install.zone.php

@@ +1 @@
+<?php
+
+include (JELIX_LIB_CORE_PATH.'jInstallChecker.class.php');
+
+/**
+ * an HTML reporter for jInstallChecker
+ * @package jelix
+ */
+class checkZoneInstallReporter implements jIInstallCheckReporter {
+    public $trace = '';
+    
+    function start(){
+        $this->trace .= '<ul class="checkresults">';
+    }
+    function showError($message){
+        $this->trace .= '<li class="checkerror">'.htmlspecialchars($message).'</li>';
+    }
+    function showWarning($message){
+        $this->trace .= '<li class="checkwarning">'.htmlspecialchars($message).'</li>';
+
+    }
+    function showOk($message){
+        // $this->trace .= '<li class="checkok">'.htmlspecialchars($message).'</li>';
+
+    }
+    function showNotice($message){
+        $this->trace .= '<li class="checknotice">'.htmlspecialchars($message).'</li>';
+
+    }
+    function end($checker){
+        $this->trace .= '</ul>';
+        $this->trace .= '<div class="results">';
+        if($checker->nbError){
+            $this->trace .= ' '.$checker->nbError. $checker->messages->get( ($checker->nbError > 1?'number.errors':'number.error'));
+        }
+        if($checker->nbWarning){
+            $this->trace .= ' '.$checker->nbWarning. $checker->messages->get(($checker->nbWarning > 1?'number.warnings':'number.warning'));
+        }
+        if($checker->nbNotice){
+            $this->trace .= ' '.$checker->nbNotice. $checker->messages->get(($checker->nbNotice > 1?'number.notices':'number.notice'));
+        }
+
+        if($checker->nbError){
+           $this->trace .= '<p>'.$checker->messages->get(($checker->nbError > 1?'conclusion.errors':'conclusion.error')).'</p>';
+        }else  if($checker->nbWarning){
+            $this->trace .= '<p>'.$checker->messages->get(($checker->nbWarning > 1?'conclusion.warnings':'conclusion.warning')).'</p>';
+        }else  if($checker->nbNotice){
+            $this->trace .= '<p>'.$checker->messages->get(($checker->nbNotice > 1?'conclusion.notices':'conclusion.notice')).'</p>';
+        }else{
+            $this->trace .= '<p>'.$checker->messages->get('conclusion.ok').'</p>';
+        }
+        $this->trace .= "</div>";
+    }
+}
+
+
+class check_installZone extends jZone {
+ 
+        protected $_tplname='check_install';
+ 
+        protected function _prepareTpl() {
+            $reporter = new checkZoneInstallReporter();
+        $check = new jInstallCheck($reporter);
+        $check->run();
+        $this->_tpl->assign('check',$reporter->trace);
+   }
+}

lib/jelix-www/design/jelix.css

@@ -1 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
+
+.logo {
+    background: transparent url('images/logo_jelix_moyen.png') top left;
+    height: 60px;
+    width: 180px;
+    position: absolute;
+    top: 10px;
+    left: 10px;
+}
+
+a { color:#3f6f7a; text-decoration:underline; }
+a:visited {  color : #002830;}
+a:hover { color: #0f82af; background-color: #d7e7eb; }
+
+
+h1.apptitle {
+    margin: 32px 0 60px 200px;
+    font-size: 1.7em;
+    color: #002830;
+}
+
+/*
+ * checker
+ *********/
+ul.checkresults {
+    border:3px solid black;
+    margin: 2em;
+    padding:1em;
+    list-style-type:none;
+}
+ul.checkresults li { margin:0; padding:5px; border-top:1px solid black; }
+li.checkerror   { background-color:#ff6666;}
+li.checkok      { background-color:#a4ffa9;}
+li.checkwarning { background-color:#ffbc8f;}
+
+.nocss {
+    display: none;
+}