diff --git a/BO/Controllers/cmController.cs b/BO/Controllers/cmController.cs index ca478e2..c41084f 100644 --- a/BO/Controllers/cmController.cs +++ b/BO/Controllers/cmController.cs @@ -63,11 +63,11 @@ namespace NP.BO.Controllers { vm.stringval12 = DateTime.Now.Year.ToString(); } - if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval10)) + if (vm.viewidx == 0 && !string.IsNullOrEmpty(vm.stringval10)) { vm.stringval10 = vm.stringval10 ?? DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01"); } - if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval11)) + if (vm.viewidx == 0 && !string.IsNullOrEmpty(vm.stringval11)) { vm.stringval11 = vm.stringval11 ?? DateTime.Now.AddMonths(1).ToString("yyyy-MM-01"); } diff --git a/BO/Views/cc/homer.cshtml b/BO/Views/cc/homer.cshtml index 4cef262..8cb1e85 100644 --- a/BO/Views/cc/homer.cshtml +++ b/BO/Views/cc/homer.cshtml @@ -58,7 +58,7 @@ else -
+ @*
@Html.Partial("./Partial/File", Model.FileList.Where(w=>w.fgno == Model.Board.fgnothumb).ToList(), new ViewDataDictionary { @@ -71,7 +71,7 @@ else
w.fgno == Model.Board.fgnothumb).First().fileurl) : "/img/common/profile_sample.jpg")" style="max-width: 100px; max-height: 50px; border-radius: 5px;" />
-
+
*@
@Html.TextAreaFor(m => m.Board.contents, new { @class = "form-control", @style = "resize: none; width: 90%; height: 120px; padding: 3px 5px;" })
diff --git a/BO/Views/cc/roomr.cshtml b/BO/Views/cc/roomr.cshtml index f027654..c4d8b78 100644 --- a/BO/Views/cc/roomr.cshtml +++ b/BO/Views/cc/roomr.cshtml @@ -78,7 +78,7 @@ else }
-
+ @*
@Html.Partial("./Partial/File", Model.FileList.Where(w=>w.fgno == Model.Board.fgnothumb).ToList(), new ViewDataDictionary { @@ -91,7 +91,7 @@ else
w.fgno == Model.Board.fgnothumb).First().fileurl) : "/img/common/profile_sample.jpg")" style="max-width: 100px; max-height: 50px; border-radius: 5px;" />
-
+
*@
@Html.TextAreaFor(m => m.Board.contents, new { @class = "form-control", @style = "resize: none; width: 90%; height: 120px; padding: 3px 5px;" })
diff --git a/BO/Views/cm/cms.cshtml b/BO/Views/cm/cms.cshtml index 233613b..d8b7511 100644 --- a/BO/Views/cm/cms.cshtml +++ b/BO/Views/cm/cms.cshtml @@ -298,11 +298,18 @@ }); if ("@Model.stringval10" == null || "@Model.stringval10" == "" || "@Model.stringval10" == undefined) { + $("#stringval10").val(""); + } + if ("@Model.stringval11" == null || "@Model.stringval11" == "" || "@Model.stringval11" == undefined) { + $("#stringval11").val(""); + } + + @*if ("@Model.stringval10" == null || "@Model.stringval10" == "" || "@Model.stringval10" == undefined) { $("#stringval10").val("@DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01")"); } if ("@Model.stringval11" == null || "@Model.stringval11" == "" || "@Model.stringval11" == undefined) { $("#stringval11").val("@DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")"); - } + }*@ }); function cbgetcm() { if (capResult.obj != null && capResult.obj.length > 0) { diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache index bc77e92..29edc29 100644 Binary files a/BO/obj/Debug/BO.csprojAssemblyReference.cache and b/BO/obj/Debug/BO.csprojAssemblyReference.cache differ diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache index ddac55d..87eaa7e 100644 Binary files a/Base/obj/Debug/Base.csprojAssemblyReference.cache and b/Base/obj/Debug/Base.csprojAssemblyReference.cache differ diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache index 44de389..14ea404 100644 Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ diff --git a/FO/css/lecture.css b/FO/css/lecture.css index 465e416..0b03a34 100644 --- a/FO/css/lecture.css +++ b/FO/css/lecture.css @@ -186,7 +186,7 @@ .lctcWeek th, .lctcWeek td {display:block; width:100%;} .lctcWeek table {border-top:solid 1px #d6d6d6;} - .lctcWeek tr {position:relative; padding:15px 0; padding-left:95px; padding-right:70px; border-bottom:solid 1px #d6d6d6;} + .lctcWeek tr {position:relative;padding:15px 0; padding-right:70px;border-bottom:solid 1px #d6d6d6;} .lctcWeek th, .lctcWeek td {padding:0; border-top:none; border-bottom:none;} .lctcWeek th {width:80px; position:absolute; left:0; top:15px;}