developer.jelix.org is not used any more and exists only for history. Post new tickets on the Github account.
developer.jelix.org n'est plus utilisée, et existe uniquement pour son historique. Postez les nouveaux tickets sur le compte github.

Ticket #480: patch-480-496.diff

File patch-480-496.diff, 8.5 KB (added by bastnic, 13 years ago)
  • build/manifests/jelix-dev.mn

     
    116116  command.class.php
    117117  utils.lib.php
    118118cd lib/jelix-scripts/templates
     119  main.tpl.tpl
     120  myHtmlResponse.class.php.tpl
    119121  module.xml.tpl
    120122  dao.xml.tpl
    121123  form.xml.tpl
  • build/manifests/jelix-lib.mn

     
    214214  crud_list.tpl
    215215  crud_edit.tpl
    216216  crud_view.tpl
     217  check.tpl
     218cd lib/jelix/core-modules/jelix/zones
     219  check.zone.php
    217220
    218221cd lib/jelix/dao
    219222  jDaoRecordBase.class.php
  • lib/jelix-scripts/commands/createapp.cmd.php

     
    9191       $this->createFile(JELIX_APP_CONFIG_PATH.'dbprofils.ini.php','var/config/dbprofils.ini.php.tpl',$param);
    9292       $this->createFile(JELIX_APP_CONFIG_PATH.'index/config.ini.php','var/config/index/config.ini.php.tpl',$param);
    9393
     94       $this->createFile(JELIX_APP_PATH.'responses/myHtmlResponse.class.php','myHtmlResponse.class.php.tpl',$param);
     95
    9496       $param['rp_temp']= jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_TEMP_PATH, true);
    9597       $param['rp_var'] = jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_VAR_PATH,  true);
    9698       $param['rp_log'] = jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_LOG_PATH,  true);
     
    111113            $cmd = jxs_load_command('createmodule');
    112114            $cmd->init(array(),array('module'=>$GLOBALS['APPNAME']));
    113115            $cmd->run();
     116            $this->createFile(JELIX_APP_PATH.'modules/'.$GLOBALS['APPNAME'].'/templates/main.tpl', 'main.tpl.tpl',$param);
    114117       }
    115118
    116119       if ($this->getOption('-withcmdline')) {
  • lib/jelix-scripts/templates/main.tpl.tpl

     
     1<h1>Bienvenue dans votre nouvelle application Jelix : {$appname}</h1>
     2
     3{{$MAIN}$MAIN}
     4 No newline at end of file
  • lib/jelix-scripts/templates/myHtmlResponse.class.php.tpl

     
     1<?php
     2require_once (JELIX_LIB_RESPONSE_PATH.'jResponseHtml.class.php');
     3
     4class myHtmlResponse extends jResponseHtml {
     5
     6        protected function _commonProcess() {
     7                $this->bodyTpl = '{$appname}~main';
     8                $this->body->assignIfNone('MAIN','<p>no content</p>');
     9               
     10        }
     11}
     12?>
     13 No newline at end of file
  • lib/jelix-scripts/templates/controller.tpl

     
    1414    */
    1515    function {$method}() {
    1616        $rep = $this->getResponse('html');
    17        
     17        $rep->body->assignZone('MAIN', 'jelix~check');
    1818        return $rep;
    1919    }
    2020}
  • lib/jelix-scripts/templates/var/config/defaultconfig.ini.php.tpl

     
    2525;nom = nom_fichier_ini
    2626
    2727[responses]
     28html=myHtmlResponse
    2829
    29 
    3030[error_handling]
    3131messageLogFormat = "%date%\t[%code%]\t%msg%\t%file%\t%line%\n"
    3232logFile = error.log
  • lib/jelix/core-modules/jelix/templates/check.tpl

     
     1{$check}
     2 No newline at end of file
  • lib/jelix/core-modules/jelix/zones/check.zone.php

     
     1<?php
     2
     3include (JELIX_LIB_CORE_PATH.'jInstallChecker.class.php');
     4
     5/**
     6 * an HTML reporter for jInstallChecker
     7 * @package jelix
     8 */
     9class jHtmlInstallChecker implements jIInstallCheckReporter {
     10    public $trace = '';
     11   
     12    function start(){
     13        $this->trace .= '<ul class="checkresults">';
     14    }
     15    function showError($message){
     16        $this->trace .= '<li class="checkerror">'.htmlspecialchars($message).'</li>';
     17    }
     18    function showWarning($message){
     19        $this->trace .= '<li class="checkwarning">'.htmlspecialchars($message).'</li>';
     20
     21    }
     22    function showOk($message){
     23        $this->trace .= '<li class="checkok">'.htmlspecialchars($message).'</li>';
     24
     25    }
     26    function showNotice($message){
     27        $this->trace .= '<li class="checknotice">'.htmlspecialchars($message).'</li>';
     28
     29    }
     30    function end($checker){
     31        $this->trace .= '</ul>';
     32        $this->trace .= '<div class="results">';
     33        if($checker->nbError){
     34            $this->trace .= ' '.$checker->nbError. $checker->messages->get( ($checker->nbError > 1?'number.errors':'number.error'));
     35        }
     36        if($checker->nbWarning){
     37            $this->trace .= ' '.$checker->nbWarning. $checker->messages->get(($checker->nbWarning > 1?'number.warnings':'number.warning'));
     38        }
     39        if($checker->nbNotice){
     40            $this->trace .= ' '.$checker->nbNotice. $checker->messages->get(($checker->nbNotice > 1?'number.notices':'number.notice'));
     41        }
     42
     43        if($checker->nbError){
     44           $this->trace .= '<p>'.$checker->messages->get(($checker->nbError > 1?'conclusion.errors':'conclusion.error')).'</p>';
     45        }else  if($checker->nbWarning){
     46            $this->trace .= '<p>'.$checker->messages->get(($checker->nbWarning > 1?'conclusion.warnings':'conclusion.warning')).'</p>';
     47        }else  if($checker->nbNotice){
     48            $this->trace .= '<p>'.$checker->messages->get(($checker->nbNotice > 1?'conclusion.notices':'conclusion.notice')).'</p>';
     49        }else{
     50            $this->trace .= '<p>'.$checker->messages->get('conclusion.ok').'</p>';
     51        }
     52    }
     53}
     54
     55class jInstallCheckReturn extends jInstallCheck {
     56    function run(){
     57        parent::run();
     58        return $this->reporter->trace;
     59    }   
     60}
     61
     62class checkZone extends jZone {
     63 
     64        protected $_tplname='check';
     65 
     66        protected function _prepareTpl() {
     67        $check = new jInstallCheckReturn(new jHtmlInstallChecker);
     68        $this->_tpl->assign('check',$check->run());
     69       
     70        $GLOBALS['gJCoord']->response->addCSSLink('/jelix-www/design/jelix.css');
     71   }
     72}
     73 No newline at end of file
  • lib/jelix/controllers/jControllerDaoCrud.class.php

     
    190190    protected function _index($resp, $tpl) {
    191191
    192192    }
     193   
     194    /**
     195     * overload this method if you wan to do additionnal conditions to the index's select
     196     * during the index action.
     197     * @param jDaoFactoryBase $dao the dao
     198     * @param jDaoConditions $cond the conditions
     199     */   
     200        protected function _indexSetConditions($cond) {
     201        foreach ($this->propertiesForRecordsOrder as $p=>$order) {
     202             $cond->addItemOrder($p, $order);
     203         }
     204        }
    193205
    194206    /**
    195207     * overload this method if you wan to do additionnal conditions to the index's select
  • lib/jelix-www/design/jelix.css

     
    22    font-family: Arial, Helvetica, sans-serif;
    33    font-size: 0.7em;
    44}
     5
     6
     7ul.checkresults {
     8    border:3px solid black;
     9    margin: 2em;
     10    padding:1em;
     11    list-style-type:none;
     12}
     13ul.checkresults li { margin:0; padding:5px; border-top:1px solid black; }
     14li.checkerror   { background-color:#ff6666;}
     15li.checkok      { background-color:#a4ffa9;}
     16li.checkwarning { background-color:#ffbc8f;}
     17 No newline at end of file