Ticket #496: patch-496-3.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

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 class="apptitle">{@jelix~jelix.newapp.h1@} : {$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/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/core-modules/jelix/locales/en_EN/jelix.UTF-8.properties

@@ -1 +1 @@
-framework.name=Jelix
-framework.slogan=Jelix, a framework for PHP
+newapp.h1=Welcome in your new jelix application

lib/jelix/core-modules/jelix/locales/en_US/jelix.UTF-8.properties

@@ -1 +1 @@
-framework.name=Jelix
-framework.slogan=Jelix, a framework for PHP
+newapp.h1=Welcome in your new jelix application

lib/jelix/core-modules/jelix/locales/fr_FR/jelix.UTF-8.properties

@@ -1 +1 @@
-framework.name=Jelix
-framework.slogan=Jelix, framework pour PHP
-
+