scores/odea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 1.2

Browse Source
This commit is contained in:
Michael RICOIS 2012-07-31 07:32:46 +00:00
commit 8e813e7918
2 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
application/views/default/helpers/Field.php
View File

@ -37,12 +37,12 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
case 'tree':
$href = $this->view->url(array('controller' => 'arborescence', 'action' => $options['action'], 'key' => $name));
$html.= '<a class="arborescence" title="'.$options['title'].'" href="'.$href.'">';
$html.= '<img src="/themes/default/images/arborescence.gif" />';
$html.= 'Arborescence';
$html.= '</a>';
break;
case 'text':
$html.= '<a class="text" href="#" id="'.$name.'" >';
$html.= '<img style="cursor:pointer" src="/themes/default/images/Textarea.gif" title="'.$options['title'].'"/>';
$html.= '<a class="text" title="'.$options['title'].'" href="#" id="'.$name.'" >';
$html.= 'Recherche';
$html.= '</a>';
break;
}
@ -92,53 +92,11 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
$title
);
break;
case 'intervalDate':
$html.= $this->structureHTML(
$label,
$this->intervalDateHTML($name, $options),
$title
);
break;
case 'interval':
$html.= $this->structureHTML(
$label,
$this->intervalHTML($name, $field),
$title
);
break;
case 'date':
$html.= $this->structureHTML(
$field['label'],
$this->dateHTML($name, $field));
break;
case 'text':
$html.= $this->structureHTML(
$label,
$this->textHTML($name, $options),
$title
);
break;
case 'textarea':
$html.= $this->structureHTML(
$field['label'],
$this->textareaHTML($name, $field)
);
break;
case 'radio':
$html.= $this->structureHTML(
$field['label'],
$this->radioHTML($name, $field));
break;
case 'file':
$html.= $this->structureHTML(
$field['label'],
$this->fileuploadHtml($name, $field));
break;
case 'tree':
//Do nothing
break;
default:
$html.= $this->structureHTML($label, '');
$html.= $this->structureHTML($name, '');
break;
}

4
batch/setMinMax.php
View File

@ -86,9 +86,9 @@ $keys = array(
'bilYP',
);
$sql = 'TRUNCATE TABLE minmax';
$sql = 'TRUNCATE TABLE fields_minmax';
if ( !$db->query($sql) ) {
die ('Impossible de vider la table minmax');
die ('Impossible de vider la table fields_minmax');
}
foreach($keys as $key) {