diff --git a/app/Locale/default.pot b/app/Locale/default.pot
index 444cb45..01dfdc9 100644
--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
@@ -1137,6 +1137,9 @@ msgstr ""
msgid "dreamjob.my.profil"
msgstr ""
+msgid "dreamjob.applicated.to"
+msgstr ""
+
diff --git a/app/View/Elements/user_worker_item.ctp b/app/View/Elements/user_worker_item.ctp
index aef9c6a..701cff6 100644
--- a/app/View/Elements/user_worker_item.ctp
+++ b/app/View/Elements/user_worker_item.ctp
@@ -62,7 +62,7 @@
$newcount++;
if($newcount>0)
$statusApp = $newcount."/".$statusApp;
- $statusApp =__('dreamjob.applicated').' '.$statusApp.'';
+ $statusApp =__('dreamjob.applicated.to').' '.$statusApp.'';
$archiv['filter'] = 'archiv';
}else{
$statusApp = __('dreamjob.application');
diff --git a/app/webroot/css/dreamjob.css b/app/webroot/css/dreamjob.css
index 8f2eaa0..021f766 100755
--- a/app/webroot/css/dreamjob.css
+++ b/app/webroot/css/dreamjob.css
@@ -462,7 +462,7 @@ body.loading #container{
display:inline-block;
width:90%;
}
-.cv .date > select {
+.cv .date > select,.cv .date > .select2-container {
width:30%;
display:inline-block;
}
diff --git a/app/webroot/js/dreamjob.js b/app/webroot/js/dreamjob.js
index ea1e653..bda9386 100755
--- a/app/webroot/js/dreamjob.js
+++ b/app/webroot/js/dreamjob.js
@@ -47,7 +47,7 @@
$(where+' .dropdown-toggle').dropdown();
$(where+" a").tooltip();;
$(where+" a").each(function(that){
- if($(this).attr("rel")!=="external" && $(this).attr("ref")!=="eventOff" && !$(this).parents('ul').hasClass("wysihtml5-toolbar") && !$(this).hasClass(".select2-choice"))
+ if($(this).attr("rel")!=="external" && $(this).attr("ref")!=="eventOff" && !$(this).parents('ul').hasClass("wysihtml5-toolbar") && !$(this).hasClass(".select2-choice") && !$(this).parents('form').hasClass('tableForm'))
$(this).click(function(e){
load($(this).attr('href'),{},($(this).attr('rel')=="tab"));
return false;
@@ -117,7 +117,7 @@
});
if(tosave)
//console.log("sendTosave");
- saveForm();
+ saveForm(that);
});
//ZUOFT WIRD GESPEICHERT
@@ -126,25 +126,30 @@
var that2 = this;
$(".btn-del",this).unbind("click").click(function(evt){
$(that2).remove();
- saveForm();
+ saveForm(that);
});
});
}
evet();
- function saveForm(){
+ });
+
+ function saveForm(here,back){
i = 0;
- $(":input[ name *= '_wysihtml5_mod' ]",$(that).parents('form')).remove();
- $("tbody tr.new",$(that).parents('form')).remove();
- $("tbody tr",$(that).parents('form')).each(function(){
- $(":input",this).each(function(){
+ $(":input[ name *= '_wysihtml5_mod' ]",$(here).parents('form')).remove();
+ //$(":input[ class *= 'select2-focusser' ]",$(here).parents('form')).remove();
+ $("tbody tr.new",$(here).parents('form')).remove();
+ $("tbody tr",$(here).parents('form')).each(function(){
+ $(":input[name]",this).each(function(){
str = $(this).attr("name").replace(/data\[(.*?)\]\[.*?\]\[(.+)\]/g,'data[$1]['+i+'][$2]');
$(this).attr("name",str);
});
i++;
});
- load($(that).parents("form").attr("action"),{data:$(that).parents("form").serialize(), type:'POST'},false);
+ load($(here).parents("form").attr("action"),{back:back,data:$(here).parents("form").serialize(), type:'POST'},false);
}
- });
+
+
+ $($(where+" form.tableForm .label.edit").parents('form.tableForm a')).click(function(){saveForm('form.tableForm tbody',$(this).attr('href'));return false;});
//$(where+" form label.has-error").parent(".form-group").addClass("has-error")
}
function setContent(data,back,tab,backignore){