From 676abaf4f9d70cb835430d1d85f047d0efb53c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mueller@miconware.de>
Date: Fri, 17 Oct 2014 19:47:06 +0200
Subject: [PATCH] #100+#101

---
 app/View/Layouts/default.ctp           | 4 ++--
 app/View/User/settings_imageUpload.ctp | 7 ++++---
 app/webroot/js/dreamjob.js             | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 565d2fe..4e60b2d 100755
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -16,7 +16,7 @@
 	<body>
 		<div class="modal fade" id="popup" tabindex="-1" role="dialog">
 			<div class="modal-dialog">
-				<div class="modal-content">
+				<form class="modal-content">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 						<h3 class="modal-title"></h3>
@@ -25,7 +25,7 @@
 					<div class="modal-footer">
 						<button type="button" class="btn btn-primary" data-dismiss="modal"><?=__('dreamjob.close');?></button>
 					</div>
-				</div>
+				</form>
 			</div>
 		</div>
 		<div class="bg content-size" id="logo_bar">
diff --git a/app/View/User/settings_imageUpload.ctp b/app/View/User/settings_imageUpload.ctp
index 68ed80b..a0fba95 100644
--- a/app/View/User/settings_imageUpload.ctp
+++ b/app/View/User/settings_imageUpload.ctp
@@ -3,14 +3,15 @@
   *
   */
 ?>
-<div class="box">
-	<h1><?=__('dreamjob.image.edit');?></h1>
+<div class="box 2modal">
+	<h1 class="modal-title"><?=__('dreamjob.image.edit');?></h1>
 	<?php
 	 $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->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'));?>
 	</div>
 	<?php
diff --git a/app/webroot/js/dreamjob.js b/app/webroot/js/dreamjob.js
index 3e24b0b..b91b6c7 100755
--- a/app/webroot/js/dreamjob.js
+++ b/app/webroot/js/dreamjob.js
@@ -111,7 +111,7 @@ var global_load = null;
 
             $(where + " form.tableForm tbody").each(function(evt) {
                 var that = this;
-                var newRow = $(".new", this).html();
+                var newRow = $(".new", this).clone();
                 $(that).on('change',function(e) {
                     stopLoad(e);
                     $("tr", that).each(function(evt) {
@@ -129,9 +129,11 @@ var global_load = null;
                             $(this).attr("data", "set");
                             $("tr", that).removeClass("new");
                             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});
 				            });
                             evet();
