Merge branch 'master' of ssh://franzz@rennes.lutran.fr:2233/home/franzz/projects/databap.git

This commit is contained in:
lutranf
2014-08-29 10:35:24 +02:00
2 changed files with 2 additions and 3 deletions

View File

@@ -18,7 +18,7 @@
<div id="table_main" class="step_box form_success round"> <div id="table_main" class="step_box form_success round">
<p class="step_box_title"><!-- <a href="http://fr.wikipedia.org/wiki/Le_Monde_de_monsieur_Fred" target="_blank"> --><span title="Helmut Perchut">&quot;J'ai explication !&quot;</span><!-- </a> --></p> <p class="step_box_title"><!-- <a href="http://fr.wikipedia.org/wiki/Le_Monde_de_monsieur_Fred" target="_blank"> --><span title="Helmut Perchut">&quot;J'ai explication !&quot;</span><!-- </a> --></p>
<textarea name="keywords" id="keywords" class="edit inc_border round"></textarea> <textarea name="keywords" id="keywords" class="edit inc_border round"></textarea>
<p class="read" id="read_keywords"></p> <p class="read" id="read_formatted_keywords"></p>
</div> </div>
<div id="validation" class="form_success"></div> <div id="validation" class="form_success"></div>
</form> </form>
@@ -117,7 +117,6 @@ Table.prototype.applyTableInfo = function()
Table.prototype.setDisplay = function(sDisplay) Table.prototype.setDisplay = function(sDisplay)
{ {
//debug(sDisplay);
var sOtherDisplay = ''; var sOtherDisplay = '';
var bRedit = (this.sDisplay!=''); //Edit existing table var bRedit = (this.sDisplay!=''); //Edit existing table
this.sDisplay = sDisplay || (this.sDisplay==this.DISPLAY_EDIT?this.DISPLAY_READ:this.DISPLAY_EDIT); this.sDisplay = sDisplay || (this.sDisplay==this.DISPLAY_EDIT?this.DISPLAY_READ:this.DISPLAY_EDIT);

View File

@@ -2388,7 +2388,7 @@ vertical-align 0% -5% -10% -15% -20% -25% -30%
font-style: italic; font-style: italic;
} }
#table #read_keywords { #table #read_formatted_keywords {
margin:10px 0 0 0; margin:10px 0 0 0;
font-size: 0.9em; font-size: 0.9em;
} }