miconware
/
dreamjob
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#100+#101

This commit is contained in:
Martin Müller 2014-10-17 19:47:06 +02:00
parent 23eb9c630c
commit 676abaf4f9
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/View/Layouts/default.ctp
View File

@ -16,7 +16,7 @@
<body> <body>
<div class="modal fade" id="popup" tabindex="-1" role="dialog"> <div class="modal fade" id="popup" tabindex="-1" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <form class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 class="modal-title"></h3> <h3 class="modal-title"></h3>
@ -25,7 +25,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal"><?=__('dreamjob.close');?></button> <button type="button" class="btn btn-primary" data-dismiss="modal"><?=__('dreamjob.close');?></button>
</div> </div>
</div> </form>
</div> </div>
</div> </div>
<div class="bg content-size" id="logo_bar"> <div class="bg content-size" id="logo_bar">

7
app/View/User/settings_imageUpload.ctp
View File

@ -3,14 +3,15 @@
* *
*/ */
?> ?>
<div class="box"> <div class="box 2modal">
<h1><?=__('dreamjob.image.edit');?></h1> <h1 class="modal-title"><?=__('dreamjob.image.edit');?></h1>
<?php <?php
$default_Form['type']='file'; $default_Form['type']='file';
$default_Form['class']= (isset( $default_Form['class']))?$default_Form['class']:''.' modal-body';
echo $this->Form->create('AppUser',$default_Form); echo $this->Form->create('AppUser',$default_Form);
echo $this->Form->input('AppUser.avatar',array('type'=>'file','label'=>array('text'=>__("dreamjob.avatar"),"class"=>$default_Form['inputDefaults']['label']['class']))); echo $this->Form->input('AppUser.avatar',array('type'=>'file','label'=>array('text'=>__("dreamjob.avatar"),"class"=>$default_Form['inputDefaults']['label']['class'])));
?> ?>
<div class="buttonrow"> <div class="modal-footer">
<?=$this->Form->button('<span class="glyphicon glyphicon-floppy-disk"></span> '.__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> <?=$this->Form->button('<span class="glyphicon glyphicon-floppy-disk"></span> '.__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
</div> </div>
<?php <?php

8
app/webroot/js/dreamjob.js
View File

@ -111,7 +111,7 @@ var global_load = null;
$(where + " form.tableForm tbody").each(function(evt) { $(where + " form.tableForm tbody").each(function(evt) {
var that = this; var that = this;
var newRow = $(".new", this).html(); var newRow = $(".new", this).clone();
$(that).on('change',function(e) { $(that).on('change',function(e) {
stopLoad(e); stopLoad(e);
$("tr", that).each(function(evt) { $("tr", that).each(function(evt) {
@ -129,9 +129,11 @@ var global_load = null;
$(this).attr("data", "set"); $(this).attr("data", "set");
$("tr", that).removeClass("new"); $("tr", that).removeClass("new");
console.log(newRow); console.log(newRow);
$(that).append("<tr class=\"new\">" + newRow + "</tr>"); newRow.find(".select2-container").remove();
console.log(newRow);
$(that).append("<tr class=\"new\">" + newRow.html() + "</tr>");
$("form.tableForm tbody tr.new select").each(function() { $("form.tableForm tbody tr.new select").each(function(){
$(this).select2({allowClear: true}); $(this).select2({allowClear: true});
}); });
evet(); evet();