diff --git a/module/admin/css/index.css b/module/admin/css/index.css index 4ce607eff0..f97abd54a0 100644 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -1,10 +1,10 @@ .cards {margin: 5% auto;} .cards > .col-sm-6 {width: 25%; padding: 0 10px} -.card {height: 250px; position: relative; padding-top: 50px; border-radius: 6px; margin: 0} +.card {height: 250px; position: relative; padding-top: 50px; border-radius: 0; margin: 0} .card > .media {position: absolute; left: 0; top: 0; width: 100%; background: #f1f1f1; height:50px; bottom: 0; overflow: hidden; z-index: 90; transition: all 0.4s;} .card > .media > .icon {position: absolute; display: block; font-size: 56px; color: #ddd; z-index: 99; bottom: -10px; right: -6px; transition: all 0.4s;} .card > .media > h5 {position: absolute; display: block; color: #666; z-index: 100; font-size: 14px; left: 15px; top: 10px; transition: all 0.4s;} -.card:hover > .media {background: #e5e5e5} +.card:hover > .media {background: #F8FAFE} .card:hover > .media > .icon {color: #ccc} .card .card-content {padding: 20px} .card-content > ul {padding-left: 20px;} diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index 03820e9c84..ef23a0d04a 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -55,7 +55,7 @@ user->password;?> - safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?> + safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?> @@ -105,7 +105,7 @@ user->verifyPassword;?>
- user->placeholder->verify}'");?> + user->placeholder->verify}'");?> diff --git a/module/story/control.php b/module/story/control.php index 9ba484aeae..17a3684026 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -266,6 +266,7 @@ class story extends control $this->view->spec = $spec; $this->view->branch = $branch; $this->view->branches = $this->loadModel('branch')->getPairs($productID); + $this->view->needReview = ($this->app->user->account == $product->PO || $this->config->story->needReview == 0) ? 0 : 1; $this->display(); } @@ -467,7 +468,7 @@ class story extends control $this->view->title = $this->lang->story->change . "STORY" . $this->lang->colon . $this->view->story->title; $this->view->users = $this->user->getPairs('nodeleted|pofirst', $this->view->story->assignedTo); $this->view->position[] = $this->lang->story->change; - $this->view->needReview = $this->config->story->needReview == 0 ? "checked='checked'" : ""; + $this->view->needReview = ($this->app->user->account == $this->view->product->PO || $this->config->story->needReview == 0) ? "checked='checked'" : ""; $this->display(); } diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index fd853c7bf3..5defcff287 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -55,7 +55,7 @@ story->reviewList, 0, "class='form-control'"); + echo html::select("needReview[$i]", $lang->story->reviewList, $needReview, "class='form-control'"); echo html::hidden("uploadImage[$i]", $fileName); ?> diff --git a/module/user/model.php b/module/user/model.php index 3ddbcdeb39..496404cfd6 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -328,6 +328,7 @@ class userModel extends model $userID = $oldUser->id; $user = fixer::input('post') ->setDefault('join', '0000-00-00') + ->setDefault('password', '') ->setIF($this->post->password1 != false, 'password', md5($this->post->password1)) ->remove('password1, password2, groups,verifyPassword') ->get(); diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index ea5dad5f05..aa8d415e82 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -61,7 +61,7 @@ user->verifyPassword?>
- user->placeholder->verify}'");?> + user->placeholder->verify}'");?> diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index 0034322243..f54c2f44a3 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -57,7 +57,7 @@ user->verifyPassword?>
- user->placeholder->verify}'");?> + user->placeholder->verify}'");?> diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 13be4d2a03..144eb8937f 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -79,7 +79,7 @@ user->verifyPassword;?>
- user->placeholder->verify}'");?> + user->placeholder->verify}'");?> diff --git a/module/user/view/delete.html.php b/module/user/view/delete.html.php index 48e8d6bbd6..3aa3b6e929 100644 --- a/module/user/view/delete.html.php +++ b/module/user/view/delete.html.php @@ -24,7 +24,7 @@
- user->placeholder->verify}'");?> + user->placeholder->verify}'");?> delete);?> diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index a4ad949de0..b6356feb4c 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -56,7 +56,7 @@ user->password;?> - safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?> + safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?> @@ -105,7 +105,7 @@ user->verifyPassword;?>
- user->placeholder->verify}'");?> + user->placeholder->verify}'");?> diff --git a/www/js/jquery/placeholder/min.js b/www/js/jquery/placeholder/min.js index ea653e62cc..d3c7f7d037 100644 --- a/www/js/jquery/placeholder/min.js +++ b/www/js/jquery/placeholder/min.js @@ -1,3 +1,3 @@ /*! http://mths.be/placeholder v2.0.7 by @mathias */ ;(function(h,j,e){var a="placeholder" in j.createElement("input");var f="placeholder" in j.createElement("textarea");var k=e.fn;var d=e.valHooks;var b=e.propHooks;var m;var l;if(a&&f){l=k.placeholder=function(){return this};l.input=l.textarea=true}else{l=k.placeholder=function(){var o=this;o.filter((a?"textarea":":input")+"[placeholder]").not(".placeholder").bind({"focus.placeholder":c,"blur.placeholder":g}).data("placeholder-enabled",true).trigger("blur.placeholder");return o};l.input=a;l.textarea=f;m={get:function(p){var o=e(p);var q=o.data("placeholder-password");if(q){return q[0].value}return o.data("placeholder-enabled")&&o.hasClass("placeholder")?"":p.value},set:function(p,r){var o=e(p);var q=o.data("placeholder-password");if(q){return q[0].value=r}if(!o.data("placeholder-enabled")){return p.value=r}if(r==""){p.value=r;if(p!=n()){g.call(p)}}else{if(o.hasClass("placeholder")){c.call(p,true,r)||(p.value=r)}else{p.value=r}}return o}};if(!a){d.input=m;b.value=m}if(!f){d.textarea=m;b.value=m}e(function(){e(j).delegate("form","submit.placeholder clearplaceholder",function(){var o=e(".placeholder",this).each(c);setTimeout(function(){o.each(g)},100)})});e(h).bind("beforeunload.placeholder",function(){e(".placeholder").each(function(){this.value=""})})}function i(p){var o={};var q=/^jQuery\d+$/;e.each(p.attributes,function(s,r){if(r.specified&&!q.test(r.name)){o[r.name]=r.value}});return o}function c(p,q){var o=this;var r=e(o);if(o.value==r.attr("placeholder")&&r.hasClass("placeholder")){if(r.data("placeholder-password")){r=r.hide().next().show().attr("id",r.removeAttr("id").data("placeholder-id"));if(p===true){return r[0].value=q}r.focus()}else{o.value="";r.removeClass("placeholder");o==n()&&o.select()}}}function g(){var s;var o=this;var r=e(o);var q=this.id;if(o.value==""){if(o.type=="password"){if(!r.data("placeholder-textinput")){try{s=r.clone().attr({type:"text"})}catch(p){s=e("").attr(e.extend(i(this),{type:"text"}))}s.removeAttr("name").data({"placeholder-password":r,"placeholder-id":q}).bind("focus.placeholder",c);r.data({"placeholder-textinput":s,"placeholder-id":q}).before(s)}r=r.removeAttr("id").hide().prev().attr("id",q).show()}r.addClass("placeholder");r[0].value=r.attr("placeholder")}else{r.removeClass("placeholder")}}function n(){try{return j.activeElement}catch(o){}}}(this,document,jQuery)); -$(function(){$('[placeholder]').placeholder();}); +$(function(){$('[placeholder]:not(.disabled-ie-placeholder)').placeholder();}); diff --git a/www/js/my.full.js b/www/js/my.full.js index 6b318e4d00..5586fb6b23 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -1369,6 +1369,7 @@ function fixedTfootAction(formID) if($(formID).size() == 0) return false; var $table = $(formID).find('table:last'); var $tfoot = $table.find('tfoot'); + if($tfoot.size() == 0) return false; $tfoot.removeClass('fixedTfootAction'); var $inputgroup = $tfoot.find('.table-actions').children('.input-group');