Changeset 525
- Timestamp:
- 08/07/07 23:15:21 (1 year ago)
- Files:
-
- trunk/build/manifests/jelix-lib.mn (modified) (1 diff)
- trunk/build/manifests/jelix-lib.mn (modified) (1 diff)
- trunk/lib/jelix-www/design/jform.css (added)
- trunk/lib/jelix-www/design/jform.css (added)
- trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (1 diff)
- trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (1 diff)
- trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (2 diffs)
- trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/manifests/jelix-lib.mn
r519 r525 352 352 jelix.css 353 353 tooltip.css 354 jform.css 354 355 cd lib/jelix-www/js 355 356 tooltip.js trunk/build/manifests/jelix-lib.mn
r519 r525 352 352 jelix.css 353 353 tooltip.css 354 jform.css 354 355 cd lib/jelix-www/js 355 356 tooltip.js trunk/lib/jelix/forms/jFormsBuilderBase.class.php
r523 r525 102 102 103 103 public function outputControlLabel($ctrl){ 104 $required = ($ctrl->required == ''?'':' jforms-required'); 104 105 if($ctrl->type == 'output' || $ctrl->type == 'checkboxes' || $ctrl->type == 'radiobuttons'){ 105 106 $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"'); 106 echo '<span class="jforms-label "',$hint,'>',htmlspecialchars($ctrl->label),'</span>';107 echo '<span class="jforms-label',$required,'"',$hint,'>',htmlspecialchars($ctrl->label),'</span>'; 107 108 }else if($ctrl->type != 'submit'){ 108 109 $id = $this->_name.'_'.$ctrl->ref; 109 echo '<label class="jforms-label " for="'.$id.'">'.htmlspecialchars($ctrl->label).'</label>';110 echo '<label class="jforms-label',$required,'" for="'.$id.'">'.htmlspecialchars($ctrl->label).'</label>'; 110 111 } 111 112 } trunk/lib/jelix/forms/jFormsBuilderBase.class.php
r523 r525 102 102 103 103 public function outputControlLabel($ctrl){ 104 $required = ($ctrl->required == ''?'':' jforms-required'); 104 105 if($ctrl->type == 'output' || $ctrl->type == 'checkboxes' || $ctrl->type == 'radiobuttons'){ 105 106 $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"'); 106 echo '<span class="jforms-label "',$hint,'>',htmlspecialchars($ctrl->label),'</span>';107 echo '<span class="jforms-label',$required,'"',$hint,'>',htmlspecialchars($ctrl->label),'</span>'; 107 108 }else if($ctrl->type != 'submit'){ 108 109 $id = $this->_name.'_'.$ctrl->ref; 109 echo '<label class="jforms-label " for="'.$id.'">'.htmlspecialchars($ctrl->label).'</label>';110 echo '<label class="jforms-label',$required,'" for="'.$id.'">'.htmlspecialchars($ctrl->label).'</label>'; 110 111 } 111 112 } trunk/lib/jelix/plugins/tpl/html/block.form.php
r522 r525 49 49 $helpdecorator = $param[4]; 50 50 else 51 $helpdecorator = "'jForms ErrorDecoratorAlert'";51 $helpdecorator = "'jFormsHelpDecoratorAlert'"; 52 52 53 53 $content = ' $t->_privateVars[\'__form\'] = '.$param[0].'; … … 56 56 if($GLOBALS[\'gJCoord\']->response!= null){ 57 57 $GLOBALS[\'gJCoord\']->response->addJSLink($GLOBALS[\'gJConfig\']->urlengine[\'basePath\'].\'jelix/js/jforms.js\'); 58 $GLOBALS[\'gJCoord\']->response->addCSSLink($GLOBALS[\'gJConfig\']->urlengine[\'basePath\'].\'jelix/design/jforms.css\'); 58 59 } 59 60 '; trunk/lib/jelix/plugins/tpl/html/block.form.php
r522 r525 49 49 $helpdecorator = $param[4]; 50 50 else 51 $helpdecorator = "'jForms ErrorDecoratorAlert'";51 $helpdecorator = "'jFormsHelpDecoratorAlert'"; 52 52 53 53 $content = ' $t->_privateVars[\'__form\'] = '.$param[0].'; … … 56 56 if($GLOBALS[\'gJCoord\']->response!= null){ 57 57 $GLOBALS[\'gJCoord\']->response->addJSLink($GLOBALS[\'gJConfig\']->urlengine[\'basePath\'].\'jelix/js/jforms.js\'); 58 $GLOBALS[\'gJCoord\']->response->addCSSLink($GLOBALS[\'gJConfig\']->urlengine[\'basePath\'].\'jelix/design/jforms.css\'); 58 59 } 59 60 ';
