From d9d2ef82765cdd67184e924bd999426dff72a9e3 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Fri, 2 Oct 2015 09:16:30 +0700 Subject: [PATCH 001/158] update translate --- src/main/webapp/assets/modules/translation/messages_vi.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json index 538c19022..bda671f95 100644 --- a/src/main/webapp/assets/modules/translation/messages_vi.json +++ b/src/main/webapp/assets/modules/translation/messages_vi.json @@ -754,5 +754,7 @@ "challengeIdeaTips": "Đây là ngày kết thúc giai đoạn Ý Tưởng của cuộc thi và thí sinh phải đề xuất ý tưởng trước ngày này. Nhà Tổ Chức sẽ phân loại, đánh giá và sắp xếp các ý tưởng. Các thí sinh với ý tưởng xuất sắc sẽ được lựa chọn để vào tiếp vòng trong.", "challengeUIUXTips":"Đây là ngày kết thúc giai đoạn UI/UX của cuộc thi và thí sinh phải nộp UI/UX mockup và/hay kết quả Kiểm Tra Khả Dụng (Usability Test) nếu được yêu cầu trước ngày này. Nhà Tổ Chức sẽ chịu trách nhiệm đánh giá UI/UX mockup và sẽ lựa chon các thí sinh với UI/UX mockup xuất sắc vào vòng tiếp theo.", "challengePrototypeTips":"Đây là ngày kết thúc giai đoạn Prototype của cuộc thi và thí sinh phải nộp Prototype trước ngày này. Nhà Tổ Chức sẽ chịu trách nhiệm đánh giá Prototype và sẽ lựa chon các thí sinh với Prototype xuất sắc vào vòng tiếp theo.", - "signInTitle": "Đăng nhập bằng chính tài khoản của bạn" + "signInTitle": "Đăng nhập bằng chính tài khoản của bạn", + "signInWithFaceBook": "Đăng nhập bằng Facebook", + "signInWithGooglePlus": "Đăng nhập bằng Google Plus" } From 81f727362addcac311cca528d61773bd685dcdfc Mon Sep 17 00:00:00 2001 From: Phuong H Date: Fri, 2 Oct 2015 11:44:59 +0700 Subject: [PATCH 002/158] Set logback level in production to Error --- src/main/resources/local/logback.groovy | 21 +++----------------- src/main/resources/production/logback.groovy | 8 ++++---- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/main/resources/local/logback.groovy b/src/main/resources/local/logback.groovy index 500e3fafb..9c759ef5e 100644 --- a/src/main/resources/local/logback.groovy +++ b/src/main/resources/local/logback.groovy @@ -11,29 +11,14 @@ import static ch.qos.logback.classic.Level.OFF scan() -def LOG_FOLDER = "./log/" - -new File(LOG_FOLDER).mkdirs() - -appender("ROOT_FILE", RollingFileAppender) { - file = "${LOG_FOLDER}techlooper-all.log" - rollingPolicy(TimeBasedRollingPolicy) { - fileNamePattern = "${LOG_FOLDER}%d{yyyyMMdd}-techlooper.log" - maxHistory = 30 - } - encoder(PatternLayoutEncoder) { - pattern = "%d{HH:mm:ss.SSS} %p [%t] %c{1}: %m%n" - } -} - appender("CONSOLE", ConsoleAppender) { encoder(PatternLayoutEncoder) { pattern = "%d{dd-MM-yyyy HH:mm:ss.SSS} %p [%t] %c{1}: %m%n" } } -logger("org.elasticsearch", ERROR) -logger("org.hibernate", ERROR) -logger("org.dozer", ERROR) +//logger("org.elasticsearch", ERROR) +//logger("org.hibernate", ERROR) +//logger("org.dozer", ERROR) root(DEBUG, ["CONSOLE"]) \ No newline at end of file diff --git a/src/main/resources/production/logback.groovy b/src/main/resources/production/logback.groovy index b35b913de..f481aa475 100644 --- a/src/main/resources/production/logback.groovy +++ b/src/main/resources/production/logback.groovy @@ -28,8 +28,8 @@ appender("ROOT_FILE", RollingFileAppender) { } } -logger("org.elasticsearch", ERROR) -logger("org.hibernate", ERROR) -logger("org.dozer", ERROR) +//logger("org.elasticsearch", ERROR) +//logger("org.hibernate", ERROR) +//logger("org.dozer", ERROR) -root(ALL, ["ROOT_FILE"]) \ No newline at end of file +root(ERROR, ["ROOT_FILE"]) \ No newline at end of file From 90ae8622d0edbb2963f77da7493bbc8d08649c4e Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Fri, 2 Oct 2015 11:48:08 +0700 Subject: [PATCH 003/158] fix bug font size for latest jobs on the personal home page --- src/main/webapp/assets/sass/main.sass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/webapp/assets/sass/main.sass b/src/main/webapp/assets/sass/main.sass index 14f3bb218..5d1761679 100644 --- a/src/main/webapp/assets/sass/main.sass +++ b/src/main/webapp/assets/sass/main.sass @@ -13,6 +13,9 @@ body position: relative height: auto font-size: 14px +h5 + font-size: 14px + font-weight: 500 div.breaking word-break: break-all input:invalid From 7ebda8535a11fa11c0aceab2a1128b27fac9bf53 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 5 Oct 2015 09:05:12 +0700 Subject: [PATCH 004/158] refactor and add submitsion for Challenge List page --- .../assets/modules/contests/contest-list.html | 40 +++++ .../modules/contests/contest.directive.js | 19 +++ .../assets/modules/contests/contests.con.js | 1 - .../assets/modules/contests/contests.tem.html | 61 ++------ src/main/webapp/assets/sass/contests.sass | 145 +++++++++++++++++- 5 files changed, 214 insertions(+), 52 deletions(-) create mode 100644 src/main/webapp/assets/modules/contests/contest-list.html create mode 100644 src/main/webapp/assets/modules/contests/contest.directive.js diff --git a/src/main/webapp/assets/modules/contests/contest-list.html b/src/main/webapp/assets/modules/contests/contest-list.html new file mode 100644 index 000000000..e86876737 --- /dev/null +++ b/src/main/webapp/assets/modules/contests/contest-list.html @@ -0,0 +1,40 @@ +
+
+
+ {{contest.challengeName}} + {{skill}} +
+
+

{{contest.startDateTime}}

+

{{contest.registrationDateTime}}

+

{{contest.submissionDateTime}}

+
+
+

${{contest.firstPlaceReward | number:0}}

+

${{contest.secondPlaceReward | number:0}}

+

${{contest.thirdPlaceReward | number:0}}

+
+
+ + +
+
+ {{contest.numberOfRegistrants}} +
+
+ + +
+
+
+
+ Johnson Pham +
+
+ phamthanhtrinh.vt@gmail.com +
+
+ +
+
+
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contests/contest.directive.js b/src/main/webapp/assets/modules/contests/contest.directive.js new file mode 100644 index 000000000..7c86f6131 --- /dev/null +++ b/src/main/webapp/assets/modules/contests/contest.directive.js @@ -0,0 +1,19 @@ +techlooper.directive('contestList', function () { + return { + restrict: "E", + replace: true, + templateUrl: "modules/contests/contest-list.html", + link: function (scope, el, attrs) { + scope.showSubmitForm = function(id){ + $('.submit-phase-contest').removeClass('show'); + var parent = $('#id-'+id); + var div = parent.find('.submit-phase-contest'); + if(div.hasClass('show')){ + div.removeClass('show'); + }else{ + div.addClass('show'); + } + } + } + }; +}); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contests/contests.con.js b/src/main/webapp/assets/modules/contests/contests.con.js index f94e8e0df..2cf2ff8ef 100644 --- a/src/main/webapp/assets/modules/contests/contests.con.js +++ b/src/main/webapp/assets/modules/contests/contests.con.js @@ -26,5 +26,4 @@ techlooper.controller('contestsController', function (apiService, $scope, jsonVa }).finally(function () { utils.sendNotification(jsonValue.notifications.loaded); }); - }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contests/contests.tem.html b/src/main/webapp/assets/modules/contests/contests.tem.html index 464fc713e..eb6a5ba2c 100644 --- a/src/main/webapp/assets/modules/contests/contests.tem.html +++ b/src/main/webapp/assets/modules/contests/contests.tem.html @@ -4,56 +4,17 @@

-
-
-
-

-
-
-
- - - - - - - - - - - - - - - - - - - - - -
-

{{contest.challengeName}}

- - {{skill}} - - 		-

{{contest.startDateTime}}

-

{{contest.registrationDateTime}}

-

{{contest.submissionDateTime}}

- 		-

${{contest.firstPlaceReward | number:0}}

-

${{contest.secondPlaceReward | number:0}}

-

${{contest.thirdPlaceReward | number:0}}

- 		- - - - {{contest.numberOfRegistrants}} -

-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass index 29341c4f1..2f93705ed 100644 --- a/src/main/webapp/assets/sass/contests.sass +++ b/src/main/webapp/assets/sass/contests.sass @@ -118,4 +118,147 @@ text-align: center a display: block - text-align: center \ No newline at end of file + text-align: center + .contests-list-management + display: inline-block + clear: both + width: 100% + background-color: #fff + padding: 20px 0 + .challenge-name-col + width: 35% + float: left + height: 30px + text-align: left + a + font-weight: 500 + .challenge-timeline-col + width: 20% + float: left + height: 30px + text-align: center + .challenge-prize-col + width: 10% + float: left + height: 30px + text-align: center + .challenge-current-phase-col + width: 15% + float: left + height: 30px + text-align: center + .challenge-registrants-col + width: 10% + float: left + height: 30px + text-align: center + .challenge-actions-col + width: 10% + float: left + height: 30px + text-align: right + .contest-list-management-header + font-weight: 500 + font-size: 15px + width: 100% + clear: both + display: inline-block + border-bottom: 2px solid #337ab7 + padding: 0 20px + .contest-list-management-body + display: inline-block + clear: both + width: 100% + .contest-item-row + display: inline-block + clear: both + width: 100% + border-bottom: 1px solid #ddd + padding: 5px 20px + .challenge-name-col + height: auto + a + display: block + clear: both + width: 100% + span + display: inline-block + width: auto + background-color: #f4f4f4 + border: 1px solid #e6e5e5 + border-radius: 4px + color: #7b7b7b + font-size: 12px + padding: 1px 5px + text-transform: capitalize + margin-right: 4px + .challenge-timeline-col + height: auto + p + margin: 0 + padding: 0 + width: 100% + span + width: 80px + float: left + text-align: left + .challenge-prize-col + height: auto + p + margin: 0 + padding: 0 + .challenge-current-phase-col + height: auto + span + display: inline-block + width: auto + font-size: 12px + border-radius: 4px + padding: 2px 4px + span.not-started + background-color: #00bcd4 + color: #fff + span.registration + background-color: #f88568 + color: #fff + span.in-progress + background-color: #4caf50 + color: #fff + span.closed + background-color: #999999 + color: #fff + span.note + display: block + width: 100% + clear: both + border-radius: 0 + padding: 0 + .challenge-registrants-col + height: auto + font-weight: 500 + .challenge-actions-col + height: auto + a + display: inline-block + width: auto + clear: both + background-color: #337ab7 + border-radius: 4px + padding: 2px 8px + margin-bottom: 5px + color: #fff + .submit-phase-contest + height: 0px + transition: height 1s + overflow: hidden + width: 100% + display: inline-block + border-radius: 4px + margin-top: 10px + .submit-phase-contest.show + height: 100px + background-color: #f1f2f7 + transition: height 1s + padding: 10px + + From 719dff168ac1f6b08ecd7b88894a8689218917a6 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 5 Oct 2015 13:55:03 +0700 Subject: [PATCH 005/158] vilidation for submission challenge phase on the challenge list page --- .../assets/modules/contests/contest-list.html | 42 ++++++++++--- .../modules/contests/contest.directive.js | 7 +++ .../assets/modules/contests/contests.con.js | 8 +++ .../modules/translation/messages_en.json | 6 +- src/main/webapp/assets/sass/contests.sass | 61 +++++++++++++++++-- 5 files changed, 110 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/assets/modules/contests/contest-list.html b/src/main/webapp/assets/modules/contests/contest-list.html index e86876737..8c136002a 100644 --- a/src/main/webapp/assets/modules/contests/contest-list.html +++ b/src/main/webapp/assets/modules/contests/contest-list.html @@ -27,14 +27,38 @@
-
- Johnson Pham -
-
- phamthanhtrinh.vt@gmail.com -
-
- -
+ +
+ Johnson Pham +
+
+ phamthanhtrinh.vt@gmail.com +
+
+ + +
+
+
+ + +
+
+
+
+ + +
+
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contests/contest.directive.js b/src/main/webapp/assets/modules/contests/contest.directive.js index 7c86f6131..79f73c946 100644 --- a/src/main/webapp/assets/modules/contests/contest.directive.js +++ b/src/main/webapp/assets/modules/contests/contest.directive.js @@ -14,6 +14,13 @@ techlooper.directive('contestList', function () { div.addClass('show'); } } + scope.hideSubmitForm = function(id){ + var parent = $('#id-'+id); + var div = parent.find('.submit-phase-contest'); + div.find('#txtDescription').val(''); + div.find('#txtSubmissionURL').val(''); + div.removeClass('show'); + } } }; }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contests/contests.con.js b/src/main/webapp/assets/modules/contests/contests.con.js index 2cf2ff8ef..314bb1778 100644 --- a/src/main/webapp/assets/modules/contests/contests.con.js +++ b/src/main/webapp/assets/modules/contests/contests.con.js @@ -26,4 +26,12 @@ techlooper.controller('contestsController', function (apiService, $scope, jsonVa }).finally(function () { utils.sendNotification(jsonValue.notifications.loaded); }); + + $scope.challengeSubmission = function(){ + $scope.submissionForm.$setSubmitted(); + if ($scope.submissionForm.$invalid) { + return false; + } + // send date + } }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index aa907cb03..c8d8f31cf 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -753,5 +753,9 @@ "mailSend": "Send", "challengeIdeaTips": "This date officially ends the Idea phase of the contest. Contestants must propose their ideas to Contest Owner by this date. Once the Contest Owner approves the idea, contestant who proposed the idea will be selected to go to the next phase.", "challengeUIUXTips": "This date officially ends the UI/UX phase of the contest. Contestants must propose their UI/UX mockups and/or Usability Test if required to Contest Owner by this date. Once the Contest Owner approves the mockup, contestant who submitted that mockup will be selected to go to the next phase.", - "challengePrototypeTips": "This date officially ends the Prototype phase of the contest. Contestants must submit their prototypes to Contest Owner by this date. Once the Contest Owner approves the prototype, contestant who submitted that prototype will be selected to go to the next phase." + "challengePrototypeTips": "This date officially ends the Prototype phase of the contest. Contestants must submit their prototypes to Contest Owner by this date. Once the Contest Owner approves the prototype, contestant who submitted that prototype will be selected to go to the next phase.", + "submissionURL": "Submission URL: *", + "submissionURLTips": "Input your submission link", + "description":"Description: *", + "descriptionSubmissionTips": "Write some lines to describe your submission to the challenge owner" } \ No newline at end of file diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass index 2f93705ed..196f0a4d6 100644 --- a/src/main/webapp/assets/sass/contests.sass +++ b/src/main/webapp/assets/sass/contests.sass @@ -174,7 +174,7 @@ clear: both width: 100% border-bottom: 1px solid #ddd - padding: 5px 20px + padding: 25px 20px 10px 20px .challenge-name-col height: auto a @@ -256,9 +256,62 @@ border-radius: 4px margin-top: 10px .submit-phase-contest.show - height: 100px + height: 280px background-color: #f1f2f7 transition: height 1s - padding: 10px - + padding: 10px 20px + margin-top: 10px + float: left + .registrant-name + display: inline-block + clear: both + width: 100% + padding-bottom: 5px + span + width: 18% + float: left + display: inline-block + font-weight: 400 + .registrant-email + display: inline-block + clear: both + width: 100% + padding-bottom: 10px + span + width: 18% + float: left + display: inline-block + font-weight: 400 + .phase-description + display: inline-block + clear: both + width: 100% + padding-bottom: 5px + label + width: 18% + float: left + display: inline-block + font-weight: 400 + strong + color: red + font-weight: 500 + input + float: left + width: 82% + clear: none + textarea + height: 80px + float: left + width: 82% + clear: none + div.error-messages + padding-left: 18% + width: 100% + clear: both + display: inline-block + .phase-submission + text-align: center + button + margin: auto + padding: 6px 30px From 9d15d53d9e51ed2dbcf054f61e59b18b014fddbd Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 5 Oct 2015 14:07:28 +0700 Subject: [PATCH 006/158] update style for challenge list --- .../webapp/assets/modules/contests/contest-list.html | 9 +++++++-- src/main/webapp/assets/sass/contests.sass | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/assets/modules/contests/contest-list.html b/src/main/webapp/assets/modules/contests/contest-list.html index 8c136002a..f871e7fda 100644 --- a/src/main/webapp/assets/modules/contests/contest-list.html +++ b/src/main/webapp/assets/modules/contests/contest-list.html @@ -22,8 +22,13 @@ {{contest.numberOfRegistrants}}
- - + + | + + + | + + |
diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass index 196f0a4d6..838c97f4e 100644 --- a/src/main/webapp/assets/sass/contests.sass +++ b/src/main/webapp/assets/sass/contests.sass @@ -240,13 +240,14 @@ height: auto a display: inline-block - width: auto + width: 95px clear: both background-color: #337ab7 border-radius: 4px padding: 2px 8px margin-bottom: 5px color: #fff + text-align: center .submit-phase-contest height: 0px transition: height 1s From 419aa7458c50aa31d374906f5fac82354a9baba4 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 5 Oct 2015 14:27:37 +0700 Subject: [PATCH 007/158] move submission challenge phase to component --- .../modules/common/submission-challenge.html | 35 ++++++++++++++++++ .../modules/common/submissionChallenge.js | 7 ++++ .../assets/modules/contests/contest-list.html | 36 +------------------ 3 files changed, 43 insertions(+), 35 deletions(-) create mode 100644 src/main/webapp/assets/modules/common/submission-challenge.html create mode 100644 src/main/webapp/assets/modules/common/submissionChallenge.js diff --git a/src/main/webapp/assets/modules/common/submission-challenge.html b/src/main/webapp/assets/modules/common/submission-challenge.html new file mode 100644 index 000000000..00802da60 --- /dev/null +++ b/src/main/webapp/assets/modules/common/submission-challenge.html @@ -0,0 +1,35 @@ +
+ +
+ Johnson Pham +
+
+ phamthanhtrinh.vt@gmail.com +
+
+ + +
+
+
+ + +
+
+
+
+ + +
+ +
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/common/submissionChallenge.js b/src/main/webapp/assets/modules/common/submissionChallenge.js new file mode 100644 index 000000000..d06dfe2f9 --- /dev/null +++ b/src/main/webapp/assets/modules/common/submissionChallenge.js @@ -0,0 +1,7 @@ +techlooper.directive("submissionChallenge", function ($timeout, jsonValue, utils) { + return { + restrict: "E", + replace: true, + templateUrl: "modules/common/submission-challenge.html" + } +}); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contests/contest-list.html b/src/main/webapp/assets/modules/contests/contest-list.html index f871e7fda..42ff0c306 100644 --- a/src/main/webapp/assets/modules/contests/contest-list.html +++ b/src/main/webapp/assets/modules/contests/contest-list.html @@ -31,39 +31,5 @@ |
-
- -
- Johnson Pham -
-
- phamthanhtrinh.vt@gmail.com -
-
- - -
-
-
- - -
-
-
-
- - -
- -
+
\ No newline at end of file From 26833f0ae6ba18b57f24bcd60d35496450dd2158 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 5 Oct 2015 15:02:41 +0700 Subject: [PATCH 008/158] add submission challenge phase for Challenge details page --- .../contest-detail/contest-detail.con.js | 14 ++ .../contest-detail/contest-detail.tem.html | 19 ++- .../webapp/assets/sass/contest-detail.sass | 16 ++- src/main/webapp/assets/sass/contests.sass | 135 +++++++++--------- src/main/webapp/assets/sass/main.sass | 4 + 5 files changed, 110 insertions(+), 78 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js index d98c040c9..18cdf95f5 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js @@ -178,5 +178,19 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l },1000); }); } + $scope.showSubmitForm = function(){ + var subForm = $('.submit-phase-contest'); + if(subForm.hasClass('show')){ + subForm.removeClass('show'); + }else{ + subForm.addClass('show'); + } + } + $scope.hideSubmitForm = function(){ + var subForm = $('.submit-phase-contest'); + subForm.find('#txtDescription').val(''); + subForm.find('#txtSubmissionURL').val(''); + subForm.removeClass('show'); + } }); diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html b/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html index 4bc9bcc11..13a89e3d9 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html @@ -12,6 +12,11 @@

{{contestDetail.challengeName}}

+
+
+ +
+
@@ -58,16 +63,16 @@

- + + +

-
-
- -
-
+ +

diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index aca2e84a9..ddf80bbff 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -4,6 +4,10 @@ width: 100% text-align: center padding-bottom: 20px + .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus + border-color: #dddddd #dddddd #fff + .nav-tabs > li > a + font-weight: 500 .contest-detail-content background-color: white -webkit-border-radius: 5px @@ -183,15 +187,12 @@ .join-now width: 40% float: right - padding-top: 4px button float: right margin-left: 10px button.disabled background-color: gray !important cursor: not-allowed - i - border-right: 1px solid #ccc span display: inline-block text-align: right @@ -200,7 +201,7 @@ display: inline-block clear: both width: 100% - padding: 10px 0 20px 0 + padding: 0 .contest-content-detail padding: 20px 20px 0 20px width: 100% @@ -288,6 +289,13 @@ a font-weight: 400 cursor: pointer + .submit-phase-contest.show + height: 280px + background-color: #f1f2f7 + transition: height 1s + padding: 10px 20px + margin-top: 10px + float: left .col-md-12 padding: 0 .contest-content-item diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass index 838c97f4e..a92575ef8 100644 --- a/src/main/webapp/assets/sass/contests.sass +++ b/src/main/webapp/assets/sass/contests.sass @@ -248,71 +248,72 @@ margin-bottom: 5px color: #fff text-align: center - .submit-phase-contest - height: 0px - transition: height 1s - overflow: hidden - width: 100% - display: inline-block - border-radius: 4px - margin-top: 10px - .submit-phase-contest.show - height: 280px - background-color: #f1f2f7 - transition: height 1s - padding: 10px 20px - margin-top: 10px - float: left - .registrant-name - display: inline-block - clear: both - width: 100% - padding-bottom: 5px - span - width: 18% - float: left - display: inline-block - font-weight: 400 - .registrant-email - display: inline-block - clear: both - width: 100% - padding-bottom: 10px - span - width: 18% - float: left - display: inline-block - font-weight: 400 - .phase-description - display: inline-block - clear: both - width: 100% - padding-bottom: 5px - label - width: 18% - float: left - display: inline-block - font-weight: 400 - strong - color: red - font-weight: 500 - input - float: left - width: 82% - clear: none - textarea - height: 80px - float: left - width: 82% - clear: none - div.error-messages - padding-left: 18% - width: 100% - clear: both - display: inline-block - .phase-submission - text-align: center - button - margin: auto - padding: 6px 30px + .submit-phase-contest + height: 0px + transition: height 1s + transition: background-color 1s + overflow: hidden + width: 100% + display: inline-block + border-radius: 4px + margin-top: 10px + .submit-phase-contest.show + height: 280px + background-color: #f1f2f7 + transition: height 1s + padding: 10px 20px + margin-top: 10px + float: left + .registrant-name + display: inline-block + clear: both + width: 100% + padding-bottom: 5px + span + width: 18% + float: left + display: inline-block + font-weight: 400 + .registrant-email + display: inline-block + clear: both + width: 100% + padding-bottom: 10px + span + width: 18% + float: left + display: inline-block + font-weight: 400 + .phase-description + display: inline-block + clear: both + width: 100% + padding-bottom: 5px + label + width: 18% + float: left + display: inline-block + font-weight: 400 + strong + color: red + font-weight: 500 + input + float: left + width: 82% + clear: none + textarea + height: 80px + float: left + width: 82% + clear: none + div.error-messages + padding-left: 18% + width: 100% + clear: both + display: inline-block + .phase-submission + text-align: center + button + margin: auto + padding: 6px 30px diff --git a/src/main/webapp/assets/sass/main.sass b/src/main/webapp/assets/sass/main.sass index 5d1761679..d2d03ee3b 100644 --- a/src/main/webapp/assets/sass/main.sass +++ b/src/main/webapp/assets/sass/main.sass @@ -194,6 +194,10 @@ a:focus border: 0 !important height: 36px box-shadow: none +.btn-primary:focus, +.btn-primary:hover + background-color: #337ab7 !important + background-position: 0 0 .hide display: none .show From eb0b5157af86d74b562185ac3140c5d2087bb6aa Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 5 Oct 2015 15:49:20 +0700 Subject: [PATCH 009/158] Enable user login token in 6 months --- .../web/DispatcherServletInitializer.java | 7 ++ .../config/web/sec/SecurityConfiguration.java | 91 ++++++++++--------- .../post-contest/postContestController.js | 38 ++++++++ 3 files changed, 91 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/techlooper/config/web/DispatcherServletInitializer.java b/src/main/java/com/techlooper/config/web/DispatcherServletInitializer.java index cabcfb13c..8495fe424 100644 --- a/src/main/java/com/techlooper/config/web/DispatcherServletInitializer.java +++ b/src/main/java/com/techlooper/config/web/DispatcherServletInitializer.java @@ -21,6 +21,8 @@ import com.techlooper.config.web.sec.SecurityConfiguration; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; import javax.servlet.ServletRegistration.Dynamic; public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer { @@ -31,6 +33,11 @@ public class DispatcherServletInitializer extends AbstractAnnotationConfigDispat // @Value("${spring.profiles.active}") // private String profile; + public void onStartup(ServletContext servletContext) throws ServletException { + servletContext.getSessionCookieConfig().setMaxAge(15770000); + super.onStartup(servletContext); + } + protected Class[] getRootConfigClasses() { return null; } diff --git a/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java b/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java index 9fc1be545..dd746f3b9 100644 --- a/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java +++ b/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java @@ -14,6 +14,8 @@ import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; +import org.springframework.security.web.authentication.rememberme.InMemoryTokenRepositoryImpl; +import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; @@ -27,58 +29,57 @@ @EnableGlobalMethodSecurity(prePostEnabled = true) public class SecurityConfiguration extends WebSecurityConfigurerAdapter { - @Bean - public AuthenticationProvider vnwAuthenticationProvider() { - return new VnwAuthenticationProvider(); - } + @Bean + public AuthenticationProvider vnwAuthenticationProvider() { + return new VnwAuthenticationProvider(); + } - @Bean - public AuthenticationProvider socialAuthenticationProvider() { - return new SocialAuthenticationProvider(); - } + @Bean + public AuthenticationProvider socialAuthenticationProvider() { + return new SocialAuthenticationProvider(); + } - @Bean - public AuthenticationProvider switchingAuthenticationProvider() { - SwitchingAuthenticationProvider switchingAuthenticationProvider = new SwitchingAuthenticationProvider(); - Map authenticationProviders = new HashMap<>(); - authenticationProviders.put(SocialProvider.VIETNAMWORKS, vnwAuthenticationProvider()); - authenticationProviders.put(SocialProvider.FACEBOOK, socialAuthenticationProvider()); - authenticationProviders.put(SocialProvider.GOOGLE, socialAuthenticationProvider()); - switchingAuthenticationProvider.setProviders(authenticationProviders); - return switchingAuthenticationProvider; - } + @Bean + public AuthenticationProvider switchingAuthenticationProvider() { + SwitchingAuthenticationProvider switchingAuthenticationProvider = new SwitchingAuthenticationProvider(); + Map authenticationProviders = new HashMap<>(); + authenticationProviders.put(SocialProvider.VIETNAMWORKS, vnwAuthenticationProvider()); + authenticationProviders.put(SocialProvider.FACEBOOK, socialAuthenticationProvider()); + authenticationProviders.put(SocialProvider.GOOGLE, socialAuthenticationProvider()); + switchingAuthenticationProvider.setProviders(authenticationProviders); + return switchingAuthenticationProvider; + } - @Bean - public AuthenticationManager authenticationManager() { - return new ProviderManager(Arrays.asList(switchingAuthenticationProvider())); - } + @Bean + public AuthenticationManager authenticationManager() { + return new ProviderManager(Arrays.asList(switchingAuthenticationProvider())); + } - protected void configure(HttpSecurity http) throws Exception { - http.csrf().disable() - .authorizeRequests() - .and().formLogin().loginPage("/login").usernameParameter("us").passwordParameter("pwd").successHandler(getSuccessHandler()).failureHandler(getAuthenticationFailureHandler()) - .and().logout().logoutUrl("/logout").logoutSuccessHandler(getLogoutSuccessHandler()).invalidateHttpSession(true).deleteCookies("SESSION").permitAll() - .and().exceptionHandling().authenticationEntryPoint(exceptionHandler()); + protected void configure(HttpSecurity http) throws Exception { + http.csrf().disable() + .authorizeRequests() + .and().formLogin().loginPage("/login").usernameParameter("us").passwordParameter("pwd").successHandler(getSuccessHandler()).failureHandler(getAuthenticationFailureHandler()) + .and().logout().logoutUrl("/logout").logoutSuccessHandler(getLogoutSuccessHandler()).invalidateHttpSession(true).deleteCookies("SESSION").permitAll() + .and().exceptionHandling().authenticationEntryPoint(exceptionHandler()); + } - } + private AuthenticationEntryPoint exceptionHandler() { + return (request, response, authException) -> response.setStatus(HttpServletResponse.SC_FORBIDDEN); + } - private AuthenticationEntryPoint exceptionHandler() { - return (request, response, authException) -> response.setStatus(HttpServletResponse.SC_FORBIDDEN); - } + private LogoutSuccessHandler getLogoutSuccessHandler() { + return (request, response, authentication) -> response.setStatus(HttpServletResponse.SC_NO_CONTENT); + } - private LogoutSuccessHandler getLogoutSuccessHandler() { - return (request, response, authentication) -> response.setStatus(HttpServletResponse.SC_NO_CONTENT); - } + private AuthenticationFailureHandler getAuthenticationFailureHandler() { + return (request, response, exception) -> response.setStatus(HttpServletResponse.SC_FORBIDDEN); + } - private AuthenticationFailureHandler getAuthenticationFailureHandler() { - return (request, response, exception) -> response.setStatus(HttpServletResponse.SC_FORBIDDEN); - } + private AuthenticationSuccessHandler getSuccessHandler() { + return (request, response, authentication) -> response.setStatus(HttpServletResponse.SC_NO_CONTENT); + } - private AuthenticationSuccessHandler getSuccessHandler() { - return (request, response, authentication) -> response.setStatus(HttpServletResponse.SC_NO_CONTENT); - } - - public void configure(WebSecurity web) throws Exception { - web.ignoring().antMatchers("/images/**", "/css/**", "/generate-resources/**", "/modules/**", "/bower_components/**", "/custom-js/**"); - } + public void configure(WebSecurity web) throws Exception { + web.ignoring().antMatchers("/images/**", "/css/**", "/generate-resources/**", "/modules/**", "/bower_components/**", "/custom-js/**"); + } } \ No newline at end of file diff --git a/src/main/webapp/assets/modules/post-contest/postContestController.js b/src/main/webapp/assets/modules/post-contest/postContestController.js index 777af239f..8b5347ff0 100644 --- a/src/main/webapp/assets/modules/post-contest/postContestController.js +++ b/src/main/webapp/assets/modules/post-contest/postContestController.js @@ -211,6 +211,44 @@ techlooper.controller("postContestController", function ($scope, $http, jsonValu ]; }, function () { + //if (!$scope.timelineForm) return; + //if (!$scope.contest) return; + + //if (!$scope.ideaChecked) delete $scope.contest.ideaSubmissionDate; + //if (!$scope.uiuxChecked) delete $scope.contest.uxSubmissionDate; + //if (!$scope.prototypeChecked) delete $scope.contest.prototypeSubmissionDate; + // + //var timeline = [ + // {name: "startDate", value: moment().add(4, 'weeks'), validatorName: "in4w"}, + // {name: "startDate", value: moment($scope.contest.startDate, jsonValue.dateFormat)}, + // {name: "registrationDate", value: moment($scope.contest.registrationDate, jsonValue.dateFormat)}, + // {name: "ideaSubmissionDate", value: moment($scope.contest.ideaSubmissionDate, jsonValue.dateFormat)}, + // {name: "uxSubmissionDate", value: moment($scope.contest.uxSubmissionDate, jsonValue.dateFormat), dependFrom: "registrationDate"}, + // {name: "prototypeSubmissionDate", value: moment($scope.contest.prototypeSubmissionDate, jsonValue.dateFormat), dependFrom: "registrationDate"}, + // {name: "submissionDate", value: moment($scope.contest.submissionDate, jsonValue.dateFormat), dependFrom: "registrationDate"} + //]; + // + ////var last = timeline[0]; + //var validators = []; + //for (var i = 1; i < timeline.length; ++i) { + // var current = timeline[i]; + // + // $.each(validators, function(i, validator) {//reset all validators + // $scope.timelineForm[current.name].$setValidity(validator, true); + // }); + // + // if (!current.value.isValid()) continue; + // + // var before = timeline[i-1]; + // var validatorName = before.validatorName || ("gt" + before.name.charAt(0).toUpperCase() + before.name.substr(1)); + // validators.push(validatorName); + // var valid = before.value.isValid() ? current.value.isAfter(before.value) : false; + // console.log(valid); + // $scope.timelineForm[current.name].$setValidity(validatorName, valid); + // console.log($scope.timelineForm[current.name]); + //} + + if (!$scope.contest) return; var currentDate = undefined; From ca5280b97d97dccaead8a474d6039360c245c581 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 5 Oct 2015 16:40:56 +0700 Subject: [PATCH 010/158] update source code for submission challenge phase --- .../modules/common/submission-challenge.html | 6 +++--- .../assets/modules/common/submissionChallenge.js | 15 ++++++++++++++- .../modules/contest-detail/contest-detail.con.js | 11 +++++++++++ .../contest-detail/contest-detail.tem.html | 6 ++++-- .../assets/modules/contests/contest-list.html | 2 +- .../assets/modules/contests/contests.con.js | 8 -------- .../assets/modules/translation/messages_en.json | 3 ++- 7 files changed, 35 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/assets/modules/common/submission-challenge.html b/src/main/webapp/assets/modules/common/submission-challenge.html index 00802da60..7bd91d1ad 100644 --- a/src/main/webapp/assets/modules/common/submission-challenge.html +++ b/src/main/webapp/assets/modules/common/submission-challenge.html @@ -9,7 +9,7 @@

+ ng-model="submissionDescription" maxlength="3000" ng-required="true" touchable>
@@ -19,7 +19,7 @@ + ng-model="submissionURL" ng-required="true" touchable />
@@ -28,7 +28,7 @@ translate="requiredURL" />
- +
diff --git a/src/main/webapp/assets/modules/common/submissionChallenge.js b/src/main/webapp/assets/modules/common/submissionChallenge.js index d06dfe2f9..097e5677c 100644 --- a/src/main/webapp/assets/modules/common/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/submissionChallenge.js @@ -2,6 +2,19 @@ techlooper.directive("submissionChallenge", function ($timeout, jsonValue, utils return { restrict: "E", replace: true, - templateUrl: "modules/common/submission-challenge.html" + scope: { + ngModel: "=" + }, + templateUrl: "modules/common/submission-challenge.html", + link: function (scope, el, attrs) { + scope.pushChallengePhase = function(){ + scope.submissionForm.$setSubmitted(); + if (scope.submissionForm.$invalid) { + return false; + } + console.log(scope.submissionDescription); + console.log(scope.submissionURL); + } + } } }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js index 18cdf95f5..96996a846 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js @@ -192,5 +192,16 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l subForm.find('#txtSubmissionURL').val(''); subForm.removeClass('show'); } + //$scope.pushChallengePhase = function(){ + // $scope.submissionForm.$setSubmitted(); + // if ($scope.submissionForm.$invalid) { + // $scope.submittedPhase = false; + // return false; + // } + // $scope.submittedPhase = true; + // console.log($scope.submissionDescription); + // console.log($scope.submissionURL); + // $scope.hideSubmitForm(); + //} }); diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html b/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html index 13a89e3d9..b5e71c764 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html @@ -71,8 +71,10 @@

- - + +
+

+

diff --git a/src/main/webapp/assets/modules/contests/contest-list.html b/src/main/webapp/assets/modules/contests/contest-list.html index 42ff0c306..2ee5a2d29 100644 --- a/src/main/webapp/assets/modules/contests/contest-list.html +++ b/src/main/webapp/assets/modules/contests/contest-list.html @@ -31,5 +31,5 @@ |

- +
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contests/contests.con.js b/src/main/webapp/assets/modules/contests/contests.con.js index 314bb1778..2cf2ff8ef 100644 --- a/src/main/webapp/assets/modules/contests/contests.con.js +++ b/src/main/webapp/assets/modules/contests/contests.con.js @@ -26,12 +26,4 @@ techlooper.controller('contestsController', function (apiService, $scope, jsonVa }).finally(function () { utils.sendNotification(jsonValue.notifications.loaded); }); - - $scope.challengeSubmission = function(){ - $scope.submissionForm.$setSubmitted(); - if ($scope.submissionForm.$invalid) { - return false; - } - // send date - } }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index c8d8f31cf..9b08d750e 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -757,5 +757,6 @@ "submissionURL": "Submission URL: *", "submissionURLTips": "Input your submission link", "description":"Description: *", - "descriptionSubmissionTips": "Write some lines to describe your submission to the challenge owner" + "descriptionSubmissionTips": "Write some lines to describe your submission to the challenge owner", + "submissionPhaseSuccessful": "Submission Successful" } \ No newline at end of file From b73614226bed6f68dc0f506d49bd7f2a9d819f65 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 5 Oct 2015 17:04:29 +0700 Subject: [PATCH 011/158] update cancel function for submission form --- .../modules/common/submissionChallenge.js | 6 ++++++ .../contest-detail/contest-detail.con.js | 17 ----------------- .../modules/contests/contest.directive.js | 7 ------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/main/webapp/assets/modules/common/submissionChallenge.js b/src/main/webapp/assets/modules/common/submissionChallenge.js index 097e5677c..e52857c6e 100644 --- a/src/main/webapp/assets/modules/common/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/submissionChallenge.js @@ -15,6 +15,12 @@ techlooper.directive("submissionChallenge", function ($timeout, jsonValue, utils console.log(scope.submissionDescription); console.log(scope.submissionURL); } + scope.hideSubmitForm = function(){ + var subForm = $('.submit-phase-contest'); + subForm.find('#txtDescription').val(''); + subForm.find('#txtSubmissionURL').val(''); + subForm.removeClass('show'); + } } } }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js index 96996a846..5fe03480e 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js @@ -186,22 +186,5 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l subForm.addClass('show'); } } - $scope.hideSubmitForm = function(){ - var subForm = $('.submit-phase-contest'); - subForm.find('#txtDescription').val(''); - subForm.find('#txtSubmissionURL').val(''); - subForm.removeClass('show'); - } - //$scope.pushChallengePhase = function(){ - // $scope.submissionForm.$setSubmitted(); - // if ($scope.submissionForm.$invalid) { - // $scope.submittedPhase = false; - // return false; - // } - // $scope.submittedPhase = true; - // console.log($scope.submissionDescription); - // console.log($scope.submissionURL); - // $scope.hideSubmitForm(); - //} }); diff --git a/src/main/webapp/assets/modules/contests/contest.directive.js b/src/main/webapp/assets/modules/contests/contest.directive.js index 79f73c946..7c86f6131 100644 --- a/src/main/webapp/assets/modules/contests/contest.directive.js +++ b/src/main/webapp/assets/modules/contests/contest.directive.js @@ -14,13 +14,6 @@ techlooper.directive('contestList', function () { div.addClass('show'); } } - scope.hideSubmitForm = function(id){ - var parent = $('#id-'+id); - var div = parent.find('.submit-phase-contest'); - div.find('#txtDescription').val(''); - div.find('#txtSubmissionURL').val(''); - div.removeClass('show'); - } } }; }); \ No newline at end of file From 0542f10423a076e0371793fa4559623532d56918 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Tue, 6 Oct 2015 09:44:42 +0700 Subject: [PATCH 012/158] remove :: --- src/main/webapp/assets/modules/translation/messages_en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index 9b08d750e..3bad8ecec 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -349,7 +349,7 @@ "challengeStartTip": "This is the date when the challenge starts and start accepting registrations. During this time Contest Owner promotes the contest and review the registrations received.", "challengeRegister": "Contestants Have To Register By: *", "challengeRegisterTip": "Typically between 2-4 weeks after the challenge start date. After this date, the contest is officially in-progress and contestants are working on the challenge. It is up to you to accept more registrations at this stage.", - "challengeSubmit": "And Contestants Must Submit Final App By:: *", + "challengeSubmit": "And Contestants Must Submit Final App By: *", "challengeSubmitTip": "Contest duration should not be longer than 8 weeks. This date officially ends the contest. All the contestants must submit their solutions by this date.", "userName": "Enter User Name/Email Address: *", "userNameEX": "Username / Example@vietnamworks.com", From f1625a7c0607277f203289e9273dbc4a05d15ab0 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Tue, 6 Oct 2015 10:27:00 +0700 Subject: [PATCH 013/158] change url to URL for translate --- src/main/webapp/assets/modules/translation/messages_en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index 3bad8ecec..970b9a894 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -149,7 +149,7 @@ "categories": "Categories", "level": "Level", "requiredThisField": "You can’t leave this empty.", - "requiredURL": "This is invalid url.", + "requiredURL": "This is invalid URL.", "yob": "Year of birth", "exYob": "Ex: 1988", "doYouWantToEarnMore": "Do you want to earn more?", From e3b9327cb897e923797bd8e076ebaae0a3939136 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Tue, 6 Oct 2015 11:41:03 +0700 Subject: [PATCH 014/158] Remove some unused js --- src/main/webapp/assets/modules/_app.js | 8 +- src/main/webapp/assets/modules/_appStart.js | 6 +- .../common/{ => email}/popupEmail.html | 0 .../common/{ => email}/popupEmailDirective.js | 2 +- .../assets/modules/common/shortcut.fac.js | 82 ------------- .../assets/modules/job/searchBox.ser.js | 8 +- .../assets/modules/register/register.con.js | 18 --- .../assets/modules/register/register.ser.js | 114 ------------------ .../assets/modules/register/register.tem.html | 83 ------------- .../assets/modules/signin/signin.con.js | 8 -- .../assets/modules/signin/signin.ser.js | 62 ---------- .../assets/modules/signin/signin.tem.html | 77 ------------ .../skill-analytics/skill-analytics.con.js | 2 +- .../skill-analytics/skill-analytics.ser.js | 8 +- .../talent-profile/talent-profile.con.js | 2 +- .../modules/user-profile/user-profile.con.js | 4 +- 16 files changed, 11 insertions(+), 473 deletions(-) rename src/main/webapp/assets/modules/common/{ => email}/popupEmail.html (100%) rename src/main/webapp/assets/modules/common/{ => email}/popupEmailDirective.js (92%) delete mode 100644 src/main/webapp/assets/modules/common/shortcut.fac.js delete mode 100644 src/main/webapp/assets/modules/register/register.con.js delete mode 100644 src/main/webapp/assets/modules/register/register.ser.js delete mode 100644 src/main/webapp/assets/modules/register/register.tem.html delete mode 100644 src/main/webapp/assets/modules/signin/signin.con.js delete mode 100644 src/main/webapp/assets/modules/signin/signin.ser.js delete mode 100644 src/main/webapp/assets/modules/signin/signin.tem.html diff --git a/src/main/webapp/assets/modules/_app.js b/src/main/webapp/assets/modules/_app.js index 9655e461c..4dc1d42bb 100644 --- a/src/main/webapp/assets/modules/_app.js +++ b/src/main/webapp/assets/modules/_app.js @@ -15,8 +15,6 @@ angular.module("Jobs", ['infinite-scroll']); angular.module("Pie", []); angular.module("SearchForm", []); angular.module("Skill", []); -angular.module("SignIn", []); -angular.module("Register", []); angular.module("UserProfile", []); var baseUrl = (function () { @@ -27,7 +25,7 @@ var baseUrl = (function () { var techlooper = angular.module("Techlooper", [ "ngSanitize", "pascalprecht.translate", "ngResource", "ngRoute", "satellizer", 'ngCookies', "LocalStorageModule", - "Bubble", "Pie", "Home", "Navigation", "Footer", "Common", "Chart", "Jobs", "Skill", "SignIn", "Register", + "Bubble", "Pie", "Home", "Navigation", "Footer", "Common", "Chart", "Jobs", "Skill", "UserProfile", "selectize", "autocomplete", "focusOn", "mgcrea.ngStrap", "angularUtils.directives.dirPagination" ]); @@ -106,10 +104,6 @@ techlooper.config(["$routeProvider", "$translateProvider", "$authProvider", "loc templateUrl: "modules/it-professional/main.tem.html", controller: "chartController" }) - .when("/register", { - templateUrl: "modules/it-professional/main.tem.html", - controller: "registerController" - }) .when("/user", { templateUrl: "modules/it-professional/main.tem.html", controller: "userProfileController" diff --git a/src/main/webapp/assets/modules/_appStart.js b/src/main/webapp/assets/modules/_appStart.js index 674c09833..b31b50225 100644 --- a/src/main/webapp/assets/modules/_appStart.js +++ b/src/main/webapp/assets/modules/_appStart.js @@ -1,5 +1,4 @@ -techlooper.run(function (shortcutFactory, connectionFactory, loadingBoxFactory, cleanupFactory, - signInService, historyFactory, userService, routerService, $location, +techlooper.run(function (connectionFactory, loadingBoxFactory, cleanupFactory, userService, $location, utils, $rootScope, $translate, jsonValue, localStorageService, securityService, apiService, resourcesService, seoService, joinAnythingService) { $rootScope.apiService = apiService; @@ -66,12 +65,9 @@ techlooper.run(function (shortcutFactory, connectionFactory, loadingBoxFactory, $rootScope.today = moment().format(jsonValue.dateFormat); //Exec all services - shortcutFactory.initialize(); connectionFactory.initialize(); loadingBoxFactory.initialize(); cleanupFactory.initialize(); - historyFactory.initialize(); - routerService.initialize(); userService.initialize(); securityService.initialize(); seoService.initialize(); diff --git a/src/main/webapp/assets/modules/common/popupEmail.html b/src/main/webapp/assets/modules/common/email/popupEmail.html similarity index 100% rename from src/main/webapp/assets/modules/common/popupEmail.html rename to src/main/webapp/assets/modules/common/email/popupEmail.html diff --git a/src/main/webapp/assets/modules/common/popupEmailDirective.js b/src/main/webapp/assets/modules/common/email/popupEmailDirective.js similarity index 92% rename from src/main/webapp/assets/modules/common/popupEmailDirective.js rename to src/main/webapp/assets/modules/common/email/popupEmailDirective.js index 38eba2439..b60daf6a6 100644 --- a/src/main/webapp/assets/modules/common/popupEmailDirective.js +++ b/src/main/webapp/assets/modules/common/email/popupEmailDirective.js @@ -2,7 +2,7 @@ techlooper.directive("popupEmail", function () { return { restrict: "E", replace: true, - templateUrl: "modules/common/popupEmail.html", + templateUrl: "modules/common/email/popupEmail.html", scope: { composeEmail: "=" }, diff --git a/src/main/webapp/assets/modules/common/shortcut.fac.js b/src/main/webapp/assets/modules/common/shortcut.fac.js deleted file mode 100644 index ef29ac4be..000000000 --- a/src/main/webapp/assets/modules/common/shortcut.fac.js +++ /dev/null @@ -1,82 +0,0 @@ -angular.module("Common").factory("shortcutFactory", function (jsonValue, $location, $rootScope, historyFactory, utils, $timeout) { - - //var $$ = { - // goBack: function () { - // var path = historyFactory.popHistory(); - // if (path === "/" && utils.isHome()) { - // return; - // } - // $location.path(path); - // $timeout(function(){ - // $('.js-footer').removeClass('technical-detail'); - // }, 600); - // } - //} - - //var traps = { - // esc: function (e) { - // switch (utils.getView()) { - // case jsonValue.views.jobsSearchText: - // if ($("#companyVideoInfor").is(":visible")) {// ESC from others, such as: Video dialog, ... - // $(".playerVideo").attr("src", ""); - // return; - // } - // $location.path(jsonValue.routerUris.jobsSearch); - // break; - // case jsonValue.views.register: - // if ($("#terms-conditions").is(":visible")) { - // return; - // } - // $$.goBack(); - // break; - // case jsonValue.views.companyProfile: - // if ($("#companyVideoInfor").is(":visible")) {// ESC from others, such as: Video dialog, ... - // $(".playerVideo").attr("src", ""); - // return; - // } - // break; - // case jsonValue.views.analyticsSkill: - // if ($("#changeSkill").is(":visible")) { - // $('#changeSkill').modal('hide'); - // return; - // } - // $$.goBack(); - // break; - // default: - // $$.goBack(); - // break; - // } - // }, - // - // enter: function (e) { - // switch (utils.getView()) { - // case jsonValue.views.jobsSearchText: - // case jsonValue.views.jobsSearch: - // utils.sendNotification(jsonValue.notifications.defaultAction); - // break; - // } - // } - //} - // - //Mousetrap.bindGlobal("esc", function (e) { - // if (e.defaultPrevented) { - // return; - // } - // traps.esc(e); - //}); - // - //Mousetrap.bindGlobal("enter", function (e) { - // if (e.defaultPrevented) { - // return; - // } - // traps.enter(e); - //}); - - return { - initialize: function () {} - - //trigger: function (key) { - // Mousetrap.trigger(key); - //} - }; -}); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/job/searchBox.ser.js b/src/main/webapp/assets/modules/job/searchBox.ser.js index 313b76d7e..6e72402b0 100644 --- a/src/main/webapp/assets/modules/job/searchBox.ser.js +++ b/src/main/webapp/assets/modules/job/searchBox.ser.js @@ -1,4 +1,4 @@ -angular.module("Jobs").factory("searchBoxService", function ($location, jsonValue, utils, $translate, shortcutFactory, navigationService) { +angular.module("Jobs").factory("searchBoxService", function ($location, jsonValue, utils, $translate) { var scope, searchText, textArray; var $$ = { @@ -97,9 +97,9 @@ angular.module("Jobs").factory("searchBoxService", function ($location, jsonValu } $('.btn-search').click($$.doSearch); - $('.btn-logo').click(function () { - shortcutFactory.trigger('esc'); - }); + //$('.btn-logo').click(function () { + // shortcutFactory.trigger('esc'); + //}); $('.btn-search').css({ 'height': $('.selectize-control').height() - 9, diff --git a/src/main/webapp/assets/modules/register/register.con.js b/src/main/webapp/assets/modules/register/register.con.js deleted file mode 100644 index 7c4aeff56..000000000 --- a/src/main/webapp/assets/modules/register/register.con.js +++ /dev/null @@ -1,18 +0,0 @@ -angular.module('Register').controller('registerController', - function ($scope, connectionFactory, jsonValue, localStorageService, utils, registerService, userService) { - utils.sendNotification(jsonValue.notifications.switchScope, $scope); - registerService.translation(); - $scope.authSource = jsonValue.authSource; - $scope.openOathDialog = registerService.openOathDialog; - $scope.hasProfile = registerService.hasProfile; - $scope.registerVietnamworks = registerService.registerVietnamworks; - userService.getUserInfo() - .then(function () { - localStorageService.remove(jsonValue.storage.back2Me, "true"); - utils.sendNotification(jsonValue.notifications.gotData); - }) - .catch(function () { - localStorageService.set(jsonValue.storage.back2Me, "true"); - utils.sendNotification(jsonValue.notifications.loginFailed); - }); - }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/register/register.ser.js b/src/main/webapp/assets/modules/register/register.ser.js deleted file mode 100644 index ebf21e8ac..000000000 --- a/src/main/webapp/assets/modules/register/register.ser.js +++ /dev/null @@ -1,114 +0,0 @@ -angular.module('Register').factory('registerService', - function (shortcutFactory, jsonValue, localStorageService, utils, $http, connectionFactory, $location, $auth, - $window, $rootScope, $translate) { - var scope; - var $$ = { - initialize: function ($scope) { - scope = $scope; - $("#salary").slider({}); - $('.btn-logo').click(function () { - shortcutFactory.trigger('esc'); - }); - $('.register-successful').click($$.saveUserInfo); - $$.userInfo(); - }, - - saveUserInfo: function (e) { - $(e.target).unbind("click tap"); - connectionFactory.saveUserInfo(scope.userInfo) - .then(function (resp) { - utils.notify(jsonValue.messages.successSave, 'success'); - $location.path("/"); - }) - .catch(function (errors) { - utils.notify(jsonValue.messages.errorFieldsSave, 'error'); - $.each(errors, function (i, error) { - // TODO: design error display - $("." + error.field).css("border", "1px solid red");//error.defaultMessage - }); - }) - .finally(function () { - $(e.target).bind("click tap", $$.saveUserInfo); - }); - }, - - enableNotifications: function () { - return utils.getView() === jsonValue.views.register; - }, - - userInfo: function () { - if ($rootScope.userInfo === undefined) { - return false; - } - $(".emailAddress").prop("disabled", $rootScope.userInfo.emailAddress != null); - - if (instance.hasProfile(jsonValue.authSource[0])) { - $("#alreadyRegisteredVietnamworks").show(); - $("#registerVietnamworksQuestion").hide(); - $(".register-vietnamworks").prop("disabled", true); - $(".register-vietnamworks").prop("checked", true); - } - else { - $("#alreadyRegisteredVietnamworks").hide(); - $("#registerVietnamworksQuestion").show(); - } - } - } - - var instance = { - hasProfile: function (auth) { - if ($rootScope.userInfo === undefined) { - return false; - } - return $rootScope.userInfo.profileNames.indexOf(auth.provider.toUpperCase()) > -1; - }, - - openOathDialog: function (auth) { - if (instance.hasProfile(auth)) { - return false; - } - utils.sendNotification(jsonValue.notifications.loading, $(window).height()); - $auth.authenticate(auth.provider) - .then(function (resp) {//success - delete $window.localStorage["satellizer_token"]; - $rootScope.userInfo.profileNames.push(auth.provider.toUpperCase()); - }) - .finally(function (resp) { - utils.sendNotification(jsonValue.notifications.loaded); - }); - }, - - translation: function () { - $translate("up2perMonth").then(function (translation) { - scope.salaryOptions = [-800, -1000, -1500, -2000, -2500, -3000, -4000].map(function (val) { - return { - label: translation.replace("{}", Math.abs(val)), - value: val - }; - }); - }); - $translate("moreThanPerMonth").then(function (translation) { - scope.salaryOptions.push({ - label: translation.replace("{}", 4000), - value: 4000 - }); - }); - }, - - registerVietnamworks: function () { - if ($('.register-vietnamworks').prop('checked') === true) { - $rootScope.userInfo.profileNames.push(jsonValue.authSource[0].provider.toUpperCase()); - } else { - var i = $rootScope.userInfo.profileNames.indexOf("VIETNAMWORKS"); - if (i != -1) { - $rootScope.userInfo.profileNames.splice(i, 1); - } - } - } - }; - - utils.registerNotification(jsonValue.notifications.userInfo, $$.userInfo, $$.enableNotifications); - utils.registerNotification(jsonValue.notifications.changeLang, instance.translation, $$.enableNotifications); - utils.registerNotification(jsonValue.notifications.switchScope, $$.initialize, $$.enableNotifications); - return instance; - }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/register/register.tem.html b/src/main/webapp/assets/modules/register/register.tem.html deleted file mode 100644 index be18929cd..000000000 --- a/src/main/webapp/assets/modules/register/register.tem.html +++ /dev/null @@ -1,83 +0,0 @@ - - \ No newline at end of file diff --git a/src/main/webapp/assets/modules/signin/signin.con.js b/src/main/webapp/assets/modules/signin/signin.con.js deleted file mode 100644 index 67c48a8f7..000000000 --- a/src/main/webapp/assets/modules/signin/signin.con.js +++ /dev/null @@ -1,8 +0,0 @@ -angular.module('SignIn').controller('signInController', function ($location, jsonValue, utils, $scope, signInService) { - signInService.initialize(); - $scope.authSource = jsonValue.authSource; - //utils.sendNotification(jsonValue.notifications.switchScope, $scope); - //utils.sendNotification(jsonValue.notifications.gotData); - $scope.openOathDialog = signInService.openOathDialog; - -}); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/signin/signin.ser.js b/src/main/webapp/assets/modules/signin/signin.ser.js deleted file mode 100644 index 463a7bfdc..000000000 --- a/src/main/webapp/assets/modules/signin/signin.ser.js +++ /dev/null @@ -1,62 +0,0 @@ -angular.module('SignIn').factory('signInService', - function (jsonValue, utils, shortcutFactory, $location, $auth, localStorageService, - $window, $http, connectionFactory, $rootScope, userService) { - - var $$ = { - enableNotifications: function () { - return utils.getView() === jsonValue.views.signIn; - }, - - loginFailed: function () { - // TODO: consider to use a "signing box" - utils.sendNotification(jsonValue.notifications.hideLoadingBox); - } - } - - var instance = { - init: function () {}, - - initialize: function () { - utils.sendNotification(jsonValue.notifications.loading, $(window).height()); - - // check if user already login - if (userService.verifyUserSession()) { - connectionFactory.verifyUserLogin() - .then(function () {utils.sendNotification(jsonValue.notifications.loginSuccess);}) - .catch(function () {utils.sendNotification(jsonValue.notifications.loginFailed);}); - } - else { - utils.sendNotification(jsonValue.notifications.hideLoadingBox); - } - - $('.signin-accounts').parallax(); - - $('.btn-logo').click(function () { - shortcutFactory.trigger('esc'); - }); - - $(".signin-popup-close").on('click', function () { - $('#signin-form').modal('hide'); - }); - - }, - - openOathDialog: function (auth) { - if (auth.isNotSupported) {return alert("Sign-in by " + auth.provider.toUpperCase() + " isn't supported");} - utils.sendNotification(jsonValue.notifications.loading, $(window).height()); - $auth.authenticate(auth.provider) - .then(function (resp) {//success - delete $window.localStorage["satellizer_token"]; - //localStorageService.cookie.set(jsonValue.storage.key, resp.data.key); - //connectionFactory.login(); - }) - .catch(function (resp) { - utils.sendNotification(jsonValue.notifications.loaded); - }); - } - }; - - //utils.registerNotification(jsonValue.notifications.loginSuccess, $$.loginSuccess); - utils.registerNotification(jsonValue.notifications.loginFailed, $$.loginFailed); - return instance; - }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/signin/signin.tem.html b/src/main/webapp/assets/modules/signin/signin.tem.html deleted file mode 100644 index 2a4406b00..000000000 --- a/src/main/webapp/assets/modules/signin/signin.tem.html +++ /dev/null @@ -1,77 +0,0 @@ -
-
- - - -
-

tagLine

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/assets/modules/skill-analytics/skill-analytics.con.js b/src/main/webapp/assets/modules/skill-analytics/skill-analytics.con.js index 82892e5cc..24ca0cd52 100644 --- a/src/main/webapp/assets/modules/skill-analytics/skill-analytics.con.js +++ b/src/main/webapp/assets/modules/skill-analytics/skill-analytics.con.js @@ -1,6 +1,6 @@ angular.module('Skill').controller('skillAnalyticsController', function ($scope, jsonValue, connectionFactory, $routeParams, animationFactory, utils, skillTableFactory, - skillCircleFactory, skillChartFactory, shortcutFactory, skillAnalyticsService, $location, navigationService) { + skillCircleFactory, skillChartFactory, skillAnalyticsService) { $(window).scrollTop(0); var histogramsAndPeriod = skillAnalyticsService.getHistogramsAndPeriod($routeParams.period); var skillStatisticRequest = { diff --git a/src/main/webapp/assets/modules/skill-analytics/skill-analytics.ser.js b/src/main/webapp/assets/modules/skill-analytics/skill-analytics.ser.js index 02b794ec3..442ed9d89 100644 --- a/src/main/webapp/assets/modules/skill-analytics/skill-analytics.ser.js +++ b/src/main/webapp/assets/modules/skill-analytics/skill-analytics.ser.js @@ -1,5 +1,5 @@ angular.module("Skill").factory("skillAnalyticsService", - function (jsonValue, utils, skillTableFactory, skillChartFactory, shortcutFactory, $location, termService) { + function (jsonValue, utils, skillTableFactory, skillChartFactory, $location, termService) { var viewJson; var scope; var skillStatisticRequest; @@ -108,12 +108,6 @@ angular.module("Skill").factory("skillAnalyticsService", registerEvents: function () { skillTableFactory.registerEvents(); - $('.btn-close').click(function () { - shortcutFactory.trigger('esc'); - }); - $('.btn-logo').click(function () { - shortcutFactory.trigger('esc'); - }); var type = $('.chart-management ul').find('li'); type.unbind("click"); diff --git a/src/main/webapp/assets/modules/talent-search/talent-profile/talent-profile.con.js b/src/main/webapp/assets/modules/talent-search/talent-profile/talent-profile.con.js index 6d78493cf..7e2ee46e1 100644 --- a/src/main/webapp/assets/modules/talent-search/talent-profile/talent-profile.con.js +++ b/src/main/webapp/assets/modules/talent-search/talent-profile/talent-profile.con.js @@ -1,4 +1,4 @@ -techlooper.controller("talentProfileController", function ($timeout, jsonValue, talentProfileService, $scope, $routeParams, $http, shortcutFactory) { +techlooper.controller("talentProfileController", function ($timeout, jsonValue, talentProfileService, $scope, $routeParams, $http) { //$timeout(function(){ // //talentProfileService.init(); // talentProfileService.showRating(parseFloat($scope.userProfile.rate)); diff --git a/src/main/webapp/assets/modules/user-profile/user-profile.con.js b/src/main/webapp/assets/modules/user-profile/user-profile.con.js index b21d84220..2c4362854 100644 --- a/src/main/webapp/assets/modules/user-profile/user-profile.con.js +++ b/src/main/webapp/assets/modules/user-profile/user-profile.con.js @@ -1,8 +1,6 @@ -angular.module('UserProfile').controller('userProfileController', function ($scope, jsonValue, shortcutFactory, userProfileFactory) { +angular.module('UserProfile').controller('userProfileController', function ($scope, jsonValue) { $scope.accounts = jsonValue.authSource; userProfileFactory.customScrollBar(); userProfileFactory.resizeScreen(); userProfileFactory.collapseContent(); - $('.btn-close').click(function () {shortcutFactory.trigger('esc');}); - $('.btn-logo').click(function () {shortcutFactory.trigger('esc');}); }); \ No newline at end of file From 492bd32cdf2062f9d0c2df392deaaa5c63a35d14 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Tue, 6 Oct 2015 14:06:31 +0700 Subject: [PATCH 015/158] Refactor submitChallenge.html --- .../submissionChallenge.html} | 0 .../modules/common/{ => challenge}/submissionChallenge.js | 2 +- src/main/webapp/assets/modules/events/eventsController.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/main/webapp/assets/modules/common/{submission-challenge.html => challenge/submissionChallenge.html} (100%) rename src/main/webapp/assets/modules/common/{ => challenge}/submissionChallenge.js (91%) diff --git a/src/main/webapp/assets/modules/common/submission-challenge.html b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html similarity index 100% rename from src/main/webapp/assets/modules/common/submission-challenge.html rename to src/main/webapp/assets/modules/common/challenge/submissionChallenge.html diff --git a/src/main/webapp/assets/modules/common/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js similarity index 91% rename from src/main/webapp/assets/modules/common/submissionChallenge.js rename to src/main/webapp/assets/modules/common/challenge/submissionChallenge.js index e52857c6e..6ecbbcc8c 100644 --- a/src/main/webapp/assets/modules/common/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js @@ -5,7 +5,7 @@ techlooper.directive("submissionChallenge", function ($timeout, jsonValue, utils scope: { ngModel: "=" }, - templateUrl: "modules/common/submission-challenge.html", + templateUrl: "modules/common/challenge/submissionChallenge.html", link: function (scope, el, attrs) { scope.pushChallengePhase = function(){ scope.submissionForm.$setSubmitted(); diff --git a/src/main/webapp/assets/modules/events/eventsController.js b/src/main/webapp/assets/modules/events/eventsController.js index 10086dff8..e50be619a 100644 --- a/src/main/webapp/assets/modules/events/eventsController.js +++ b/src/main/webapp/assets/modules/events/eventsController.js @@ -12,7 +12,7 @@ techlooper.controller("eventsController", function ($scope, apiService, utils, j if (!startDate.isValid()) continue; var web = {startDate: startDate.format(jsonValue.dateFormat)}; web.expired = moment(web.startDate, jsonValue.dateTimeFormat).isBefore(today, "day"); - if(web.expired == true){ + if (web.expired == true) { group.now = true; } group.push(web); From 707a2457b123ebb832e00d2f75b6a035274641e2 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Tue, 6 Oct 2015 14:23:35 +0700 Subject: [PATCH 016/158] Don't send email job alert twice a day --- .../techlooper/cron/JobAlertEmailSender.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/techlooper/cron/JobAlertEmailSender.java b/src/main/java/com/techlooper/cron/JobAlertEmailSender.java index a67b9f829..0ba4fbf64 100644 --- a/src/main/java/com/techlooper/cron/JobAlertEmailSender.java +++ b/src/main/java/com/techlooper/cron/JobAlertEmailSender.java @@ -13,10 +13,12 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; import static com.techlooper.model.JobAlertEmailResultEnum.EMAIL_SENT; import static com.techlooper.model.JobAlertEmailResultEnum.JOB_NOT_FOUND; +import static com.techlooper.util.DateTimeUtils.*; /** * This is cron job class that automatically sends job alert email to user periodically @@ -46,7 +48,7 @@ public class JobAlertEmailSender { * @throws Exception */ @Scheduled(cron = "${scheduled.cron.jobAlert}") - public void sendJobAlertEmail() throws Exception { + public synchronized void sendJobAlertEmail() throws Exception { if (enableJobAlert) { List jobAlertRegistrationEntities = jobAggregatorService.findJobAlertRegistration(JobAlertPeriodEnum.WEEKLY); @@ -54,14 +56,19 @@ public void sendJobAlertEmail() throws Exception { if (!jobAlertRegistrationEntities.isEmpty()) { int count = 0; for (JobAlertRegistrationEntity jobAlertRegistrationEntity : jobAlertRegistrationEntities) { - JobSearchCriteria criteria = dozerMapper.map(jobAlertRegistrationEntity, JobSearchCriteria.class); - JobSearchResponse jobSearchResponse = jobAggregatorService.findJob(criteria); - if (jobSearchResponse.getTotalJob() > 0) { - jobAggregatorService.sendEmail(jobAlertRegistrationEntity, jobSearchResponse); - jobAggregatorService.updateSendEmailResultCode(jobAlertRegistrationEntity, EMAIL_SENT); - count++; - } else { - jobAggregatorService.updateSendEmailResultCode(jobAlertRegistrationEntity, JOB_NOT_FOUND); + Date lastSentDate = string2Date(jobAlertRegistrationEntity.getLastEmailSentDateTime(), BASIC_DATE_TIME_PATTERN); + Date currentDate = new Date(); + + if (daysBetween(lastSentDate, currentDate) > 0) { + JobSearchCriteria criteria = dozerMapper.map(jobAlertRegistrationEntity, JobSearchCriteria.class); + JobSearchResponse jobSearchResponse = jobAggregatorService.findJob(criteria); + if (jobSearchResponse.getTotalJob() > 0) { + jobAggregatorService.sendEmail(jobAlertRegistrationEntity, jobSearchResponse); + jobAggregatorService.updateSendEmailResultCode(jobAlertRegistrationEntity, EMAIL_SENT); + count++; + } else { + jobAggregatorService.updateSendEmailResultCode(jobAlertRegistrationEntity, JOB_NOT_FOUND); + } } } LOGGER.info("There are " + count + " job alert emails has been sent"); From e5efac651fe241ae11ab4c5f538f610fda51fbec Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Tue, 6 Oct 2015 15:35:06 +0700 Subject: [PATCH 017/158] Add submissions list of a registrant of a challenge --- .../model/ChallengeSubmissionDto.java | 87 +++++++++++++++++++ .../techlooper/service/ChallengeService.java | 74 ++++++++-------- .../service/impl/ChallengeServiceImpl.java | 48 +++++++--- 3 files changed, 159 insertions(+), 50 deletions(-) create mode 100644 src/main/java/com/techlooper/model/ChallengeSubmissionDto.java diff --git a/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java b/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java new file mode 100644 index 000000000..f53cbfc75 --- /dev/null +++ b/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java @@ -0,0 +1,87 @@ +package com.techlooper.model; + +/** + * Created by NguyenDangKhoa on 10/6/15. + */ +public class ChallengeSubmissionDto { + + private Long challengeSubmissionId; + + private Long registrantId; + + private String registrantName; + + private Long challengeId; + + private String submissionURL; + + private String submissionDateTime; + + private String submissionDescription; + + private String submissionStatus; + + public Long getChallengeSubmissionId() { + return challengeSubmissionId; + } + + public void setChallengeSubmissionId(Long challengeSubmissionId) { + this.challengeSubmissionId = challengeSubmissionId; + } + + public Long getRegistrantId() { + return registrantId; + } + + public void setRegistrantId(Long registrantId) { + this.registrantId = registrantId; + } + + public String getRegistrantName() { + return registrantName; + } + + public void setRegistrantName(String registrantName) { + this.registrantName = registrantName; + } + + public Long getChallengeId() { + return challengeId; + } + + public void setChallengeId(Long challengeId) { + this.challengeId = challengeId; + } + + public String getSubmissionURL() { + return submissionURL; + } + + public void setSubmissionURL(String submissionURL) { + this.submissionURL = submissionURL; + } + + public String getSubmissionDateTime() { + return submissionDateTime; + } + + public void setSubmissionDateTime(String submissionDateTime) { + this.submissionDateTime = submissionDateTime; + } + + public String getSubmissionDescription() { + return submissionDescription; + } + + public void setSubmissionDescription(String submissionDescription) { + this.submissionDescription = submissionDescription; + } + + public String getSubmissionStatus() { + return submissionStatus; + } + + public void setSubmissionStatus(String submissionStatus) { + this.submissionStatus = submissionStatus; + } +} diff --git a/src/main/java/com/techlooper/service/ChallengeService.java b/src/main/java/com/techlooper/service/ChallengeService.java index 76ebcd4ca..5df7be1ad 100644 --- a/src/main/java/com/techlooper/service/ChallengeService.java +++ b/src/main/java/com/techlooper/service/ChallengeService.java @@ -19,71 +19,73 @@ */ public interface ChallengeService { - ChallengeEntity savePostChallenge(ChallengeDto challengeDto) throws Exception; + ChallengeEntity savePostChallenge(ChallengeDto challengeDto) throws Exception; - void sendPostChallengeEmailToEmployer(ChallengeEntity challengeEntity) - throws MessagingException, IOException, TemplateException; + void sendPostChallengeEmailToEmployer(ChallengeEntity challengeEntity) + throws MessagingException, IOException, TemplateException; - void sendPostChallengeEmailToTechloopies(ChallengeEntity challengeEntity, Boolean isNewChallenge) - throws MessagingException, IOException, TemplateException; + void sendPostChallengeEmailToTechloopies(ChallengeEntity challengeEntity, Boolean isNewChallenge) + throws MessagingException, IOException, TemplateException; - void sendEmailNotifyRegistrantAboutChallengeTimeline(ChallengeEntity challengeEntity, - ChallengeRegistrantEntity challengeRegistrantEntity, ChallengePhaseEnum challengePhase) throws Exception; + void sendEmailNotifyRegistrantAboutChallengeTimeline(ChallengeEntity challengeEntity, + ChallengeRegistrantEntity challengeRegistrantEntity, ChallengePhaseEnum challengePhase) throws Exception; - ChallengeDetailDto getChallengeDetail(Long challengeId); + ChallengeDetailDto getChallengeDetail(Long challengeId); - Long getNumberOfRegistrants(Long challengeId); + Long getNumberOfRegistrants(Long challengeId); - void sendApplicationEmailToContestant(ChallengeEntity challengeEntity, ChallengeRegistrantEntity challengeRegistrantEntity) - throws MessagingException, IOException, TemplateException; + void sendApplicationEmailToContestant(ChallengeEntity challengeEntity, ChallengeRegistrantEntity challengeRegistrantEntity) + throws MessagingException, IOException, TemplateException; - void sendApplicationEmailToEmployer(ChallengeEntity challengeEntity, ChallengeRegistrantEntity challengeRegistrantEntity) - throws MessagingException, IOException, TemplateException; + void sendApplicationEmailToEmployer(ChallengeEntity challengeEntity, ChallengeRegistrantEntity challengeRegistrantEntity) + throws MessagingException, IOException, TemplateException; - long joinChallenge(ChallengeRegistrantDto challengeRegistrantDto) throws MessagingException, IOException, TemplateException; + long joinChallenge(ChallengeRegistrantDto challengeRegistrantDto) throws MessagingException, IOException, TemplateException; - List listChallenges(); + List listChallenges(); - List listChallenges(String ownerEmail); + List listChallenges(String ownerEmail); - List listChallengesByPhase(ChallengePhaseEnum challengePhase); + List listChallengesByPhase(ChallengePhaseEnum challengePhase); - Long getTotalNumberOfChallenges(); + Long getTotalNumberOfChallenges(); - Double getTotalAmountOfPrizeValues(); + Double getTotalAmountOfPrizeValues(); - Long getTotalNumberOfRegistrants(); + Long getTotalNumberOfRegistrants(); - ChallengeDetailDto getTheLatestChallenge(); + ChallengeDetailDto getTheLatestChallenge(); - Collection findByOwnerAndCondition(String owner, Predicate condition); + Collection findByOwnerAndCondition(String owner, Predicate condition); - Collection findInProgressChallenges(String owner); + Collection findInProgressChallenges(String owner); // Collection findRegistrantsByChallengeId(Long challengeId); - Long countRegistrantsByChallengeId(Long challengeId); + Long countRegistrantsByChallengeId(Long challengeId); - boolean delete(Long id, String ownerEmail); + boolean delete(Long id, String ownerEmail); - ChallengeDto findChallengeById(Long id); + ChallengeDto findChallengeById(Long id); - Set findRegistrantsByOwner(String ownerEmail, Long challengeId); + Set findRegistrantsByOwner(String ownerEmail, Long challengeId); - ChallengeRegistrantDto saveRegistrant(String ownerEmail, ChallengeRegistrantDto challengeRegistrantDto); + ChallengeRegistrantDto saveRegistrant(String ownerEmail, ChallengeRegistrantDto challengeRegistrantDto); - List findChallengeRegistrantWithinPeriod( - Long challengeId, Long currentDateTime, TimePeriodEnum period); + List findChallengeRegistrantWithinPeriod( + Long challengeId, Long currentDateTime, TimePeriodEnum period); - List findChallengeSubmissionWithinPeriod( - Long challengeId, Long currentDateTime, TimePeriodEnum period); + List findChallengeSubmissionWithinPeriod( + Long challengeId, Long currentDateTime, TimePeriodEnum period); - void sendDailySummaryEmailToChallengeOwner(ChallengeEntity challengeEntity) throws Exception; + void sendDailySummaryEmailToChallengeOwner(ChallengeEntity challengeEntity) throws Exception; - boolean isOwnerOfChallenge(String ownerEmail, Long challengeId); + boolean isOwnerOfChallenge(String ownerEmail, Long challengeId); - boolean sendEmailToDailyChallengeRegistrants(String challengeOwner, Long challengeId, Long now, EmailContent emailContent); + boolean sendEmailToDailyChallengeRegistrants(String challengeOwner, Long challengeId, Long now, EmailContent emailContent); - boolean sendEmailToRegistrant(String challengeOwner, Long challengeId, Long registrantId, EmailContent emailContent); + boolean sendEmailToRegistrant(String challengeOwner, Long challengeId, Long registrantId, EmailContent emailContent); + + List findChallengeSubmissionByRegistrant(Long challengeId, Long registrantId); } diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index b341341fa..4d17e4c34 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -592,7 +592,11 @@ public Set findRegistrantsByOwner(String ownerEmail, Lon if (challengeIterator.hasNext()) { Iterator registrants = challengeRegistrantRepository.search(challengeQuery).iterator(); - registrants.forEachRemaining(registrant -> registrantDtos.add(dozerMapper.map(registrant, ChallengeRegistrantDto.class))); + registrants.forEachRemaining(registrant -> { + ChallengeRegistrantDto registrantDto = dozerMapper.map(registrant, ChallengeRegistrantDto.class); + registrantDto.setSubmissions(findChallengeSubmissionByRegistrant(challengeId, registrant.getRegistrantId())); + registrantDtos.add(registrantDto); + }); } return registrantDtos; @@ -734,19 +738,35 @@ public boolean sendEmailToDailyChallengeRegistrants(String challengeOwner, Long return emailService.sendEmail(emailContent); } - public boolean sendEmailToRegistrant(String challengeOwner, Long challengeId, Long registrantId, EmailContent emailContent) { - if (isOwnerOfChallenge(challengeOwner, challengeId)) { - ChallengeRegistrantEntity registrant = challengeRegistrantRepository.findOne(registrantId); - String csvEmails = registrant.getRegistrantEmail(); - try { - emailContent.setRecipients(InternetAddress.parse(csvEmails)); - } - catch (AddressException e) { - LOGGER.debug("Can not parse email address", e); - return false; - } + public boolean sendEmailToRegistrant(String challengeOwner, Long challengeId, Long registrantId, EmailContent emailContent) { + if (isOwnerOfChallenge(challengeOwner, challengeId)) { + ChallengeRegistrantEntity registrant = challengeRegistrantRepository.findOne(registrantId); + String csvEmails = registrant.getRegistrantEmail(); + try { + emailContent.setRecipients(InternetAddress.parse(csvEmails)); + } catch (AddressException e) { + LOGGER.debug("Can not parse email address", e); + return false; + } + } + return emailService.sendEmail(emailContent); + } + + @Override + public List findChallengeSubmissionByRegistrant(Long challengeId, Long registrantId) { + List result = new ArrayList<>(); + NativeSearchQueryBuilder searchQueryBuilder = new NativeSearchQueryBuilder().withTypes("challengeSubmission"); + BoolFilterBuilder boolFilterBuilder = new BoolFilterBuilder(); + boolFilterBuilder.must(termFilter("challengeId", challengeId)); + boolFilterBuilder.must(termFilter("registrantId", registrantId)); + + searchQueryBuilder.withQuery(filteredQuery(matchAllQuery(), boolFilterBuilder)); + Iterator iterator = challengeSubmissionRepository.search(searchQueryBuilder.build()).iterator(); + while (iterator.hasNext()) { + result.add(dozerMapper.map(iterator.next(), ChallengeSubmissionDto.class)); + } + + return result; } - return emailService.sendEmail(emailContent); - } } From 8168c24dd9e14e0e0d5524390ce5008a29b4fe78 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Tue, 6 Oct 2015 15:39:44 +0700 Subject: [PATCH 018/158] Enable status of join now button and submit button --- .../assets/modules/common/apiService.js | 2 + .../common/challenge/submissionChallenge.js | 1 + .../modules/common/filter/progressFilter.js | 18 ++++++--- .../assets/modules/contests/contest-list.html | 6 ++- .../assets/modules/contests/contests.con.js | 38 +++++++++++++++++-- 5 files changed, 55 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/assets/modules/common/apiService.js b/src/main/webapp/assets/modules/common/apiService.js index 2c3a5ecc5..dbe831ce9 100644 --- a/src/main/webapp/assets/modules/common/apiService.js +++ b/src/main/webapp/assets/modules/common/apiService.js @@ -73,6 +73,8 @@ techlooper.factory("apiService", function ($rootScope, $location, jsonValue, $ht $('body').addClass('noscroll'); utils.sendNotification(jsonValue.notifications.loading); instance.getSocialLoginUrl("FACEBOOK_REGISTER").success(function (url) { + localStorageService.set("priorFoot", $location.url()); + localStorageService.set("lastFoot", $location.url()); localStorageService.set("joinNow", true); window.location = url; }); diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js index 6ecbbcc8c..683f2f058 100644 --- a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js @@ -15,6 +15,7 @@ techlooper.directive("submissionChallenge", function ($timeout, jsonValue, utils console.log(scope.submissionDescription); console.log(scope.submissionURL); } + scope.hideSubmitForm = function(){ var subForm = $('.submit-phase-contest'); subForm.find('#txtDescription').val(''); diff --git a/src/main/webapp/assets/modules/common/filter/progressFilter.js b/src/main/webapp/assets/modules/common/filter/progressFilter.js index d8ddff7a6..6f84dddc2 100644 --- a/src/main/webapp/assets/modules/common/filter/progressFilter.js +++ b/src/main/webapp/assets/modules/common/filter/progressFilter.js @@ -1,38 +1,46 @@ -techlooper.filter("progress", function (jsonValue, resourcesService) { +techlooper.filter("progress", function (jsonValue, resourcesService, localStorageService) { var progressFn = function (input, type, param1) { if (!input) return ""; switch (type) { case "challenge": var contestDetail = input; + var joinContests = localStorageService.get("joinContests") || ""; + var email = localStorageService.get("email") || ""; + var isJoined = (joinContests.indexOf(contestDetail.challengeId) >= 0) && (email.length > 0); + contestDetail.currentUserJoined = isJoined; + //if current date < start date var startDate = moment(contestDetail.startDateTime, jsonValue.dateFormat); - contestDetail.progress = jsonValue.status.notStarted; + contestDetail.progress = angular.copy(jsonValue.status.notStarted); if (moment().isBefore(startDate, 'day')) { + delete contestDetail.currentUserJoined; return contestDetail.progress.translate; } //if start date <= current date <= register date var registrationDate = moment(contestDetail.registrationDateTime, jsonValue.dateFormat); - contestDetail.progress = jsonValue.status.registration; + contestDetail.progress = angular.copy(jsonValue.status.registration); if (moment().isBetween(startDate, registrationDate, 'day') || moment().isSame(startDate, 'day') || moment().isSame(registrationDate, 'day')) { return contestDetail.progress.translate; } // if register date < current date <= submit date var submissionDate = moment(contestDetail.submissionDateTime, jsonValue.dateFormat); - contestDetail.progress = jsonValue.status.progress; + contestDetail.progress = angular.copy(jsonValue.status.progress); if (moment().isBetween(registrationDate, submissionDate, 'day') || moment().isSame(submissionDate, 'day')) { return contestDetail.progress.translate; } // if submit date < current date - contestDetail.progress = jsonValue.status.closed; + contestDetail.progress = angular.copy(jsonValue.status.closed); if (submissionDate.isBefore(moment(), 'day')) { + delete contestDetail.currentUserJoined; return contestDetail.progress.translate; } delete contestDetail.progress; + delete contestDetail.currentUserJoined; return ""; case "challenges": diff --git a/src/main/webapp/assets/modules/contests/contest-list.html b/src/main/webapp/assets/modules/contests/contest-list.html index 2ee5a2d29..1d0769200 100644 --- a/src/main/webapp/assets/modules/contests/contest-list.html +++ b/src/main/webapp/assets/modules/contests/contest-list.html @@ -25,10 +25,12 @@ | - + | - | + + | +
diff --git a/src/main/webapp/assets/modules/contests/contests.con.js b/src/main/webapp/assets/modules/contests/contests.con.js index 2cf2ff8ef..258ce79fe 100644 --- a/src/main/webapp/assets/modules/contests/contests.con.js +++ b/src/main/webapp/assets/modules/contests/contests.con.js @@ -1,6 +1,33 @@ -techlooper.controller('contestsController', function (apiService, $scope, jsonValue, $window, $translate, $filter, utils) { +techlooper.controller('contestsController', function (apiService, $scope, jsonValue, $window, $translate, $filter, + utils, localStorageService) { utils.sendNotification(jsonValue.notifications.loading); - $scope.contestTimeLeft = function(contest) { + + if (localStorageService.get("joinNow")) { + localStorageService.remove("joinNow"); + var firstName = localStorageService.get("firstName"); + var lastName = localStorageService.get("lastName"); + var email = localStorageService.get("email"); + var contestId = localStorageService.get("joiningChallengeId"); + if (contestId) { + apiService.joinContest(contestId, firstName, lastName, email, $translate.use()) + .success(function (numberOfRegistrants) { + if ($scope.contestDetail) { + $scope.contestDetail.numberOfRegistrants = numberOfRegistrants; + } + + var joinContests = localStorageService.get("joinContests") || ""; + joinContests = joinContests.length > 0 ? joinContests.split(",") : []; + if ($.inArray(contestId, joinContests) < 0) { + joinContests.push(contestId); + } + + localStorageService.set("joinContests", joinContests.join(",")); + }); + localStorageService.remove("joiningChallengeId"); + } + } + + $scope.contestTimeLeft = function (contest) { if (!contest.progress) return ""; switch (contest.progress.translate) { case jsonValue.status.progress.translate: @@ -19,11 +46,16 @@ techlooper.controller('contestsController', function (apiService, $scope, jsonVa return ""; } - apiService.searchContests().success(function(contests) { + apiService.searchContests().success(function (contests) { //contests.sort(sortByStartDate); utils.sortByDate(contests, "startDateTime"); $scope.contestsList = contests; }).finally(function () { utils.sendNotification(jsonValue.notifications.loaded); }); + + $scope.joinNowByFB = function (challenge) { + localStorageService.set("joiningChallengeId", challenge.challengeId); + apiService.joinNowByFB(); + } }); \ No newline at end of file From fc18c10a063f350d5cbfc083ac3ce931851f182d Mon Sep 17 00:00:00 2001 From: Phuong H Date: Tue, 6 Oct 2015 16:12:00 +0700 Subject: [PATCH 019/158] Enable button join now and submit in contest-view --- .../contest-detail/contest-detail.con.js | 50 ++++++++++--------- .../contest-detail/contest-detail.tem.html | 2 +- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js index 5fe03480e..8732e9e8f 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js @@ -83,6 +83,7 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l } localStorageService.set("joinContests", joinContests.join(",")); + $filter("progress")($scope.contestDetail, "challenge"); }); } @@ -90,21 +91,23 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l .success(function (data) { $scope.contestDetail = data; $filter("progress")($scope.contestDetail, "challenge"); - var idea = $scope.contestDetail.ideaSubmissionDateTime? true : false, - uiux = $scope.contestDetail.uxSubmissionDateTime? true : false, - prototype = $scope.contestDetail.prototypeSubmissionDateTime? true : false; - if(!idea || !uiux || !prototype){ - if((idea && uiux) || (idea && prototype) || (prototype && uiux)){ - $scope.contestDetail.timeline = 4; - } - else if(((!idea && !uiux) && prototype) || ((!idea && !prototype) && uiux) || ((!prototype && !uiux) && idea)){ - $scope.contestDetail.timeline = 3; - }else{ - $scope.contestDetail.timeline = 2; - } - }else{ - $scope.contestDetail.timeline = 5; + var idea = $scope.contestDetail.ideaSubmissionDateTime ? true : false, + uiux = $scope.contestDetail.uxSubmissionDateTime ? true : false, + prototype = $scope.contestDetail.prototypeSubmissionDateTime ? true : false; + if (!idea || !uiux || !prototype) { + if ((idea && uiux) || (idea && prototype) || (prototype && uiux)) { + $scope.contestDetail.timeline = 4; } + else if (((!idea && !uiux) && prototype) || ((!idea && !prototype) && uiux) || ((!prototype && !uiux) && idea)) { + $scope.contestDetail.timeline = 3; + } + else { + $scope.contestDetail.timeline = 2; + } + } + else { + $scope.contestDetail.timeline = 5; + } }) .error(function () {$location.url("404");}); @@ -167,22 +170,23 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l $scope.sortStartDate = $(["asc", "desc"]).not([$scope.sortStartDate]).get()[0]; utils.sortByNumber($scope.registrants, "registrantId", $scope.sortStartDate); } - $scope.updateScore = function(registrant, $event) { + $scope.updateScore = function (registrant, $event) { $($event.currentTarget).addClass('green'); apiService.saveChallengeRegistrant(registrant) - .success(function (rt) { - registrant.score = rt.score; - }).finally(function () { - $timeout(function(){ + .success(function (rt) { + registrant.score = rt.score; + }).finally(function () { + $timeout(function () { $($event.currentTarget).removeClass('green'); - },1000); + }, 1000); }); } - $scope.showSubmitForm = function(){ + $scope.showSubmitForm = function () { var subForm = $('.submit-phase-contest'); - if(subForm.hasClass('show')){ + if (subForm.hasClass('show')) { subForm.removeClass('show'); - }else{ + } + else { subForm.addClass('show'); } } diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html b/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html index b5e71c764..755a0ef82 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html @@ -66,7 +66,7 @@

-

From d8a8a90321833887d8435252b0e178e8ddecf82e Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Tue, 6 Oct 2015 17:13:53 +0700 Subject: [PATCH 020/158] Add submissions field to challenge registrant dot --- .../entity/ChallengeRegistrantDto.java | 140 ++++++++++-------- 1 file changed, 77 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/techlooper/entity/ChallengeRegistrantDto.java b/src/main/java/com/techlooper/entity/ChallengeRegistrantDto.java index 6df3ec0cd..4a214087e 100644 --- a/src/main/java/com/techlooper/entity/ChallengeRegistrantDto.java +++ b/src/main/java/com/techlooper/entity/ChallengeRegistrantDto.java @@ -1,99 +1,113 @@ package com.techlooper.entity; +import com.techlooper.model.ChallengeSubmissionDto; import com.techlooper.model.Language; +import java.util.List; + /** * Created by NguyenDangKhoa on 7/6/15. */ public class ChallengeRegistrantDto { - private Long challengeId; + private Long challengeId; + + private String registrantEmail; + + private String registrantFirstName; + + private String registrantLastName; + + private Language lang; - private String registrantEmail; + private Double score; - private String registrantFirstName; + private Long registrantId; - private String registrantLastName; + private Boolean disqualified; - private Language lang; + private String disqualifiedReason; - private Double score; + private List submissions; - private Long registrantId; - private Boolean disqualified; + public String getDisqualifiedReason() { + return disqualifiedReason; + } - private String disqualifiedReason; + public void setDisqualifiedReason(String disqualifiedReason) { + this.disqualifiedReason = disqualifiedReason; + } - public String getDisqualifiedReason() { - return disqualifiedReason; - } + public Boolean getDisqualified() { + return disqualified; + } - public void setDisqualifiedReason(String disqualifiedReason) { - this.disqualifiedReason = disqualifiedReason; - } + public void setDisqualified(Boolean disqualified) { + this.disqualified = disqualified; + } - public Boolean getDisqualified() { - return disqualified; - } + public Long getRegistrantId() { + return registrantId; + } - public void setDisqualified(Boolean disqualified) { - this.disqualified = disqualified; - } + public void setRegistrantId(Long registrantId) { + this.registrantId = registrantId; + } - public Long getRegistrantId() { - return registrantId; - } + public Double getScore() { + return score; + } - public void setRegistrantId(Long registrantId) { - this.registrantId = registrantId; - } + public void setScore(Double score) { + this.score = score; + } - public Double getScore() { - return score; - } + public Long getChallengeId() { + return challengeId; + } - public void setScore(Double score) { - this.score = score; - } + public void setChallengeId(Long challengeId) { + this.challengeId = challengeId; + } - public Long getChallengeId() { - return challengeId; - } + public String getRegistrantEmail() { + return registrantEmail; + } - public void setChallengeId(Long challengeId) { - this.challengeId = challengeId; - } + public void setRegistrantEmail(String registrantEmail) { + this.registrantEmail = registrantEmail; + } - public String getRegistrantEmail() { - return registrantEmail; - } + public String getRegistrantFirstName() { + return registrantFirstName; + } - public void setRegistrantEmail(String registrantEmail) { - this.registrantEmail = registrantEmail; - } + public void setRegistrantFirstName(String registrantFirstName) { + this.registrantFirstName = registrantFirstName; + } - public String getRegistrantFirstName() { - return registrantFirstName; - } + public String getRegistrantLastName() { + return registrantLastName; + } - public void setRegistrantFirstName(String registrantFirstName) { - this.registrantFirstName = registrantFirstName; - } + public void setRegistrantLastName(String registrantLastName) { + this.registrantLastName = registrantLastName; + } - public String getRegistrantLastName() { - return registrantLastName; - } + public Language getLang() { + return lang; + } - public void setRegistrantLastName(String registrantLastName) { - this.registrantLastName = registrantLastName; - } + public void setLang(Language lang) { + this.lang = lang; + } - public Language getLang() { - return lang; - } + public List getSubmissions() { + return submissions; + } - public void setLang(Language lang) { - this.lang = lang; - } + public void setSubmissions(List submissions) { + this.submissions = submissions; + } } From 27dfa205db91cd21c6bde815979a6944c7375439 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Tue, 6 Oct 2015 17:47:09 +0700 Subject: [PATCH 021/158] Update daily sending email status for challenge contestant --- .../cron/ChallengeTimelineNotifier.java | 31 ++- .../entity/ChallengeRegistrantDto.java | 10 + .../entity/ChallengeRegistrantEntity.java | 207 ++++++++++-------- .../techlooper/model/EmailSentResultEnum.java | 19 ++ .../techlooper/service/ChallengeService.java | 2 + .../service/impl/ChallengeServiceImpl.java | 15 +- 6 files changed, 176 insertions(+), 108 deletions(-) create mode 100644 src/main/java/com/techlooper/model/EmailSentResultEnum.java diff --git a/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java b/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java index 786464401..426c52d3c 100644 --- a/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java +++ b/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java @@ -4,6 +4,7 @@ import com.techlooper.entity.ChallengeRegistrantDto; import com.techlooper.entity.ChallengeRegistrantEntity; import com.techlooper.model.ChallengePhaseEnum; +import com.techlooper.model.EmailSentResultEnum; import com.techlooper.service.ChallengeService; import org.apache.commons.lang3.StringUtils; import org.dozer.Mapper; @@ -15,9 +16,12 @@ import javax.annotation.Resource; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Set; +import static com.techlooper.util.DateTimeUtils.*; + @Service public class ChallengeTimelineNotifier { @@ -33,7 +37,7 @@ public class ChallengeTimelineNotifier { private Boolean enableJobAlert; @Scheduled(cron = "${scheduled.cron.notifyChallengeTimeline}") - public void notifyRegistrantAboutChallengeTimeline() throws Exception { + public synchronized void notifyRegistrantAboutChallengeTimeline() throws Exception { if (enableJobAlert) { List challengePhases = Arrays.asList(ChallengePhaseEnum.REGISTRATION, ChallengePhaseEnum.IN_PROGRESS); @@ -44,17 +48,24 @@ public void notifyRegistrantAboutChallengeTimeline() throws Exception { for (ChallengeEntity challengeEntity : challengeEntities) { Set challengeRegistrants = challengeService.findRegistrantsByOwner( challengeEntity.getAuthorEmail(), challengeEntity.getChallengeId()); - + for (ChallengeRegistrantDto challengeRegistrant : challengeRegistrants) { - ChallengeRegistrantEntity challengeRegistrantEntity = dozerMapper.map(challengeRegistrant, ChallengeRegistrantEntity.class); - try { - if (StringUtils.isNotEmpty(challengeRegistrantEntity.getRegistrantEmail())) { - challengeService.sendEmailNotifyRegistrantAboutChallengeTimeline( - challengeEntity, challengeRegistrantEntity, challengePhase); - count++; + Date lastSentDate = string2Date(challengeRegistrant.getLastEmailSentDateTime(), BASIC_DATE_TIME_PATTERN); + Date currentDate = new Date(); + + if (daysBetween(lastSentDate, currentDate) > 0) { + ChallengeRegistrantEntity challengeRegistrantEntity = dozerMapper.map(challengeRegistrant, ChallengeRegistrantEntity.class); + try { + if (StringUtils.isNotEmpty(challengeRegistrantEntity.getRegistrantEmail())) { + challengeService.sendEmailNotifyRegistrantAboutChallengeTimeline( + challengeEntity, challengeRegistrantEntity, challengePhase); + challengeService.updateSendEmailToContestantResultCode(challengeRegistrantEntity, EmailSentResultEnum.OK); + count++; + } + } catch (Exception ex) { + LOGGER.error(ex.getMessage(), ex); + challengeService.updateSendEmailToContestantResultCode(challengeRegistrantEntity, EmailSentResultEnum.ERROR); } - } catch (Exception ex) { - LOGGER.error(ex.getMessage(), ex); } } } diff --git a/src/main/java/com/techlooper/entity/ChallengeRegistrantDto.java b/src/main/java/com/techlooper/entity/ChallengeRegistrantDto.java index 4a214087e..0c3d69101 100644 --- a/src/main/java/com/techlooper/entity/ChallengeRegistrantDto.java +++ b/src/main/java/com/techlooper/entity/ChallengeRegistrantDto.java @@ -28,6 +28,8 @@ public class ChallengeRegistrantDto { private String disqualifiedReason; + private String lastEmailSentDateTime; + private List submissions; @@ -110,4 +112,12 @@ public List getSubmissions() { public void setSubmissions(List submissions) { this.submissions = submissions; } + + public String getLastEmailSentDateTime() { + return lastEmailSentDateTime; + } + + public void setLastEmailSentDateTime(String lastEmailSentDateTime) { + this.lastEmailSentDateTime = lastEmailSentDateTime; + } } diff --git a/src/main/java/com/techlooper/entity/ChallengeRegistrantEntity.java b/src/main/java/com/techlooper/entity/ChallengeRegistrantEntity.java index 646aac345..f8ff65297 100644 --- a/src/main/java/com/techlooper/entity/ChallengeRegistrantEntity.java +++ b/src/main/java/com/techlooper/entity/ChallengeRegistrantEntity.java @@ -2,14 +2,9 @@ import com.techlooper.model.Language; import org.springframework.data.annotation.Id; -import org.springframework.data.elasticsearch.annotations.Document; -import org.springframework.data.elasticsearch.annotations.Field; -import org.springframework.data.elasticsearch.annotations.FieldIndex; +import org.springframework.data.elasticsearch.annotations.*; -import static org.springframework.data.elasticsearch.annotations.FieldType.Boolean; -import static org.springframework.data.elasticsearch.annotations.FieldType.Double; -import static org.springframework.data.elasticsearch.annotations.FieldType.Long; -import static org.springframework.data.elasticsearch.annotations.FieldType.String; +import static org.springframework.data.elasticsearch.annotations.FieldType.*; /** * Created by NguyenDangKhoa on 7/3/15. @@ -17,123 +12,145 @@ @Document(indexName = "techlooper", type = "challengeRegistrant") public class ChallengeRegistrantEntity { - @Id - private Long registrantId; + @Id + private Long registrantId; - @Field(type = String, index = FieldIndex.not_analyzed) - private String registrantEmail; + @Field(type = String, index = FieldIndex.not_analyzed) + private String registrantEmail; - @Field(type = Long) - private Long challengeId; + @Field(type = Long) + private Long challengeId; - @Field(type = String) - private String registrantFirstName; + @Field(type = String) + private String registrantFirstName; - @Field(type = String) - private String registrantLastName; + @Field(type = String) + private String registrantLastName; - @Field(type = Boolean) - private Boolean mailSent; + @Field(type = Boolean) + private Boolean mailSent; - @Field(type = String, index = FieldIndex.not_analyzed) - private Language lang; + @Field(type = String, index = FieldIndex.not_analyzed) + private Language lang; - @Field(type = Double) - private Double score; + @Field(type = Double) + private Double score; - @Field(type = Boolean) - private Boolean disqualified; + @Field(type = Boolean) + private Boolean disqualified; - @Field(type = String, index = FieldIndex.not_analyzed) - private String disqualifiedReason; + @Field(type = String, index = FieldIndex.not_analyzed) + private String disqualifiedReason; - public ChallengeRegistrantEntity() { - } + @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "dd/MM/yyyy HH:mm") + private String lastEmailSentDateTime; - public ChallengeRegistrantEntity(Long registrantId, java.lang.String registrantEmail, java.lang.String registrantFirstName, String registrantLastName) { - this.registrantId = registrantId; - this.registrantEmail = registrantEmail; - this.registrantLastName = registrantLastName; - this.registrantFirstName = registrantFirstName; - } + @Field(type = Integer) + private int lastEmailSentResultCode; - public java.lang.String getDisqualifiedReason() { - return disqualifiedReason; - } + public ChallengeRegistrantEntity() { + } - public void setDisqualifiedReason(java.lang.String disqualifiedReason) { - this.disqualifiedReason = disqualifiedReason; - } + public ChallengeRegistrantEntity(Long registrantId, java.lang.String registrantEmail, java.lang.String registrantFirstName, String registrantLastName) { + this.registrantId = registrantId; + this.registrantEmail = registrantEmail; + this.registrantLastName = registrantLastName; + this.registrantFirstName = registrantFirstName; + } - public java.lang.Boolean getDisqualified() { - return disqualified; - } + public java.lang.String getDisqualifiedReason() { + return disqualifiedReason; + } - public void setDisqualified(java.lang.Boolean disqualified) { - this.disqualified = disqualified; - } + public void setDisqualifiedReason(java.lang.String disqualifiedReason) { + this.disqualifiedReason = disqualifiedReason; + } - public Double getScore() { - return score; - } + public java.lang.Boolean getDisqualified() { + return disqualified; + } - public void setScore(Double score) { - this.score = score; - } + public void setDisqualified(java.lang.Boolean disqualified) { + this.disqualified = disqualified; + } - public Long getRegistrantId() { - return registrantId; - } + public Double getScore() { + return score; + } - public void setRegistrantId(Long registrantId) { - this.registrantId = registrantId; - } + public void setScore(Double score) { + this.score = score; + } - public Long getChallengeId() { - return challengeId; - } + public Long getRegistrantId() { + return registrantId; + } - public void setChallengeId(Long challengeId) { - this.challengeId = challengeId; - } + public void setRegistrantId(Long registrantId) { + this.registrantId = registrantId; + } - public String getRegistrantEmail() { - return registrantEmail; - } + public Long getChallengeId() { + return challengeId; + } - public void setRegistrantEmail(String registrantEmail) { - this.registrantEmail = registrantEmail; - } + public void setChallengeId(Long challengeId) { + this.challengeId = challengeId; + } - public String getRegistrantFirstName() { - return registrantFirstName; - } + public String getRegistrantEmail() { + return registrantEmail; + } - public void setRegistrantFirstName(String registrantFirstName) { - this.registrantFirstName = registrantFirstName; - } + public void setRegistrantEmail(String registrantEmail) { + this.registrantEmail = registrantEmail; + } - public String getRegistrantLastName() { - return registrantLastName; - } + public String getRegistrantFirstName() { + return registrantFirstName; + } - public void setRegistrantLastName(String registrantLastName) { - this.registrantLastName = registrantLastName; - } + public void setRegistrantFirstName(String registrantFirstName) { + this.registrantFirstName = registrantFirstName; + } - public Boolean getMailSent() { - return mailSent; - } + public String getRegistrantLastName() { + return registrantLastName; + } - public void setMailSent(Boolean mailSent) { - this.mailSent = mailSent; - } + public void setRegistrantLastName(String registrantLastName) { + this.registrantLastName = registrantLastName; + } - public Language getLang() { - return lang; - } + public Boolean getMailSent() { + return mailSent; + } - public void setLang(Language lang) { - this.lang = lang; - } + public void setMailSent(Boolean mailSent) { + this.mailSent = mailSent; + } + + public Language getLang() { + return lang; + } + + public void setLang(Language lang) { + this.lang = lang; + } + + public String getLastEmailSentDateTime() { + return lastEmailSentDateTime; + } + + public void setLastEmailSentDateTime(String lastEmailSentDateTime) { + this.lastEmailSentDateTime = lastEmailSentDateTime; + } + + public int getLastEmailSentResultCode() { + return lastEmailSentResultCode; + } + + public void setLastEmailSentResultCode(int lastEmailSentResultCode) { + this.lastEmailSentResultCode = lastEmailSentResultCode; + } } diff --git a/src/main/java/com/techlooper/model/EmailSentResultEnum.java b/src/main/java/com/techlooper/model/EmailSentResultEnum.java new file mode 100644 index 000000000..b457d7d68 --- /dev/null +++ b/src/main/java/com/techlooper/model/EmailSentResultEnum.java @@ -0,0 +1,19 @@ +package com.techlooper.model; + +public enum EmailSentResultEnum { + + OK(200), + + ERROR(500); + + private int value; + + private EmailSentResultEnum(int value) { + this.value = value; + } + + public int getValue() { + return value; + } + +} diff --git a/src/main/java/com/techlooper/service/ChallengeService.java b/src/main/java/com/techlooper/service/ChallengeService.java index 5df7be1ad..b4d229805 100644 --- a/src/main/java/com/techlooper/service/ChallengeService.java +++ b/src/main/java/com/techlooper/service/ChallengeService.java @@ -88,4 +88,6 @@ List findChallengeSubmissionWithinPeriod( List findChallengeSubmissionByRegistrant(Long challengeId, Long registrantId); + void updateSendEmailToContestantResultCode(ChallengeRegistrantEntity challengeRegistrantEntity, EmailSentResultEnum code); + } diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 4d17e4c34..6b4861974 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -10,7 +10,6 @@ import com.techlooper.repository.elasticsearch.ChallengeSubmissionRepository; import com.techlooper.service.ChallengeService; import com.techlooper.service.EmailService; -import com.techlooper.util.DateTimeUtils; import freemarker.template.Template; import freemarker.template.TemplateException; import org.apache.commons.lang3.StringUtils; @@ -51,6 +50,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import static com.techlooper.util.DateTimeUtils.*; import static org.elasticsearch.index.query.FilterBuilders.*; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.search.aggregations.AggregationBuilders.sum; @@ -224,9 +224,9 @@ public void sendEmailNotifyRegistrantAboutChallengeTimeline(ChallengeEntity chal int numberOfDays = 0; if (challengePhase == ChallengePhaseEnum.REGISTRATION) { - numberOfDays = DateTimeUtils.daysBetween(DateTimeUtils.currentDate(), challengeEntity.getRegistrationDateTime()) + 1; + numberOfDays = daysBetween(currentDate(), challengeEntity.getRegistrationDateTime()) + 1; } else if (challengePhase == ChallengePhaseEnum.IN_PROGRESS) { - numberOfDays = DateTimeUtils.daysBetween(DateTimeUtils.currentDate(), challengeEntity.getSubmissionDateTime()) + 1; + numberOfDays = daysBetween(currentDate(), challengeEntity.getSubmissionDateTime()) + 1; } templateModel.put("numberOfDays", numberOfDays); @@ -769,4 +769,13 @@ public List findChallengeSubmissionByRegistrant(Long cha return result; } + @Override + public void updateSendEmailToContestantResultCode(ChallengeRegistrantEntity challengeRegistrantEntity, EmailSentResultEnum code) { + if (challengeRegistrantEntity != null) { + challengeRegistrantEntity.setLastEmailSentDateTime(currentDate(BASIC_DATE_TIME_PATTERN)); + challengeRegistrantEntity.setLastEmailSentResultCode(code.getValue()); + challengeRegistrantRepository.save(challengeRegistrantEntity); + } + } + } From 4a37fcee7cd27b442332ff86fc68ac26150af95a Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 09:01:45 +0700 Subject: [PATCH 022/158] add submission list for registrants on the Challenge details page --- .../assets/modules/contest-detail/accept.html | 10 + .../contest-detail/contest-detail.con.js | 48 +++-- .../contest-detail.directive.js | 53 +++++ .../contest-detail/contest-detail.tem.html | 91 +++++--- .../modules/contest-detail/disqualify.html | 15 +- .../modules/contest-detail/qualify.html | 13 +- .../assets/modules/contest-detail/review.html | 55 +++++ .../modules/translation/messages_en.json | 8 +- .../webapp/assets/sass/contest-detail.sass | 203 +++++++++++++++--- src/main/webapp/assets/sass/main.sass | 19 +- 10 files changed, 411 insertions(+), 104 deletions(-) create mode 100644 src/main/webapp/assets/modules/contest-detail/accept.html create mode 100644 src/main/webapp/assets/modules/contest-detail/contest-detail.directive.js create mode 100644 src/main/webapp/assets/modules/contest-detail/review.html diff --git a/src/main/webapp/assets/modules/contest-detail/accept.html b/src/main/webapp/assets/modules/contest-detail/accept.html new file mode 100644 index 000000000..8576f295a --- /dev/null +++ b/src/main/webapp/assets/modules/contest-detail/accept.html @@ -0,0 +1,10 @@ +
+
+
+
+
    + +
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js index 5fe03480e..8b56cca2f 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js @@ -14,8 +14,9 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l title = utils.toAscii(title); return $location.url(sprintf("/challenge-detail/%s-%s-id", title, contestId)); } - - $scope.status = function (type) { + $scope.action = ''; + $scope.actionContent = ''; + $scope.status = function (type, id) { switch (type) { case "able-to-join": if (!$scope.contestDetail) return false; @@ -36,6 +37,19 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l case "contest-in-progress": if (!$scope.contestDetail) return false; return ($scope.contestDetail.progress.translate == jsonValue.status.progress.translate); + + case "feedback-form": + $scope.action = 'feedback'; + return $scope.action; + case "disqualify-form": + $scope.action = 'disqualify'; + return $scope.action; + case "qualify-form": + $scope.action = 'qualify'; + return $scope.action; + case "review-history": + $scope.action = 'review'; + return $scope.action; } } @@ -134,26 +148,6 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l }).finally(function () { utils.sendNotification(jsonValue.notifications.loaded); }); - - $scope.disqualify = function (registrant) { - registrant.disqualified = true; - apiService.saveChallengeRegistrant(registrant) - .success(function (rt) { - registrant.disqualified = rt.disqualified; - registrant.disqualifiedReason = rt.disqualifiedReason; - }); - }; - - $scope.qualify = function (registrant) { - delete registrant.disqualified; - delete registrant.disqualifiedReason; - apiService.saveChallengeRegistrant(registrant) - .success(function (rt) { - registrant.disqualified = rt.disqualified; - registrant.disqualifiedReason = rt.disqualifiedReason; - }); - }; - $scope.sortByScore = function () { delete $scope.sortStartDate; $scope.sortScore = $scope.sortScore || "asc"; @@ -186,5 +180,15 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l subForm.addClass('show'); } } + $scope.showActionForm = function(id){ + $('.action-content').removeClass('show'); + var parent = $('#id-'+id); + var div = parent.find('.action-content'); + if(div.hasClass('show')){ + div.removeClass('show'); + }else{ + div.addClass('show'); + } + } }); diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.directive.js b/src/main/webapp/assets/modules/contest-detail/contest-detail.directive.js new file mode 100644 index 000000000..63f982f92 --- /dev/null +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.directive.js @@ -0,0 +1,53 @@ +techlooper.directive('reviewSubmittedHistory', function (apiService) { + return { + restrict: "E", + replace: true, + templateUrl: "modules/contest-detail/review.html", + link: function (scope, el, attrs) { + + } + }; +}).directive('disqualifyForm', function (apiService) { + return { + restrict: "E", + replace: true, + scope: true, + templateUrl: "modules/contest-detail/disqualify.html", + link: function (scope, el, attrs) { + console.log('a', scope.action); + scope.disqualify = function (registrant) { + registrant.disqualified = true; + apiService.saveChallengeRegistrant(registrant) + .success(function (rt) { + registrant.disqualified = rt.disqualified; + registrant.disqualifiedReason = rt.disqualifiedReason; + }).finally(function () { + console.log('b', scope.action); + scope.action = ''; + }); + }; + } + }; +}).directive('qualifyForm', function (apiService) { + return { + restrict: "E", + replace: true, + scope: true, + templateUrl: "modules/contest-detail/qualify.html", + link: function (scope, el, attrs) { + scope.qualify = function (registrant) { + console.log('xx', scope.action); + delete registrant.disqualified; + delete registrant.disqualifiedReason; + apiService.saveChallengeRegistrant(registrant) + .success(function (rt) { + registrant.disqualified = rt.disqualified; + registrant.disqualifiedReason = rt.disqualifiedReason; + }).finally(function () { + console.log('xx', scope.action); + scope.action = ''; + }); + }; + } + }; +}); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html b/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html index b5e71c764..edbdf7e79 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html +++ b/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html @@ -181,40 +181,71 @@

- - - - - - - - - - + + +
{{'fullNameField' | translate}}{{'registrationDate' | translate}} - - {{'score' | translate}} - - + +
+
+ {{'fullNameField' | translate}} +
+
+ {{'registrationDate' | translate}} + +
+
+ {{'score' | translate}} + +
+
+ {{'action' | translate}} +
+
{{'action' | translate}}
{{user.registrantFirstName}} {{user.registrantLastName}}{{user.registrantId | timestamp: 'number'}} - - - - - - {{user.disqualifiedReason}} -
+
+
+ {{user.registrantFirstName}} {{user.registrantLastName}} +
+
+ {{user.registrantId | timestamp: 'number'}} +
+
+ + +
+
+
+ + +
+
+
+
+ scope is {{action}} +
+ +
+ + + + +
+
diff --git a/src/main/webapp/assets/modules/contest-detail/disqualify.html b/src/main/webapp/assets/modules/contest-detail/disqualify.html index 8e634348b..bc4237e20 100644 --- a/src/main/webapp/assets/modules/contest-detail/disqualify.html +++ b/src/main/webapp/assets/modules/contest-detail/disqualify.html @@ -1,12 +1,11 @@ -
-
-
-
-

- -

+
+
+

+ +

+
- +
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/qualify.html b/src/main/webapp/assets/modules/contest-detail/qualify.html index 88723122d..f58cca095 100644 --- a/src/main/webapp/assets/modules/contest-detail/qualify.html +++ b/src/main/webapp/assets/modules/contest-detail/qualify.html @@ -1,10 +1,7 @@ -
-
-
-
-

- - -
+
+
+

+ +
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/review.html b/src/main/webapp/assets/modules/contest-detail/review.html new file mode 100644 index 000000000..aa2ea171f --- /dev/null +++ b/src/main/webapp/assets/modules/contest-detail/review.html @@ -0,0 +1,55 @@ +
+
+
+
+
+
+
+
+
+
+ Final App Submission 1th time +
+
+ http://techlooper.com/challenge-ui-ux-phase.zip +
+
+ 12/08/2015 +
+
+
+
+ Final App Submission 1th time +
+
+ http://techlooper.com/challenge-ui-ux-phase.zip +
+
+ 12/08/2015 +
+
+
+
+ Final App Submission 1th time +
+
+ http://techlooper.com/challenge-ui-ux-phase.zip +
+
+ 12/08/2015 +
+
+
+
+ Final App Submission 1th time +
+
+ http://techlooper.com/challenge-ui-ux-phase.zip +
+
+ 12/08/2015 +
+
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index 970b9a894..30ea52bdb 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -758,5 +758,11 @@ "submissionURLTips": "Input your submission link", "description":"Description: *", "descriptionSubmissionTips": "Write some lines to describe your submission to the challenge owner", - "submissionPhaseSuccessful": "Submission Successful" + "submissionPhaseSuccessful": "Submission Successful", + "review": "Review", + "feedback": "Feedback", + "subject": "Subject", + "submissionLink": "Submission Link", + "date": "Date", + "descriptionCol": "Description" } \ No newline at end of file diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index ddf80bbff..942c55512 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -232,14 +232,22 @@ border-bottom-right-radius: 5px border: 1px solid #ddd border-top: 0 - padding: 20px + padding: 20px 0 .registrants-paging display: inline-block clear: both text-align: right width: 100% + table.contests-table margin: 5px 0 10px 0 + td + padding: 0 + border: 0 + th + padding: 0 + border: 0 + border-bottom: 2px solid #337ab7 tr.qualify color: #929292 input @@ -252,43 +260,168 @@ line-height: 16px display: block word-break: break-all - td:nth-child(1) - //text-decoration: line-through - color: #c0c0c0 - td:nth-child(2) - //text-decoration: line-through + td color: #c0c0c0 - th:first-child - width: 55% - text-align: left - th:nth-child(2) - width: 20% - cursor: pointer - td:nth-child(2) - min-width: inherit - th:nth-child(3) - width: 10% - cursor: pointer - td:nth-child(3) - input - width: 60px + .action-content + display: none + .registrants-challenge-list + width: 100% + clear: both + .registrant-name + width: 55% + float: left + text-align: left + padding: 10px + .registration-date + width: 20% + float: left text-align: center - border-radius: 5px - border: 1px solid #d4d7d8 - button - height: 26px - border-radius: 5px - border: 1px solid #d4d7d8 - background-color: #fff - th:nth-child(3) - width: 15% - td - p.note + padding: 10px + .registration-score + width: 15% + float: left + text-align: center + padding: 10px + button + height: 24px + border-radius: 5px + border: 1px solid #d4d7d8 + background-color: #fff + input + width: 60px + text-align: center + border-radius: 3px + border: 1px solid #d4d7d8 + .registration-action + width: 10% + float: left text-align: right - padding-bottom: 10px - a + padding: 10px + a + margin: auto + width: auto + float: right + i + font-size: 20px + li + a + display: block + width: 100% + clear: both + cursor: pointer + text-align: left + font-size: 14px + padding: 0 5px 5px 5px + i + font-size: 14px + a:hover + color: #337ab7 + .dropdown-menu + right: 0 + left: inherit + .review-block + width: 100% + clear: both + display: inline-block + padding: 0 10px 10px 10px + .submitted-histories + width: 100% + clear: both + border: 1px solid #fff + padding: 0 10px + background-color: #f6f6f6 + display: inline-block + border-radius: 3px + .subject-col + width: 40% + float: left + text-align: left + .submission-link-col + width: 50% + float: left + text-align: left + a + text-align: left + color: #337ab7 + .date-col + width: 10% + float: left + text-align: right + .header-row + width: 100% font-weight: 400 - cursor: pointer + clear: both + border-bottom: 1px solid #fff + display: inline-block + padding: 10px 0 + .body-row + width: 100% + font-weight: 300 + clear: both + display: inline-block + .submitted-row + display: inline-block + clear: both + border-bottom: 1px solid #fff + width: 100% + padding: 5px 0 + .submitted-row:last-child + border-bottom: 0 + padding-bottom: 0 + .qualify-block + width: 100% + clear: both + display: inline-block + padding: 0 10px 10px 10px + .qualify-form + width: 100% + clear: both + border: 1px solid #fff + padding: 10px + background-color: #f6f6f6 + display: inline-block + border-radius: 3px + text-align: center + p + margin: 0 + padding: 0 0 10px 0 + text-align: center !important + .textarea-style + height: 60px + a + margin: auto + width: 120px + display: inline-block + color: #fff + .disqualify-block + width: 100% + clear: both + display: inline-block + padding: 0 10px 10px 10px + .disqualify-form + width: 100% + clear: both + border: 1px solid #fff + padding: 10px + background-color: #f6f6f6 + display: inline-block + border-radius: 3px + p + margin: 0 + padding: 0 + .textarea-style + height: 60px + .submission-disqualify + display: inline-block + clear: both + width: 100% + text-align: right + a + margin: auto + width: 120px + float: right + color: #fff + margin-left: 5px .submit-phase-contest.show height: 280px background-color: #f1f2f7 @@ -296,6 +429,8 @@ padding: 10px 20px margin-top: 10px float: left + + .col-md-12 padding: 0 .contest-content-item diff --git a/src/main/webapp/assets/sass/main.sass b/src/main/webapp/assets/sass/main.sass index d2d03ee3b..772e32c54 100644 --- a/src/main/webapp/assets/sass/main.sass +++ b/src/main/webapp/assets/sass/main.sass @@ -1640,7 +1640,7 @@ label.bootstrap-checkbox.disabled border-left-color: #828282 .popover.top > .arrow:after, .popover.top > .arrow - border-top-color: #828282 + border-top-color: #828282 !important .popover.bottom > .arrow:after, .popover.bottom > .arrow border-bottom-color: #828282 @@ -1665,6 +1665,23 @@ label.bootstrap-checkbox.disabled float: right .prev-tour margin-right: 0 +.popover.action-list-block + margin-top: -5px + padding-bottom: 0 + .popover-content + width: 120px + padding: 5px 0 0 + .action-list + ul + margin: 0 + padding: 0 + li + width: 100% + display: inline-block + clear: both + border-bottom: 1px solid #dddddd + li:last-child + border-bottom: 0 .bg-tour-giude background-color: #000 opacity: 0.1 From 84f11c135a13578bec3f798df0cbb1ef6f22e06b Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 09:19:51 +0700 Subject: [PATCH 023/158] update email template for challenge daily sumary --- src/main/resources/template/challengeDailySummary.en.ftl | 7 +++++-- src/main/resources/template/challengeDailySummary.vi.ftl | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/resources/template/challengeDailySummary.en.ftl b/src/main/resources/template/challengeDailySummary.en.ftl index b71eeda6c..31f8d2e1b 100644 --- a/src/main/resources/template/challengeDailySummary.en.ftl +++ b/src/main/resources/template/challengeDailySummary.en.ftl @@ -322,19 +322,22 @@ - +
${latestSubmission_index + 1} ${latestSubmission.registrantName}
- +
+
Review Feedback + Accept +
diff --git a/src/main/resources/template/challengeDailySummary.vi.ftl b/src/main/resources/template/challengeDailySummary.vi.ftl index 8c46889d0..cb216d6df 100644 --- a/src/main/resources/template/challengeDailySummary.vi.ftl +++ b/src/main/resources/template/challengeDailySummary.vi.ftl @@ -322,19 +322,22 @@ - +
${latestSubmission_index + 1} ${latestSubmission.registrantName}
- +
+
Xem Trước Phản Hồi + Đi Tiếp +
From 7a901c9f9b52acd5cd4565026f7d5ea1c7e1d663 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 10:59:10 +0700 Subject: [PATCH 024/158] update responsive for Challenge list page --- .../assets/modules/contests/contest-list.html | 6 ++ src/main/webapp/assets/sass/contests.sass | 2 + .../assets/sass/z-responsive-candidate.sass | 73 ++++++++++++++++++- 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/contests/contest-list.html b/src/main/webapp/assets/modules/contests/contest-list.html index 1d0769200..57ebc397d 100644 --- a/src/main/webapp/assets/modules/contests/contest-list.html +++ b/src/main/webapp/assets/modules/contests/contest-list.html @@ -1,27 +1,33 @@
+
{{contest.challengeName}} {{skill}}
+

{{contest.startDateTime}}

{{contest.registrationDateTime}}

{{contest.submissionDateTime}}

+

${{contest.firstPlaceReward | number:0}}

${{contest.secondPlaceReward | number:0}}

${{contest.thirdPlaceReward | number:0}}

+
+
{{contest.numberOfRegistrants}}
+
| diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass index a92575ef8..ae1b51655 100644 --- a/src/main/webapp/assets/sass/contests.sass +++ b/src/main/webapp/assets/sass/contests.sass @@ -175,6 +175,8 @@ width: 100% border-bottom: 1px solid #ddd padding: 25px 20px 10px 20px + .label-col + display: none .challenge-name-col height: auto a diff --git a/src/main/webapp/assets/sass/z-responsive-candidate.sass b/src/main/webapp/assets/sass/z-responsive-candidate.sass index 0c30e5f44..e7f0a312c 100644 --- a/src/main/webapp/assets/sass/z-responsive-candidate.sass +++ b/src/main/webapp/assets/sass/z-responsive-candidate.sass @@ -1227,7 +1227,6 @@ .contestant-page table.contests-table border: 0 - table.contests-table thead display: none @@ -1260,6 +1259,78 @@ text-align: right p text-align: right !important + .contests-list-management + .contest-list-management-header + display: none + .contest-list-management-body + .contest-item-row + padding: 5px + .label-col + display: block + font-weight: 500 + text-transform: capitalize + width: 100% + clear: both + .challenge-name-col + width: 100% + clear: both + padding-bottom: 10px + .challenge-timeline-col + width: 100% + clear: both + padding-bottom: 10px + text-align: left + .challenge-prize-col + width: 100% + clear: both + padding-bottom: 10px + text-align: left + p + width: 30% + float: left + clear: none + .challenge-current-phase-col + width: 100% + clear: both + padding-bottom: 10px + text-align: left + span + padding: 2px 15px + span.note + text-align: left + .challenge-registrants-col + width: 100% + clear: both + padding-bottom: 10px + text-align: left + .label-col + width: auto + padding-right: 10px + clear: none + float: left + .challenge-actions-col + width: 100% + clear: both + text-align: left + .submit-phase-contest.show + height: 350px + padding: 10px + .registrant-name + span + width: 100% + clear: both + .registrant-email + span + width: 100% + clear: both + .phase-description + label + width: 100% + clear: both + textarea + width: 100% + input + width: 100% .warning-alert-block .alert-warning top: auto From e2ed97d0dee31a4adca08c084905ad2833c040d7 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Wed, 7 Oct 2015 11:06:27 +0700 Subject: [PATCH 025/158] Able to toogle registrant menu --- src/main/webapp/assets/modules/_app.js | 4 +- .../assets/modules/contest-detail/accept.html | 4 +- .../contest-detail.directive.js | 53 ------ ...est-detail.tem.html => contestDetail.html} | 171 ++++++++++-------- .../contest-detail/contestDetailAction.html | 5 + ...tail.con.js => contestDetailController.js} | 22 ++- .../contest-detail/contestDetailDirective.js | 98 ++++++++++ ...tml => contestDetailDisqualification.html} | 0 ...y.html => contestDetailQualification.html} | 0 ...tml => contestDetailReviewSubmission.html} | 0 10 files changed, 216 insertions(+), 141 deletions(-) delete mode 100644 src/main/webapp/assets/modules/contest-detail/contest-detail.directive.js rename src/main/webapp/assets/modules/contest-detail/{contest-detail.tem.html => contestDetail.html} (70%) create mode 100644 src/main/webapp/assets/modules/contest-detail/contestDetailAction.html rename src/main/webapp/assets/modules/contest-detail/{contest-detail.con.js => contestDetailController.js} (95%) create mode 100644 src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js rename src/main/webapp/assets/modules/contest-detail/{disqualify.html => contestDetailDisqualification.html} (100%) rename src/main/webapp/assets/modules/contest-detail/{qualify.html => contestDetailQualification.html} (100%) rename src/main/webapp/assets/modules/contest-detail/{review.html => contestDetailReviewSubmission.html} (100%) diff --git a/src/main/webapp/assets/modules/_app.js b/src/main/webapp/assets/modules/_app.js index 4dc1d42bb..364380617 100644 --- a/src/main/webapp/assets/modules/_app.js +++ b/src/main/webapp/assets/modules/_app.js @@ -133,11 +133,11 @@ techlooper.config(["$routeProvider", "$translateProvider", "$authProvider", "loc controller: "loginController" }) .when("/contest-detail/:id", { - templateUrl: "modules/contest-detail/contest-detail.tem.html", + templateUrl: "modules/contest-detail/contestDetail.html", controller: "contestDetailController" }) .when("/challenge-detail/:id", { - templateUrl: "modules/contest-detail/contest-detail.tem.html", + templateUrl: "modules/contest-detail/contestDetail.html", controller: "contestDetailController" }) .when("/challenges", { diff --git a/src/main/webapp/assets/modules/contest-detail/accept.html b/src/main/webapp/assets/modules/contest-detail/accept.html index 8576f295a..935abfc64 100644 --- a/src/main/webapp/assets/modules/contest-detail/accept.html +++ b/src/main/webapp/assets/modules/contest-detail/accept.html @@ -2,9 +2,7 @@
-
    - -
+ ABC
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.directive.js b/src/main/webapp/assets/modules/contest-detail/contest-detail.directive.js deleted file mode 100644 index 63f982f92..000000000 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.directive.js +++ /dev/null @@ -1,53 +0,0 @@ -techlooper.directive('reviewSubmittedHistory', function (apiService) { - return { - restrict: "E", - replace: true, - templateUrl: "modules/contest-detail/review.html", - link: function (scope, el, attrs) { - - } - }; -}).directive('disqualifyForm', function (apiService) { - return { - restrict: "E", - replace: true, - scope: true, - templateUrl: "modules/contest-detail/disqualify.html", - link: function (scope, el, attrs) { - console.log('a', scope.action); - scope.disqualify = function (registrant) { - registrant.disqualified = true; - apiService.saveChallengeRegistrant(registrant) - .success(function (rt) { - registrant.disqualified = rt.disqualified; - registrant.disqualifiedReason = rt.disqualifiedReason; - }).finally(function () { - console.log('b', scope.action); - scope.action = ''; - }); - }; - } - }; -}).directive('qualifyForm', function (apiService) { - return { - restrict: "E", - replace: true, - scope: true, - templateUrl: "modules/contest-detail/qualify.html", - link: function (scope, el, attrs) { - scope.qualify = function (registrant) { - console.log('xx', scope.action); - delete registrant.disqualified; - delete registrant.disqualifiedReason; - apiService.saveChallengeRegistrant(registrant) - .success(function (rt) { - registrant.disqualified = rt.disqualified; - registrant.disqualifiedReason = rt.disqualifiedReason; - }).finally(function () { - console.log('xx', scope.action); - scope.action = ''; - }); - }; - } - }; -}); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html similarity index 70% rename from src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html rename to src/main/webapp/assets/modules/contest-detail/contestDetail.html index ab6a50e93..0487a71e6 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.tem.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -7,25 +7,30 @@

{{contestDetail.challengeName}}

- +
-
+

+

${{contestDetail.firstPlaceReward | number:0}}
-
+

${{contestDetail.secondPlaceReward | number:0}}
@@ -38,15 +43,19 @@

{{contestDetail.challengeName}}

-

-

-

+

+ +

+ +

+
  • {{contestDetail.startDateTime}}
    • @@ -56,32 +65,39 @@

-
+

-

+

+
- -
-
+

+

+
@@ -113,12 +129,13 @@

- {{contestDetail.prototypeSubmissionDateTime}} + {{contestDetail.prototypeSubmissionDateTime}}

- - - + + +
@@ -131,14 +148,17 @@

-

+ +

-

+ +

+

{{skill}} @@ -147,22 +167,27 @@

-

+ +

-

+ +

+

{{contestDetail.reviewStyle}}

+

-

+

+

{{contestDetail.qualityIdea}}

@@ -171,40 +196,41 @@

- - -
+ boundary-links="true"> + +
- - - -
-
-
- {{'fullNameField' | translate}} -
-
- {{'registrationDate' | translate}} - -
-
- {{'score' | translate}} - -
-
- {{'action' | translate}} + + + + - - - - + + + + + - -
+
+
+ {{'fullNameField' | translate}} +
+
+ {{'registrationDate' | translate}} + +
+
+ {{'score' | translate}} + +
+
+ {{'action' | translate}} +
- -
@@ -214,7 +240,8 @@

{{user.registrantId | timestamp: 'number'}}

- +
@@ -224,37 +251,35 @@

-
- scope is {{action}} -
- -
- - - - -
+
+ +
- - + boundary-links="true"> +
diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html b/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html new file mode 100644 index 000000000..04b1fb953 --- /dev/null +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html @@ -0,0 +1,5 @@ +
+ + + +
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js similarity index 95% rename from src/main/webapp/assets/modules/contest-detail/contest-detail.con.js rename to src/main/webapp/assets/modules/contest-detail/contestDetailController.js index ac777f337..ca1b03cae 100644 --- a/src/main/webapp/assets/modules/contest-detail/contest-detail.con.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -175,6 +175,7 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l }, 1000); }); } + $scope.showSubmitForm = function () { var subForm = $('.submit-phase-contest'); if (subForm.hasClass('show')) { @@ -184,15 +185,16 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l subForm.addClass('show'); } } - $scope.showActionForm = function(id){ - $('.action-content').removeClass('show'); - var parent = $('#id-'+id); - var div = parent.find('.action-content'); - if(div.hasClass('show')){ - div.removeClass('show'); - }else{ - div.addClass('show'); - } - } + + //$scope.showActionForm = function(id){ + // $('.action-content').removeClass('show'); + // var parent = $('#id-'+id); + // var div = parent.find('.action-content'); + // if(div.hasClass('show')){ + // div.removeClass('show'); + // }else{ + // div.addClass('show'); + // } + //} }); diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js new file mode 100644 index 000000000..786e97cd2 --- /dev/null +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js @@ -0,0 +1,98 @@ +techlooper + .directive("contestDetailAction", function ($rootScope, paginationService) { + return { + restrict: "E", + replace: true, + templateUrl: "modules/contest-detail/contestDetailAction.html", + scope: { + registrant: "=" + }, + link: function (scope, element, attr, ctrl) { + var showView = function (view) { + if ($rootScope.$eval("lastRegistrant.visible")) { + console.log($rootScope.lastRegistrant); + delete $rootScope.lastRegistrant.visible; + } + scope.registrant.visible = {}; + scope.registrant.visible[view] = true; + $rootScope.lastRegistrant = scope.registrant; + } + + scope.registrant.showDisqualification = function () { + showView("disqualification"); + } + + scope.registrant.showQualification = function () { + showView("qualification"); + } + + scope.registrant.showReviewSubmission = function () { + showView("reviewSubmission"); + } + + scope.$on("$destroy", function () { + if ($rootScope.lastRegistrant) delete $rootScope.lastRegistrant; + }); + + //scope.$watch(function () { + // return paginationService.getCurrentPage("__default"); + //}, function (currentPage, previousPage) { + // //if (currentPage != previousPage) { + // // + // //} + //}); + } + }; + }) + .directive('contestDetailReviewSubmission', function (apiService) { + return { + restrict: "E", + replace: true, + templateUrl: "modules/contest-detail/contestDetailReviewSubmission.html" + }; + }) + .directive('contestDetailDisqualification', function (apiService) { + return { + restrict: "E", + replace: true, + scope: true, + templateUrl: "modules/contest-detail/contestDetailDisqualification.html", + link: function (scope, element, attr, ctrl) { + //console.log('a', scope.action); + //scope.disqualify = function (registrant) { + // registrant.disqualified = true; + // apiService.saveChallengeRegistrant(registrant) + // .success(function (rt) { + // registrant.disqualified = rt.disqualified; + // registrant.disqualifiedReason = rt.disqualifiedReason; + // }).finally(function () { + // console.log('b', scope.action); + // scope.action = ''; + // }); + //}; + } + }; + }) + .directive('contestDetailQualification', function (apiService) { + return { + restrict: "E", + replace: true, + scope: true, + templateUrl: "modules/contest-detail/contestDetailQualification.html", + link: function (scope, element, attr, ctrl) { + //scope.qualify = function (registrant) { + // console.log('xx', scope.action); + // delete registrant.disqualified; + // delete registrant.disqualifiedReason; + // apiService.saveChallengeRegistrant(registrant) + // .success(function (rt) { + // registrant.disqualified = rt.disqualified; + // registrant.disqualifiedReason = rt.disqualifiedReason; + // }).finally(function () { + // console.log('xx', scope.action); + // scope.action = ''; + // }); + //}; + } + }; + }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/disqualify.html b/src/main/webapp/assets/modules/contest-detail/contestDetailDisqualification.html similarity index 100% rename from src/main/webapp/assets/modules/contest-detail/disqualify.html rename to src/main/webapp/assets/modules/contest-detail/contestDetailDisqualification.html diff --git a/src/main/webapp/assets/modules/contest-detail/qualify.html b/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html similarity index 100% rename from src/main/webapp/assets/modules/contest-detail/qualify.html rename to src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html diff --git a/src/main/webapp/assets/modules/contest-detail/review.html b/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html similarity index 100% rename from src/main/webapp/assets/modules/contest-detail/review.html rename to src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html From bf56ead31f487aa27df5c6eebd29e6498b2cb3f9 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 11:24:37 +0700 Subject: [PATCH 026/158] translate for sumission form on the Challenge list page --- .../assets/modules/contests/contest-list.html | 8 ++++---- .../assets/modules/translation/messages_en.json | 6 ++++-- .../assets/modules/translation/messages_vi.json | 16 +++++++++++++++- src/main/webapp/assets/sass/contests.sass | 4 ++-- .../assets/sass/z-responsive-candidate.sass | 5 ++++- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/assets/modules/contests/contest-list.html b/src/main/webapp/assets/modules/contests/contest-list.html index 57ebc397d..3588d2553 100644 --- a/src/main/webapp/assets/modules/contests/contest-list.html +++ b/src/main/webapp/assets/modules/contests/contest-list.html @@ -31,11 +31,11 @@ | - - | + + | - - | + + |
diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index 30ea52bdb..f9429c993 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -758,11 +758,13 @@ "submissionURLTips": "Input your submission link", "description":"Description: *", "descriptionSubmissionTips": "Write some lines to describe your submission to the challenge owner", - "submissionPhaseSuccessful": "Submission Successful", + "submissionPhaseSuccessful": "You have submitted successfully.", "review": "Review", "feedback": "Feedback", "subject": "Subject", "submissionLink": "Submission Link", "date": "Date", - "descriptionCol": "Description" + "descriptionCol": "Description", + "join": "Join", + "submitPhase": "Submit" } \ No newline at end of file diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json index bda671f95..68e55d74b 100644 --- a/src/main/webapp/assets/modules/translation/messages_vi.json +++ b/src/main/webapp/assets/modules/translation/messages_vi.json @@ -756,5 +756,19 @@ "challengePrototypeTips":"Đây là ngày kết thúc giai đoạn Prototype của cuộc thi và thí sinh phải nộp Prototype trước ngày này. Nhà Tổ Chức sẽ chịu trách nhiệm đánh giá Prototype và sẽ lựa chon các thí sinh với Prototype xuất sắc vào vòng tiếp theo.", "signInTitle": "Đăng nhập bằng chính tài khoản của bạn", "signInWithFaceBook": "Đăng nhập bằng Facebook", - "signInWithGooglePlus": "Đăng nhập bằng Google Plus" + "signInWithGooglePlus": "Đăng nhập bằng Google Plus", + "submissionURL": "URL bài gửi: *", + "submissionURLTips": "Nhập đường dẫn đến bài gửi", + "description":"Chú thích: *", + "descriptionSubmissionTips": "Chú thích cho bài gửi của bạn", + "submissionPhaseSuccessful": "Bạn đã gửi bài thành công.", + "review": "Xem bài", + "feedback": "Phản hồi", + "subject": "Subject", + "submissionLink": "URL bài gửi", + "date": "Date", + "descriptionCol": "Chú thích", + "join": "Tham Gia", + "submitPhase": "Gửi Bài" + } diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass index ae1b51655..c05f4e5a5 100644 --- a/src/main/webapp/assets/sass/contests.sass +++ b/src/main/webapp/assets/sass/contests.sass @@ -201,7 +201,7 @@ padding: 0 width: 100% span - width: 80px + width: 115px float: left text-align: left .challenge-prize-col @@ -216,7 +216,7 @@ width: auto font-size: 12px border-radius: 4px - padding: 2px 4px + padding: 0px 4px span.not-started background-color: #00bcd4 color: #fff diff --git a/src/main/webapp/assets/sass/z-responsive-candidate.sass b/src/main/webapp/assets/sass/z-responsive-candidate.sass index e7f0a312c..39fd99790 100644 --- a/src/main/webapp/assets/sass/z-responsive-candidate.sass +++ b/src/main/webapp/assets/sass/z-responsive-candidate.sass @@ -1313,7 +1313,7 @@ clear: both text-align: left .submit-phase-contest.show - height: 350px + height: 380px padding: 10px .registrant-name span @@ -1331,6 +1331,9 @@ width: 100% input width: 100% + div.error-messages + text-align: left + padding-left: 0 .warning-alert-block .alert-warning top: auto From fec0dd5ba6fc0e8a6e502677184a8f1d8f5725e8 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Wed, 7 Oct 2015 13:19:16 +0700 Subject: [PATCH 027/158] Able to cancel form --- .../contest-detail/contestDetailDirective.js | 25 +++++++++++++++++-- .../contestDetailDisqualification.html | 8 +++--- .../contestDetailQualification.html | 4 +-- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js index 786e97cd2..215880f0a 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js @@ -1,5 +1,5 @@ techlooper - .directive("contestDetailAction", function ($rootScope, paginationService) { + .directive("contestDetailAction", function ($rootScope, apiService) { return { restrict: "E", replace: true, @@ -10,9 +10,9 @@ techlooper link: function (scope, element, attr, ctrl) { var showView = function (view) { if ($rootScope.$eval("lastRegistrant.visible")) { - console.log($rootScope.lastRegistrant); delete $rootScope.lastRegistrant.visible; } + scope.registrant.visible = {}; scope.registrant.visible[view] = true; $rootScope.lastRegistrant = scope.registrant; @@ -34,6 +34,27 @@ techlooper if ($rootScope.lastRegistrant) delete $rootScope.lastRegistrant; }); + scope.registrant.qualify = function () { + delete scope.registrant.disqualified; + delete scope.registrant.disqualifiedReason; + apiService.saveChallengeRegistrant(scope.registrant) + .success(function(rt) { + $.extend(scope.registrant, {visible: {}}, rt); + }); + }; + + scope.registrant.disqualify = function () { + scope.registrant.disqualified = true; + apiService.saveChallengeRegistrant(scope.registrant) + .success(function(rt) { + $.extend(scope.registrant, {visible: {}}, rt); + }); + }; + + scope.registrant.hide = function() { + $.extend(scope.registrant, {visible: {}}); + }; + //scope.$watch(function () { // return paginationService.getCurrentPage("__default"); //}, function (currentPage, previousPage) { diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailDisqualification.html b/src/main/webapp/assets/modules/contest-detail/contestDetailDisqualification.html index bc4237e20..63e206c51 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailDisqualification.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailDisqualification.html @@ -1,11 +1,11 @@

- -

+ +

- - + +
\ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html b/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html index f58cca095..e94f4bfd1 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html @@ -1,7 +1,7 @@

- - + +
\ No newline at end of file From c0b6412642fa6db8fdaad26fba564c9a70797421 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 13:23:25 +0700 Subject: [PATCH 028/158] update style for submission list on the challenge details page --- src/main/webapp/assets/sass/contest-detail.sass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 942c55512..39a3f0426 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -301,6 +301,7 @@ margin: auto width: auto float: right + color: #333 i font-size: 20px li @@ -315,10 +316,16 @@ i font-size: 14px a:hover - color: #337ab7 + color: #333 + background-color: #f1f1f1 .dropdown-menu right: 0 left: inherit + background-color: #f1f1f1 + padding: 5px + button.btn-default + background-color: transparent + padding: 3px 10px .review-block width: 100% clear: both From b99c2526b1b8feecef75972e6ea9e7a98bbadea7 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 13:40:07 +0700 Subject: [PATCH 029/158] binding data for submission list --- .../contest-detail/contestDetailController.js | 1 + .../contestDetailReviewSubmission.html | 43 +++---------------- .../webapp/assets/sass/contest-detail.sass | 2 + 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index ca1b03cae..9ca166db2 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -122,6 +122,7 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l else { $scope.contestDetail.timeline = 5; } + console.log($scope.contestDetail); }) .error(function () {$location.url("404");}); diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html b/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html index aa2ea171f..3fe95994b 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html @@ -6,48 +6,17 @@
-
+
- Final App Submission 1th time + {{submission.submissionDescription}}
- http://techlooper.com/challenge-ui-ux-phase.zip + + {{submission.submissionURL}} +
- 12/08/2015 -
-
-
-
- Final App Submission 1th time -
-
- http://techlooper.com/challenge-ui-ux-phase.zip -
-
- 12/08/2015 -
-
-
-
- Final App Submission 1th time -
-
- http://techlooper.com/challenge-ui-ux-phase.zip -
-
- 12/08/2015 -
-
-
-
- Final App Submission 1th time -
-
- http://techlooper.com/challenge-ui-ux-phase.zip -
-
- 12/08/2015 + {{submission.submissionDateTime}}
diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 39a3f0426..3474d4825 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -326,6 +326,7 @@ button.btn-default background-color: transparent padding: 3px 10px + color: #333 .review-block width: 100% clear: both @@ -393,6 +394,7 @@ margin: 0 padding: 0 0 10px 0 text-align: center !important + color: #333 .textarea-style height: 60px a From 08bb83fc11ddd9f9f0cc5b4aa8e3cdf362e51554 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 13:44:32 +0700 Subject: [PATCH 030/158] show messages when dont have submission --- .../contest-detail/contestDetailReviewSubmission.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html b/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html index 3fe95994b..7c3d98fef 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html @@ -1,5 +1,8 @@
-
+
+

+
+
From 30044bc626079f5e582d304712a8e7219668adaa Mon Sep 17 00:00:00 2001 From: Phuong H Date: Wed, 7 Oct 2015 14:26:11 +0700 Subject: [PATCH 031/158] Fix registrant submission clear after clicking on button --- .../contest-detail/contestDetailDirective.js | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js index 215880f0a..fde52a714 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js @@ -1,5 +1,5 @@ techlooper - .directive("contestDetailAction", function ($rootScope, apiService) { + .directive("contestDetailAction", function ($rootScope, apiService, paginationService) { return { restrict: "E", replace: true, @@ -37,31 +37,29 @@ techlooper scope.registrant.qualify = function () { delete scope.registrant.disqualified; delete scope.registrant.disqualifiedReason; - apiService.saveChallengeRegistrant(scope.registrant) - .success(function(rt) { - $.extend(scope.registrant, {visible: {}}, rt); - }); + apiService.saveChallengeRegistrant(scope.registrant); + delete scope.registrant.visible; }; scope.registrant.disqualify = function () { scope.registrant.disqualified = true; apiService.saveChallengeRegistrant(scope.registrant) .success(function(rt) { - $.extend(scope.registrant, {visible: {}}, rt); + scope.registrant.disqualifiedReason = rt.disqualifiedReason; }); + delete scope.registrant.visible; }; scope.registrant.hide = function() { - $.extend(scope.registrant, {visible: {}}); + if (!scope.registrant.visible) return; + delete scope.registrant.visible; }; - //scope.$watch(function () { - // return paginationService.getCurrentPage("__default"); - //}, function (currentPage, previousPage) { - // //if (currentPage != previousPage) { - // // - // //} - //}); + scope.$watch(function () { + return paginationService.getCurrentPage("__default"); + }, function (currentPage, previousPage) { + scope.registrant.hide(); + }); } }; }) From 6a4826139e84794f9ad3cf6f79c153d73828aa08 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 14:50:17 +0700 Subject: [PATCH 032/158] add feedback form for registrants list on the challenge details page --- .../modules/common/feedback/feedback.html | 28 ++++++++++++++ .../common/feedback/feedbackDirective.js | 25 +++++++++++++ .../modules/contest-detail/contestDetail.html | 2 +- .../contest-detail/contestDetailAction.html | 1 + .../contest-detail/contestDetailDirective.js | 4 ++ .../webapp/assets/sass/contest-detail.sass | 37 ++++++++++++++++++- 6 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/assets/modules/common/feedback/feedback.html create mode 100644 src/main/webapp/assets/modules/common/feedback/feedbackDirective.js diff --git a/src/main/webapp/assets/modules/common/feedback/feedback.html b/src/main/webapp/assets/modules/common/feedback/feedback.html new file mode 100644 index 000000000..dfb50b912 --- /dev/null +++ b/src/main/webapp/assets/modules/common/feedback/feedback.html @@ -0,0 +1,28 @@ + diff --git a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js new file mode 100644 index 000000000..76a7752fa --- /dev/null +++ b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js @@ -0,0 +1,25 @@ +techlooper.directive("feedbackForm", function () { + return { + restrict: "E", + replace: true, + templateUrl: "modules/common/feedback/feedback.html", + scope: { + composeEmail: "=" + }, + link: function (scope, element, attr, ctrl) { + $('.summernote').summernote({ + toolbar: [ + ['fontname', ['fontname']], + ['fontsize', ['fontsize']], + ['style', ['bold', 'italic', 'underline', 'clear']], + ['color', ['color']], + ['para', ['ul', 'ol', 'paragraph']], + ['height', ['height']], + ['table', ['table']], + ['insert', ['link']], + ['misc', ['undo', 'redo', 'codeview', 'fullscreen']] + ] + }); + } + } +}); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 0487a71e6..6cc7253fc 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -263,7 +263,7 @@

  • {{'review' | translate}}
    • -
  • {{'feedback' | translate}}
    • +
  • {{'feedback' | translate}}

    • diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html b/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html index 04b1fb953..7d597ab82 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html @@ -2,4 +2,5 @@ +
    \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js index 215880f0a..f0a1875da 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js @@ -30,6 +30,10 @@ techlooper showView("reviewSubmission"); } + scope.registrant.showFeedback = function () { + showView("feedbackForm"); + } + scope.$on("$destroy", function () { if ($rootScope.lastRegistrant) delete $rootScope.lastRegistrant; }); diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 3474d4825..08b1860f1 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -340,6 +340,8 @@ background-color: #f6f6f6 display: inline-block border-radius: 3px + p.no-submission + padding: 10px 0 .subject-col width: 40% float: left @@ -426,11 +428,44 @@ width: 100% text-align: right a - margin: auto width: 120px float: right color: #fff margin-left: 5px + .feedback-block + clear: both + display: inline-block + width: 100% + padding: 0 10px 10px + .feedback-form + width: 100% + clear: both + border: 1px solid #fff + padding: 10px + background-color: #f6f6f6 + display: inline-block + border-radius: 3px + .mail-body + border: 0 + .mail-subject + padding: 10px 0 + .mail-text .note-editor + background-color: #fff + min-height: 200px + .note-toolbar + background-color: #f3fafe + .note-editable + background-color: #fff + .email-footer + text-align: right + padding: 10px 0 + a + width: auto + margin: auto auto auto 5px + padding: 6px 20px + color: #fff + display: inline-block + .submit-phase-contest.show height: 280px background-color: #f1f2f7 From d04221f44df6790e7c302974a14651d27e90fb57 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 15:05:57 +0700 Subject: [PATCH 033/158] add acceptance content for accept link on the challenge details page --- .../modules/contest-detail/contestDetail.html | 1 + .../contestDetailAcceptance.html | 7 +++ .../contest-detail/contestDetailAction.html | 1 + .../contest-detail/contestDetailDirective.js | 47 +++++++------------ .../contestDetailQualification.html | 2 +- .../modules/translation/messages_en.json | 4 +- .../modules/translation/messages_vi.json | 4 +- src/main/webapp/assets/sass/main.sass | 2 + 8 files changed, 36 insertions(+), 32 deletions(-) create mode 100644 src/main/webapp/assets/modules/contest-detail/contestDetailAcceptance.html diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 6cc7253fc..1c1f1ff12 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -264,6 +264,7 @@

  • {{'review' | translate}}
  • {{'feedback' | translate}}
    • +
  • {{'accept' | translate}}

    • diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailAcceptance.html b/src/main/webapp/assets/modules/contest-detail/contestDetailAcceptance.html new file mode 100644 index 000000000..a38f5f05d --- /dev/null +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailAcceptance.html @@ -0,0 +1,7 @@ +
    +
    +

    + + +
    +
    \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html b/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html index 7d597ab82..7b431869d 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailAction.html @@ -3,4 +3,5 @@ +
    \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js index 6d5adf304..0e8fd9cba 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js @@ -34,6 +34,11 @@ techlooper showView("feedbackForm"); } + scope.registrant.showAcceptance = function () { + showView("acceptance"); + } + + scope.$on("$destroy", function () { if ($rootScope.lastRegistrant) delete $rootScope.lastRegistrant; }); @@ -67,55 +72,39 @@ techlooper } }; }) - .directive('contestDetailReviewSubmission', function (apiService) { + .directive('contestDetailReviewSubmission', function () { return { restrict: "E", replace: true, templateUrl: "modules/contest-detail/contestDetailReviewSubmission.html" }; }) - .directive('contestDetailDisqualification', function (apiService) { + .directive('contestDetailDisqualification', function () { return { restrict: "E", replace: true, scope: true, templateUrl: "modules/contest-detail/contestDetailDisqualification.html", link: function (scope, element, attr, ctrl) { - //console.log('a', scope.action); - //scope.disqualify = function (registrant) { - // registrant.disqualified = true; - // apiService.saveChallengeRegistrant(registrant) - // .success(function (rt) { - // registrant.disqualified = rt.disqualified; - // registrant.disqualifiedReason = rt.disqualifiedReason; - // }).finally(function () { - // console.log('b', scope.action); - // scope.action = ''; - // }); - //}; } }; }) - .directive('contestDetailQualification', function (apiService) { + .directive('contestDetailQualification', function () { return { restrict: "E", replace: true, scope: true, templateUrl: "modules/contest-detail/contestDetailQualification.html", link: function (scope, element, attr, ctrl) { - //scope.qualify = function (registrant) { - // console.log('xx', scope.action); - // delete registrant.disqualified; - // delete registrant.disqualifiedReason; - // apiService.saveChallengeRegistrant(registrant) - // .success(function (rt) { - // registrant.disqualified = rt.disqualified; - // registrant.disqualifiedReason = rt.disqualifiedReason; - // }).finally(function () { - // console.log('xx', scope.action); - // scope.action = ''; - // }); - //}; } }; - }); \ No newline at end of file + }).directive('acceptance', function () { + return { + restrict: "E", + replace: true, + scope: true, + templateUrl: "modules/contest-detail/contestDetailAcceptance.html", + link: function (scope, element, attr, ctrl) { + } + }; +}); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html b/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html index e94f4bfd1..6b191e752 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailQualification.html @@ -1,7 +1,7 @@

    - +
    \ No newline at end of file diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index f9429c993..747a3bcc9 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -766,5 +766,7 @@ "date": "Date", "descriptionCol": "Description", "join": "Join", - "submitPhase": "Submit" + "submitPhase": "Submit", + "accept": "Accept", + "acceptDescription": "Are you sure you want to select this contestant from {{phase1}} phase to {{phase2}} phase?" } \ No newline at end of file diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json index 68e55d74b..e6bd1ad91 100644 --- a/src/main/webapp/assets/modules/translation/messages_vi.json +++ b/src/main/webapp/assets/modules/translation/messages_vi.json @@ -769,6 +769,8 @@ "date": "Date", "descriptionCol": "Chú thích", "join": "Tham Gia", - "submitPhase": "Gửi Bài" + "submitPhase": "Gửi Bài", + "accept": "Đi Tiếp", + "acceptDescription": "Bạn có muốn chọn thí sinh này từ vòng {{phase1}} vào vòng {{phase1}}?" } diff --git a/src/main/webapp/assets/sass/main.sass b/src/main/webapp/assets/sass/main.sass index 772e32c54..c32675458 100644 --- a/src/main/webapp/assets/sass/main.sass +++ b/src/main/webapp/assets/sass/main.sass @@ -64,6 +64,8 @@ textarea.change-color border: 1px solid #008000 !important transition: color 0.5s ease color: #008000 !important +.btn + padding: 7px 12px 3px 12px .btn-primary background-color: #337ab7 border-color: #2e6da4 From 4ab931f943a8d4c5552b5d5f83082b12785bf0cf Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Wed, 7 Oct 2015 15:08:04 +0700 Subject: [PATCH 034/158] Add the filter options to find challenge service --- .../controller/ChallengeController.java | 211 +++++++++--------- .../model/RegistrantFilterCondition.java | 57 +++++ .../techlooper/service/ChallengeService.java | 4 +- .../service/impl/ChallengeServiceImpl.java | 51 ++++- 4 files changed, 209 insertions(+), 114 deletions(-) create mode 100644 src/main/java/com/techlooper/model/RegistrantFilterCondition.java diff --git a/src/main/java/com/techlooper/controller/ChallengeController.java b/src/main/java/com/techlooper/controller/ChallengeController.java index e1387de44..89cbb13c6 100644 --- a/src/main/java/com/techlooper/controller/ChallengeController.java +++ b/src/main/java/com/techlooper/controller/ChallengeController.java @@ -25,115 +25,116 @@ @RestController public class ChallengeController { - private final static Logger LOGGER = LoggerFactory.getLogger(ChallengeController.class); - - @Resource - private ChallengeService challengeService; - - @Resource - private EmployerService employerService; - - @Resource - private LeadAPIService leadAPIService; - - @Resource - private ChallengeRegistrantRepository challengeRegistrantRepository; - - @PreAuthorize("hasAuthority('EMPLOYER')") - @RequestMapping(value = "/challenge/publish", method = RequestMethod.POST) - public ChallengeResponse publishChallenge(@RequestBody ChallengeDto challengeDto, HttpServletRequest servletRequest) throws Exception { - int responseCode = 0; - String employerEmail = servletRequest.getRemoteUser(); - challengeDto.setAuthorEmail(employerEmail); - ChallengeEntity challengeEntity = challengeService.savePostChallenge(challengeDto); - boolean newEntity = challengeDto.getChallengeId() == null; - if (newEntity) { - if (challengeEntity != null) { - if (EmailValidator.validate(challengeEntity.getAuthorEmail())) { - challengeService.sendPostChallengeEmailToEmployer(challengeEntity); + private final static Logger LOGGER = LoggerFactory.getLogger(ChallengeController.class); + + @Resource + private ChallengeService challengeService; + + @Resource + private EmployerService employerService; + + @Resource + private LeadAPIService leadAPIService; + + @Resource + private ChallengeRegistrantRepository challengeRegistrantRepository; + + @PreAuthorize("hasAuthority('EMPLOYER')") + @RequestMapping(value = "/challenge/publish", method = RequestMethod.POST) + public ChallengeResponse publishChallenge(@RequestBody ChallengeDto challengeDto, HttpServletRequest servletRequest) throws Exception { + int responseCode = 0; + String employerEmail = servletRequest.getRemoteUser(); + challengeDto.setAuthorEmail(employerEmail); + ChallengeEntity challengeEntity = challengeService.savePostChallenge(challengeDto); + boolean newEntity = challengeDto.getChallengeId() == null; + if (newEntity) { + if (challengeEntity != null) { + if (EmailValidator.validate(challengeEntity.getAuthorEmail())) { + challengeService.sendPostChallengeEmailToEmployer(challengeEntity); + } + challengeService.sendPostChallengeEmailToTechloopies(challengeEntity, Boolean.TRUE); + } + + // Call Lead Management API to create new lead on CRM system + try { + VnwUser employer = employerService.findEmployerByUsername(employerEmail); + VnwCompany company = employerService.findCompanyById(employer.getCompanyId()); + if (employer != null && company != null) { + responseCode = leadAPIService.createNewLead( + employer, company, LeadEventEnum.POST_CHALLENGE, challengeEntity.getChallengeName()); + + String logMessage = "Create Lead API Response Code : %d ,EmployerID : %d ,CompanyID : %d"; + LOGGER.info(String.format(logMessage, responseCode, employer.getUserId(), company.getCompanyId())); + } + } catch (Exception ex) { + LOGGER.error(ex.getMessage(), ex); + } + } else { + challengeService.sendPostChallengeEmailToTechloopies(challengeEntity, Boolean.FALSE); } - challengeService.sendPostChallengeEmailToTechloopies(challengeEntity, Boolean.TRUE); - } - - // Call Lead Management API to create new lead on CRM system - try { - VnwUser employer = employerService.findEmployerByUsername(employerEmail); - VnwCompany company = employerService.findCompanyById(employer.getCompanyId()); - if (employer != null && company != null) { - responseCode = leadAPIService.createNewLead( - employer, company, LeadEventEnum.POST_CHALLENGE, challengeEntity.getChallengeName()); - - String logMessage = "Create Lead API Response Code : %d ,EmployerID : %d ,CompanyID : %d"; - LOGGER.info(String.format(logMessage, responseCode, employer.getUserId(), company.getCompanyId())); + + return new ChallengeResponse(challengeEntity.getChallengeId(), responseCode); + } + + @RequestMapping(value = "/challenge/{challengeId}", method = RequestMethod.GET) + public ChallengeDetailDto getChallengeDetail(@PathVariable Long challengeId, HttpServletResponse response) throws Exception { + ChallengeDetailDto challengeDetail = challengeService.getChallengeDetail(challengeId); + if (challengeDetail == null) response.setStatus(HttpServletResponse.SC_NOT_FOUND); + return challengeDetail; + } + + @RequestMapping(value = "/challenge/join", method = RequestMethod.POST) + public long joinChallenge(@RequestBody ChallengeRegistrantDto joinChallenge) throws Exception { + return challengeService.joinChallenge(joinChallenge); + } + + @RequestMapping(value = "/challenge/list", method = RequestMethod.GET) + public List listChallenges() throws Exception { + return challengeService.listChallenges(); + } + + @RequestMapping(value = "/challenge/stats", method = RequestMethod.GET) + public ChallengeStatsDto getChallengeStatistics() throws Exception { + ChallengeStatsDto challengeStatsDto = new ChallengeStatsDto(); + challengeStatsDto.setNumberOfChallenges(challengeService.getTotalNumberOfChallenges()); + challengeStatsDto.setNumberOfRegistrants(challengeService.getTotalNumberOfRegistrants()); + challengeStatsDto.setTotalPrizeAmount(challengeService.getTotalAmountOfPrizeValues()); + return challengeStatsDto; + } + + @PreAuthorize("hasAuthority('EMPLOYER')") + @RequestMapping(value = "/challenge/{id}", method = RequestMethod.DELETE) + public void deleteChallengeById(@PathVariable Long id, HttpServletRequest request, HttpServletResponse response) { + if (!challengeService.delete(id, request.getRemoteUser())) { + response.setStatus(HttpServletResponse.SC_FORBIDDEN); } - } - catch (Exception ex) { - LOGGER.error(ex.getMessage(), ex); - } } - else { - challengeService.sendPostChallengeEmailToTechloopies(challengeEntity, Boolean.FALSE); + + @RequestMapping(value = "/challenges/{challengeId}", method = RequestMethod.GET) + public ChallengeDto findChallengeById(@PathVariable Long challengeId) throws Exception { + return challengeService.findChallengeById(challengeId); + } + + @PreAuthorize("hasAuthority('EMPLOYER')") + @RequestMapping(value = "/challenges/{challengeId}/registrants", method = RequestMethod.POST) + public Set getRegistrantsById(@PathVariable Long challengeId, + @RequestBody RegistrantFilterCondition condition, HttpServletRequest request) { + condition.setChallengeId(challengeId); + condition.setAuthorEmail(request.getRemoteUser()); + return challengeService.findRegistrantsByOwner(condition); + } + + + @PreAuthorize("hasAuthority('EMPLOYER')") + @RequestMapping(value = "/challengeDetail/registrant", method = RequestMethod.POST) + public ChallengeRegistrantDto saveRegistrant(@RequestBody ChallengeRegistrantDto dto, HttpServletRequest request) { + return challengeService.saveRegistrant(request.getRemoteUser(), dto); } - return new ChallengeResponse(challengeEntity.getChallengeId(), responseCode); - } - - @RequestMapping(value = "/challenge/{challengeId}", method = RequestMethod.GET) - public ChallengeDetailDto getChallengeDetail(@PathVariable Long challengeId, HttpServletResponse response) throws Exception { - ChallengeDetailDto challengeDetail = challengeService.getChallengeDetail(challengeId); - if (challengeDetail == null) response.setStatus(HttpServletResponse.SC_NOT_FOUND); - return challengeDetail; - } - - @RequestMapping(value = "/challenge/join", method = RequestMethod.POST) - public long joinChallenge(@RequestBody ChallengeRegistrantDto joinChallenge) throws Exception { - return challengeService.joinChallenge(joinChallenge); - } - - @RequestMapping(value = "/challenge/list", method = RequestMethod.GET) - public List listChallenges() throws Exception { - return challengeService.listChallenges(); - } - - @RequestMapping(value = "/challenge/stats", method = RequestMethod.GET) - public ChallengeStatsDto getChallengeStatistics() throws Exception { - ChallengeStatsDto challengeStatsDto = new ChallengeStatsDto(); - challengeStatsDto.setNumberOfChallenges(challengeService.getTotalNumberOfChallenges()); - challengeStatsDto.setNumberOfRegistrants(challengeService.getTotalNumberOfRegistrants()); - challengeStatsDto.setTotalPrizeAmount(challengeService.getTotalAmountOfPrizeValues()); - return challengeStatsDto; - } - - @PreAuthorize("hasAuthority('EMPLOYER')") - @RequestMapping(value = "/challenge/{id}", method = RequestMethod.DELETE) - public void deleteChallengeById(@PathVariable Long id, HttpServletRequest request, HttpServletResponse response) { - if (!challengeService.delete(id, request.getRemoteUser())) { - response.setStatus(HttpServletResponse.SC_FORBIDDEN); + @PreAuthorize("hasAuthority('EMPLOYER')") + @RequestMapping(value = "challengeRegistrant/fullName/{registrantId}", method = RequestMethod.GET) + public String getChallengeRegistrant(@PathVariable Long registrantId) { + ChallengeRegistrantEntity registrantEntity = challengeRegistrantRepository.findOne(registrantId); + return registrantEntity.getRegistrantFirstName() + " " + registrantEntity.getRegistrantLastName(); } - } - - @RequestMapping(value = "/challenges/{challengeId}", method = RequestMethod.GET) - public ChallengeDto findChallengeById(@PathVariable Long challengeId) throws Exception { - return challengeService.findChallengeById(challengeId); - } - - @PreAuthorize("hasAuthority('EMPLOYER')") - @RequestMapping(value = "/challenges/{challengeId}/registrants", method = RequestMethod.GET) - public Set getRegistrantsById(@PathVariable Long challengeId, HttpServletRequest request, HttpServletResponse response) { - return challengeService.findRegistrantsByOwner(request.getRemoteUser(), challengeId); - } - - - @PreAuthorize("hasAuthority('EMPLOYER')") - @RequestMapping(value = "/challengeDetail/registrant", method = RequestMethod.POST) - public ChallengeRegistrantDto saveRegistrant(@RequestBody ChallengeRegistrantDto dto, HttpServletRequest request) { - return challengeService.saveRegistrant(request.getRemoteUser(), dto); - } - - @PreAuthorize("hasAuthority('EMPLOYER')") - @RequestMapping(value = "challengeRegistrant/fullName/{registrantId}", method = RequestMethod.GET) - public String getChallengeRegistrant(@PathVariable Long registrantId) { - ChallengeRegistrantEntity registrantEntity = challengeRegistrantRepository.findOne(registrantId); - return registrantEntity.getRegistrantFirstName() + " " + registrantEntity.getRegistrantLastName(); - } } diff --git a/src/main/java/com/techlooper/model/RegistrantFilterCondition.java b/src/main/java/com/techlooper/model/RegistrantFilterCondition.java new file mode 100644 index 000000000..52786de63 --- /dev/null +++ b/src/main/java/com/techlooper/model/RegistrantFilterCondition.java @@ -0,0 +1,57 @@ +package com.techlooper.model; + +/** + * Created by NguyenDangKhoa on 10/7/15. + */ +public class RegistrantFilterCondition { + + private String authorEmail; + + private Long challengeId; + + private String filterType; + + private String fromDate; + + private String toDate; + + public String getAuthorEmail() { + return authorEmail; + } + + public void setAuthorEmail(String authorEmail) { + this.authorEmail = authorEmail; + } + + public Long getChallengeId() { + return challengeId; + } + + public void setChallengeId(Long challengeId) { + this.challengeId = challengeId; + } + + public String getFilterType() { + return filterType; + } + + public void setFilterType(String filterType) { + this.filterType = filterType; + } + + public String getFromDate() { + return fromDate; + } + + public void setFromDate(String fromDate) { + this.fromDate = fromDate; + } + + public String getToDate() { + return toDate; + } + + public void setToDate(String toDate) { + this.toDate = toDate; + } +} diff --git a/src/main/java/com/techlooper/service/ChallengeService.java b/src/main/java/com/techlooper/service/ChallengeService.java index b4d229805..c877c0157 100644 --- a/src/main/java/com/techlooper/service/ChallengeService.java +++ b/src/main/java/com/techlooper/service/ChallengeService.java @@ -68,13 +68,15 @@ void sendApplicationEmailToEmployer(ChallengeEntity challengeEntity, ChallengeRe ChallengeDto findChallengeById(Long id); - Set findRegistrantsByOwner(String ownerEmail, Long challengeId); + Set findRegistrantsByOwner(RegistrantFilterCondition condition); ChallengeRegistrantDto saveRegistrant(String ownerEmail, ChallengeRegistrantDto challengeRegistrantDto); List findChallengeRegistrantWithinPeriod( Long challengeId, Long currentDateTime, TimePeriodEnum period); + List filterChallengeRegistrantByDate(RegistrantFilterCondition condition); + List findChallengeSubmissionWithinPeriod( Long challengeId, Long currentDateTime, TimePeriodEnum period); diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 6b4861974..27d526114 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -574,15 +574,15 @@ public ChallengeDto findChallengeById(Long id) { return dozerMapper.map(challengeRepository.findOne(id), ChallengeDto.class); } - public Set findRegistrantsByOwner(String ownerEmail, Long challengeId) { + public Set findRegistrantsByOwner(RegistrantFilterCondition condition) { BoolQueryBuilder boolQueryBuilder = boolQuery(); - if (StringUtils.isNotEmpty(ownerEmail)) { - boolQueryBuilder.must(matchQuery("authorEmail", ownerEmail).minimumShouldMatch("100%")); + if (StringUtils.isNotEmpty(condition.getAuthorEmail())) { + boolQueryBuilder.must(matchQuery("authorEmail", condition.getAuthorEmail()).minimumShouldMatch("100%")); } - TermQueryBuilder challengeQuery = termQuery("challengeId", challengeId); - if (challengeId != null) { + TermQueryBuilder challengeQuery = termQuery("challengeId", condition.getChallengeId()); + if (condition.getChallengeId() != null) { boolQueryBuilder.must(challengeQuery); } @@ -591,10 +591,10 @@ public Set findRegistrantsByOwner(String ownerEmail, Lon Set registrantDtos = new HashSet<>(); if (challengeIterator.hasNext()) { - Iterator registrants = challengeRegistrantRepository.search(challengeQuery).iterator(); - registrants.forEachRemaining(registrant -> { + List registrants = filterChallengeRegistrantByDate(condition); + registrants.forEach(registrant -> { ChallengeRegistrantDto registrantDto = dozerMapper.map(registrant, ChallengeRegistrantDto.class); - registrantDto.setSubmissions(findChallengeSubmissionByRegistrant(challengeId, registrant.getRegistrantId())); + registrantDto.setSubmissions(findChallengeSubmissionByRegistrant(condition.getChallengeId(), registrant.getRegistrantId())); registrantDtos.add(registrantDto); }); } @@ -638,6 +638,41 @@ public List findChallengeRegistrantWithinPeriod( return result; } + @Override + public List filterChallengeRegistrantByDate(RegistrantFilterCondition condition) { + NativeSearchQueryBuilder searchQueryBuilder = new NativeSearchQueryBuilder().withTypes("challengeRegistrant"); + BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + + if (StringUtils.isNotEmpty(condition.getAuthorEmail())) { + boolQueryBuilder.must(matchQuery("authorEmail", condition.getAuthorEmail()).minimumShouldMatch("100%")); + } + + if (condition.getChallengeId() != null) { + boolQueryBuilder.must(termQuery("challengeId", condition.getChallengeId())); + } + + if (StringUtils.isNotEmpty(condition.getFilterType())) { + RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(condition.getFilterType()); + + if (StringUtils.isNotEmpty(condition.getFromDate())) { + rangeQueryBuilder.from(condition.getFromDate()); + } + if (StringUtils.isNotEmpty(condition.getToDate())) { + rangeQueryBuilder.to(condition.getToDate()); + } + + boolQueryBuilder.must(rangeQueryBuilder); + } + + List result = new ArrayList<>(); + Iterator iterator = challengeRegistrantRepository.search(searchQueryBuilder.build()).iterator(); + while (iterator.hasNext()) { + result.add(iterator.next()); + } + + return result; + } + @Override public List findChallengeSubmissionWithinPeriod( Long challengeId, Long currentDateTime, TimePeriodEnum period) { From 3d5ea2ada0412219cbbdd0acb173762b9a51c06b Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Wed, 7 Oct 2015 15:08:50 +0700 Subject: [PATCH 035/158] Change the search contestant condition --- .../com/techlooper/cron/ChallengeTimelineNotifier.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java b/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java index 426c52d3c..1c26d0711 100644 --- a/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java +++ b/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java @@ -5,6 +5,7 @@ import com.techlooper.entity.ChallengeRegistrantEntity; import com.techlooper.model.ChallengePhaseEnum; import com.techlooper.model.EmailSentResultEnum; +import com.techlooper.model.RegistrantFilterCondition; import com.techlooper.service.ChallengeService; import org.apache.commons.lang3.StringUtils; import org.dozer.Mapper; @@ -46,9 +47,11 @@ public synchronized void notifyRegistrantAboutChallengeTimeline() throws Excepti List challengeEntities = challengeService.listChallengesByPhase(challengePhase); for (ChallengeEntity challengeEntity : challengeEntities) { - Set challengeRegistrants = challengeService.findRegistrantsByOwner( - challengeEntity.getAuthorEmail(), challengeEntity.getChallengeId()); - + RegistrantFilterCondition condition = new RegistrantFilterCondition(); + condition.setAuthorEmail(challengeEntity.getAuthorEmail()); + condition.setChallengeId(challengeEntity.getChallengeId()); + Set challengeRegistrants = challengeService.findRegistrantsByOwner(condition); + for (ChallengeRegistrantDto challengeRegistrant : challengeRegistrants) { Date lastSentDate = string2Date(challengeRegistrant.getLastEmailSentDateTime(), BASIC_DATE_TIME_PATTERN); Date currentDate = new Date(); From bef99ee29c516ab3a9b0f023eb7b700bf059fa56 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 15:21:33 +0700 Subject: [PATCH 036/158] restyle for action list item --- .../modules/contest-detail/contestDetail.html | 13 +++++-------- src/main/webapp/assets/sass/contest-detail.sass | 7 +++++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 1c1f1ff12..9b68b47bd 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -253,18 +253,15 @@

    diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 08b1860f1..ad098f910 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -238,7 +238,7 @@ clear: both text-align: right width: 100% - + padding: 0 10px table.contests-table margin: 5px 0 10px 0 td @@ -304,13 +304,16 @@ color: #333 i font-size: 20px + ul + width: 120px li + text-align: right a display: block width: 100% clear: both cursor: pointer - text-align: left + text-align: right font-size: 14px padding: 0 5px 5px 5px i From ebc7d77c2d0adbcaad58ca0592da43e685174b4e Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 15:31:49 +0700 Subject: [PATCH 037/158] re-show reason disqualify registrant --- .../webapp/assets/modules/contest-detail/contestDetail.html | 1 + src/main/webapp/assets/modules/translation/messages_en.json | 2 +- src/main/webapp/assets/modules/translation/messages_vi.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 9b68b47bd..204dae804 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -235,6 +235,7 @@

    {{user.registrantFirstName}} {{user.registrantLastName}} +

    {{'disqualifyingReason' | translate}}: {{user.disqualifiedReason}}

    {{user.registrantId | timestamp: 'number'}} diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index 747a3bcc9..f4d1b27d6 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -721,7 +721,7 @@ "reject": "Reject", "pageNotFound": "This page does not exist.", "disqualifyConfirmation": "Are you sure to disqualify this contestant?", - "disqualifyingReason": "Disqualifying Reason", + "disqualifyingReason": "Disqualifying reason", "vietnamese": "Tiếng Việt", "english": "Tiếng Anh", "registrants": "Registrants", diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json index e6bd1ad91..c7beea369 100644 --- a/src/main/webapp/assets/modules/translation/messages_vi.json +++ b/src/main/webapp/assets/modules/translation/messages_vi.json @@ -721,7 +721,7 @@ "reject": "Reject", "pageNotFound": "Trang này không tồn tại.", "disqualifyConfirmation": "Bạn có muốn loại bỏ thí sinh này?", - "disqualifyingReason": "Lý Do Loại Bỏ", + "disqualifyingReason": "Lý do loại bỏ", "vietnamese": "Vietnamese", "english": "English", "registrants": "Thí Sinh", From 9f4b39f0065535bd29c60f84f1632bea0fc09bae Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Wed, 7 Oct 2015 16:37:04 +0700 Subject: [PATCH 038/158] Save the last update send email date time to challenge owner --- .../DailyChallengeSummaryEmailSender.java | 17 +++++++++++--- .../techlooper/entity/ChallengeEntity.java | 23 +++++++++++++++++++ .../techlooper/service/ChallengeService.java | 1 + .../service/impl/ChallengeServiceImpl.java | 8 +++++++ 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java b/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java index 18af951bd..132536f02 100644 --- a/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java +++ b/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java @@ -2,6 +2,7 @@ import com.techlooper.entity.ChallengeEntity; import com.techlooper.model.ChallengePhaseEnum; +import com.techlooper.model.EmailSentResultEnum; import com.techlooper.service.ChallengeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,8 +12,11 @@ import javax.annotation.Resource; import java.util.Arrays; +import java.util.Date; import java.util.List; +import static com.techlooper.util.DateTimeUtils.*; + @Service public class DailyChallengeSummaryEmailSender { @@ -25,7 +29,7 @@ public class DailyChallengeSummaryEmailSender { private Boolean enableJobAlert; @Scheduled(cron = "${scheduled.cron.dailyChallengeSummary}") - public void sendDailyEmailAboutChallengeSummary() throws Exception { + public synchronized void sendDailyEmailAboutChallengeSummary() throws Exception { if (enableJobAlert) { List challengePhases = Arrays.asList(ChallengePhaseEnum.REGISTRATION, ChallengePhaseEnum.IN_PROGRESS); @@ -35,9 +39,16 @@ public void sendDailyEmailAboutChallengeSummary() throws Exception { for (ChallengeEntity challengeEntity : challengeEntities) { try { - challengeService.sendDailySummaryEmailToChallengeOwner(challengeEntity); - count++; + Date lastSentDate = string2Date(challengeEntity.getLastEmailSentDateTime(), BASIC_DATE_TIME_PATTERN); + Date currentDate = new Date(); + + if (daysBetween(lastSentDate, currentDate) > 0) { + challengeService.sendDailySummaryEmailToChallengeOwner(challengeEntity); + challengeService.updateSendEmailToChallengeOwnerResultCode(challengeEntity, EmailSentResultEnum.OK); + count++; + } } catch (Exception ex) { + challengeService.updateSendEmailToChallengeOwnerResultCode(challengeEntity, EmailSentResultEnum.ERROR); LOGGER.error(ex.getMessage(), ex); } } diff --git a/src/main/java/com/techlooper/entity/ChallengeEntity.java b/src/main/java/com/techlooper/entity/ChallengeEntity.java index 12a776e4d..3f7d409ed 100644 --- a/src/main/java/com/techlooper/entity/ChallengeEntity.java +++ b/src/main/java/com/techlooper/entity/ChallengeEntity.java @@ -10,6 +10,7 @@ import java.util.List; import static org.springframework.data.elasticsearch.annotations.FieldType.Boolean; +import static org.springframework.data.elasticsearch.annotations.FieldType.Integer; import static org.springframework.data.elasticsearch.annotations.FieldType.String; /** @@ -87,6 +88,12 @@ public class ChallengeEntity { @Field(type = Boolean) private Boolean expired; + @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "dd/MM/yyyy HH:mm") + private String lastEmailSentDateTime; + + @Field(type = Integer) + private int lastEmailSentResultCode; + public Boolean getExpired() { return expired; } @@ -270,4 +277,20 @@ public String getChallengeOverview() { public void setChallengeOverview(String challengeOverview) { this.challengeOverview = challengeOverview; } + + public String getLastEmailSentDateTime() { + return lastEmailSentDateTime; + } + + public void setLastEmailSentDateTime(String lastEmailSentDateTime) { + this.lastEmailSentDateTime = lastEmailSentDateTime; + } + + public int getLastEmailSentResultCode() { + return lastEmailSentResultCode; + } + + public void setLastEmailSentResultCode(int lastEmailSentResultCode) { + this.lastEmailSentResultCode = lastEmailSentResultCode; + } } diff --git a/src/main/java/com/techlooper/service/ChallengeService.java b/src/main/java/com/techlooper/service/ChallengeService.java index c877c0157..7061b23bf 100644 --- a/src/main/java/com/techlooper/service/ChallengeService.java +++ b/src/main/java/com/techlooper/service/ChallengeService.java @@ -92,4 +92,5 @@ List findChallengeSubmissionWithinPeriod( void updateSendEmailToContestantResultCode(ChallengeRegistrantEntity challengeRegistrantEntity, EmailSentResultEnum code); + void updateSendEmailToChallengeOwnerResultCode(ChallengeEntity challengeEntity, EmailSentResultEnum code); } diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 27d526114..03e3c11fc 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -813,4 +813,12 @@ public void updateSendEmailToContestantResultCode(ChallengeRegistrantEntity chal } } + @Override + public void updateSendEmailToChallengeOwnerResultCode(ChallengeEntity challengeEntity, EmailSentResultEnum code) { + if (challengeEntity != null) { + challengeEntity.setLastEmailSentDateTime(currentDate(BASIC_DATE_TIME_PATTERN)); + challengeEntity.setLastEmailSentResultCode(code.getValue()); + challengeRepository.save(challengeEntity); + } + } } From 79203e5ab0fde22943e187692d1dd96b92fc5f4a Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 17:19:05 +0700 Subject: [PATCH 039/158] send email affter user submitted feedback --- .../modules/common/feedback/feedback.html | 6 ++--- .../common/feedback/feedbackDirective.js | 26 +++++++++++++++++-- .../modules/contest-detail/contestDetail.html | 4 +++ .../contest-detail/contestDetailAction.html | 2 +- .../contest-detail/contestDetailController.js | 1 - .../webapp/assets/sass/contest-detail.sass | 11 ++++++-- .../assets/sass/z-responsive-candidate.sass | 14 +++++++++- 7 files changed, 54 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/assets/modules/common/feedback/feedback.html b/src/main/webapp/assets/modules/common/feedback/feedback.html index dfb50b912..07eacd43e 100644 --- a/src/main/webapp/assets/modules/common/feedback/feedback.html +++ b/src/main/webapp/assets/modules/common/feedback/feedback.html @@ -5,7 +5,7 @@
    - +
    @@ -21,8 +21,8 @@
    diff --git a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js index 76a7752fa..513304c6a 100644 --- a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js +++ b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js @@ -1,4 +1,4 @@ -techlooper.directive("feedbackForm", function () { +techlooper.directive("feedbackForm", function (apiService) { return { restrict: "E", replace: true, @@ -6,7 +6,7 @@ techlooper.directive("feedbackForm", function () { scope: { composeEmail: "=" }, - link: function (scope, element, attr, ctrl) { + link: function (scope, element, attr, ctrl, composeEmail) { $('.summernote').summernote({ toolbar: [ ['fontname', ['fontname']], @@ -20,6 +20,28 @@ techlooper.directive("feedbackForm", function () { ['misc', ['undo', 'redo', 'codeview', 'fullscreen']] ] }); + if(scope.composeEmail.registrantLastName){ + scope.composeEmail.names = scope.composeEmail.registrantFirstName + ' ' + scope.composeEmail.registrantLastName; + }else{ + scope.composeEmail.names = scope.composeEmail.registrantFirstName; + } + + scope.send = function(){ + scope.composeEmail.content = $('.summernote').code(); + if(scope.composeEmail.content == '


    '){ + return; + } + apiService.sendEmailToDailyChallengeRegistrants(scope.composeEmail.challengeId, scope.composeEmail.registrantId, scope.composeEmail) + .finally(function () { + scope.cancel(); + }); + } + scope.cancel = function () { + if (!scope.composeEmail.visible) return; + scope.composeEmail.subject = ''; + $('.summernote').code(''); + delete scope.composeEmail.visible; + } } } }); \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 204dae804..2621d194e 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -234,18 +234,22 @@

    +
    {{user.registrantFirstName}} {{user.registrantLastName}}

    {{'disqualifyingReason' | translate}}: {{user.disqualifiedReason}}

    +
    {{user.registrantId | timestamp: 'number'}}
    +
    +
    \ No newline at end of file diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index 9ca166db2..ca1b03cae 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -122,7 +122,6 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l else { $scope.contestDetail.timeline = 5; } - console.log($scope.contestDetail); }) .error(function () {$location.url("404");}); diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index ad098f910..0f098178d 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -252,14 +252,20 @@ color: #929292 input color: #333 - button - color: #333 span font-style: italic font-size: 12px line-height: 16px display: block word-break: break-all + button + color: #333 + span + display: inline-block + a.btn + span + display: inline-block + font-style: normal td color: #c0c0c0 .action-content @@ -459,6 +465,7 @@ background-color: #f3fafe .note-editable background-color: #fff + text-align: left .email-footer text-align: right padding: 10px 0 diff --git a/src/main/webapp/assets/sass/z-responsive-candidate.sass b/src/main/webapp/assets/sass/z-responsive-candidate.sass index 39fd99790..189ba8753 100644 --- a/src/main/webapp/assets/sass/z-responsive-candidate.sass +++ b/src/main/webapp/assets/sass/z-responsive-candidate.sass @@ -1131,7 +1131,7 @@ width: 95% padding: 10px 5px .contest-detail-page - padding: 20px 5px + padding: 0 5px 20px 5px .contest-detail-content padding: 10px 5px .timeline-reward-block @@ -1224,6 +1224,18 @@ margin-bottom: 10px span border: none !important + .contest-content-tab-detail + table.contests-table + .registrants-challenge-list + .registration-date, + .registration-score, + .registration-action, + .registrant-name + width: 100% + clear: both + text-align: left + .registrant-name + padding-top: 10px .contestant-page table.contests-table border: 0 From 4f8d30434d22643ea5c04e738315023261d6f0b2 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Wed, 7 Oct 2015 17:56:15 +0700 Subject: [PATCH 040/158] Implement filter function for contestant list --- .../techlooper/service/ChallengeService.java | 3 + .../service/impl/ChallengeServiceImpl.java | 81 ++++++++++++++----- 2 files changed, 62 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/techlooper/service/ChallengeService.java b/src/main/java/com/techlooper/service/ChallengeService.java index 7061b23bf..2c6a7178c 100644 --- a/src/main/java/com/techlooper/service/ChallengeService.java +++ b/src/main/java/com/techlooper/service/ChallengeService.java @@ -9,6 +9,7 @@ import javax.mail.MessagingException; import java.io.IOException; +import java.text.ParseException; import java.util.Collection; import java.util.List; import java.util.Set; @@ -93,4 +94,6 @@ List findChallengeSubmissionWithinPeriod( void updateSendEmailToContestantResultCode(ChallengeRegistrantEntity challengeRegistrantEntity, EmailSentResultEnum code); void updateSendEmailToChallengeOwnerResultCode(ChallengeEntity challengeEntity, EmailSentResultEnum code); + + Set findChallengeSubmissionByDate(String fromDate, String toDate); } diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 03e3c11fc..e26e5c277 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -640,34 +640,47 @@ public List findChallengeRegistrantWithinPeriod( @Override public List filterChallengeRegistrantByDate(RegistrantFilterCondition condition) { - NativeSearchQueryBuilder searchQueryBuilder = new NativeSearchQueryBuilder().withTypes("challengeRegistrant"); - BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); - - if (StringUtils.isNotEmpty(condition.getAuthorEmail())) { - boolQueryBuilder.must(matchQuery("authorEmail", condition.getAuthorEmail()).minimumShouldMatch("100%")); - } - - if (condition.getChallengeId() != null) { - boolQueryBuilder.must(termQuery("challengeId", condition.getChallengeId())); - } + List result = new ArrayList<>(); - if (StringUtils.isNotEmpty(condition.getFilterType())) { - RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(condition.getFilterType()); + if ("challengeSubmission".equals(condition.getFilterType())) { + Set registrantIds = findChallengeSubmissionByDate(condition.getFromDate(), condition.getToDate()); + for (Long registrantId : registrantIds) { + ChallengeRegistrantEntity registrantEntity = challengeRegistrantRepository.findOne(registrantId); + if (registrantEntity != null) { + result.add(registrantEntity); + } + } + } else { + NativeSearchQueryBuilder searchQueryBuilder = new NativeSearchQueryBuilder().withTypes("challengeRegistrant"); + BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); - if (StringUtils.isNotEmpty(condition.getFromDate())) { - rangeQueryBuilder.from(condition.getFromDate()); + if (StringUtils.isNotEmpty(condition.getAuthorEmail())) { + boolQueryBuilder.must(matchQuery("authorEmail", condition.getAuthorEmail()).minimumShouldMatch("100%")); } - if (StringUtils.isNotEmpty(condition.getToDate())) { - rangeQueryBuilder.to(condition.getToDate()); + + if (condition.getChallengeId() != null) { + boolQueryBuilder.must(termQuery("challengeId", condition.getChallengeId())); } - boolQueryBuilder.must(rangeQueryBuilder); - } + if (StringUtils.isNotEmpty(condition.getFilterType())) { + if ("challengeRegistrant".equals(condition.getFilterType())) { + RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(condition.getFilterType()); - List result = new ArrayList<>(); - Iterator iterator = challengeRegistrantRepository.search(searchQueryBuilder.build()).iterator(); - while (iterator.hasNext()) { - result.add(iterator.next()); + if (StringUtils.isNotEmpty(condition.getFromDate())) { + rangeQueryBuilder.from(condition.getFromDate()); + } + if (StringUtils.isNotEmpty(condition.getToDate())) { + rangeQueryBuilder.to(condition.getToDate()); + } + + boolQueryBuilder.must(rangeQueryBuilder); + } + } + + Iterator iterator = challengeRegistrantRepository.search(searchQueryBuilder.build()).iterator(); + while (iterator.hasNext()) { + result.add(iterator.next()); + } } return result; @@ -821,4 +834,28 @@ public void updateSendEmailToChallengeOwnerResultCode(ChallengeEntity challengeE challengeRepository.save(challengeEntity); } } + + @Override + public Set findChallengeSubmissionByDate(String fromDate, String toDate) { + Set registrantIds = new HashSet<>(); + NativeSearchQueryBuilder searchQueryBuilder = new NativeSearchQueryBuilder().withTypes("challengeSubmission"); + RangeQueryBuilder submissionDateQuery = QueryBuilders.rangeQuery("submissionDateTime"); + + if (StringUtils.isNotEmpty(fromDate)) { + submissionDateQuery.from(fromDate); + } + + if (StringUtils.isNotEmpty(toDate)) { + submissionDateQuery.to(toDate); + } + + searchQueryBuilder.withQuery(submissionDateQuery); + Iterator iterator = challengeSubmissionRepository.search(searchQueryBuilder.build()).iterator(); + while (iterator.hasNext()) { + ChallengeSubmissionEntity challengeSubmissionEntity = iterator.next(); + registrantIds.add(challengeSubmissionEntity.getRegistrantId()); + } + + return registrantIds; + } } From 8e85741f4268c7ff9e1828eed9517b33a7082594 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 18:05:06 +0700 Subject: [PATCH 041/158] add loading when waiting send feedback --- .../webapp/assets/images/send_virtual_hug.gif | Bin 0 -> 22961 bytes .../modules/common/feedback/feedback.html | 2 ++ .../common/feedback/feedbackDirective.js | 8 ++++++-- src/main/webapp/assets/sass/contest-detail.sass | 1 + src/main/webapp/assets/sass/main.sass | 11 ++++++++++- 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 src/main/webapp/assets/images/send_virtual_hug.gif diff --git a/src/main/webapp/assets/images/send_virtual_hug.gif b/src/main/webapp/assets/images/send_virtual_hug.gif new file mode 100644 index 0000000000000000000000000000000000000000..9a4bfbe4c34b24b92b3724bc97980517547864ee GIT binary patch literal 22961 zcmeI4XINA1y64wQqeH0D2}PRpB3(l79Yhe6Dj-z?(nNzw73oTch={0kP^u6CkroI= znlu$DQdN|ynfT7$?>Qf4&s;Otwa=Lk=0nQL)7Hw9_59ZV{@=^MNMBjSwFq1T-kt&q z3JSh{{W>)@1pvVK`1p?>Kf1fS`}_MlJ3A*PCR$rt_xJZ#S6A!m>bADFW@l&H+S-Uj zA|oSXO-)UEd;8O;PXz=7hK7a~7Z=OQ%5-&g<>lp@nwka&2NMz!!otFOdwb{R<}O{j zWM^l$ySuxzw3M5h+tbs7!{IhIHtyfQPa=`XUH?Bn_(?S8dbTz?T9$fpQZi7G+z@%w zIWtR?u4{-Z`BhyrJjm7E*E0m==IP}Vpdql`+981Q@z4;kS2U9`3)1oQ_A!hM_OyvK zw{?&7byx8a&^&`u4_6KM5Ayd6aYcpu`vqWB!!-n4Jp$c4RmtyvZgdmWKjQj z2#|XV_PC^Kt*if!zQ~_61iV8+f>foY$%jxXOkOH5*h^YgMMdRz8**}zKpyG;+y(!jzncxfNd2`tQtpBN(&4T_ z(y~%Azjx`M1oWk45ocw)c;^9{+kQr~hSLY4TvCfB&ri z>1Y1uCi2|*{r2xkOaAcpwD$}k&-GyPqy|a9ejXnk9_;V^_`dt?>zAGFt<8<~&ugnI z%b%7$et5sQFh4i@Zf1IFa^mgy*yspxc!)4K(BIelrss8cSLZ8yNBhgR)|Td`#uv{U z>g#H2s;eq1o;`h1{>BEu-xZf7l z=4PfQ#zuw)`g*!L+FEGMGaBk@sw&D#rxg|C<;Z_1DM^V_;$osA!Y73U1^7{Xygb}o zoE+>Y*jQPZnHZ4_^mMc|)Krud2sjK1A)gxf4`5W(z$rlD_vz;M2@pV#@b`iYB{)-i zON0CTREvq_A;y)C)l(H$2R0)+7Hh&yrSgYY8zKn-tqVI%*UYQmZSS{TAKpG9VPkII zx*Z!ApOBbzC;4tlYFc_mX4bv?**Up+`2~eV#kdD04@)1FJuZLp^jSq^Rdr2mU46sz z7mZELEv;=Y+dJ^DI=i}G_q^%t>mL{-3=I=UM#skAPE1Zs&%B$Rn_pOb|Ka1(r{$H^ zwa@Dtn_JsEU%r0Z{r+Qb|KRZG_~$PY0Hx+OtiipyMaeAg)LZkQD;_CmTwqvR^7;r++J|paQ94Q7Ms=lqnW8pNo%-q?4P?u>_ZJw|ml5)nF`sAq>K_l2wAc`$hRh+W zNz_d0$4-i9@4Pa7CEBzaTh{T%=JujfmJcpJeddji^vwI7JXL#ffR~D2pgfk5C&`w* zR;x3Pfj&ujAGuovt)WJoW4Ct2$FmBTI^xflb|v6ATO4soXGf+5g!AarW^A9NbwU-q z(@@IQY4oK^dnf%BcCh?0dKP9cV-n)auI8tBJ5JX*3RG!SH)-J3sVVehy=5f2K_9v@ zH5lPD=jnilI1LIu?c>lu-RyWn4b!DtEN*x)XT^J3$9OcU_@5!XkE5>X^?kC zx2f@B=;q7i2aFN{z3&4VukYh*b{$-_FYvTYvLxx0d(T~GY$`md@5x1UC<=sAOzUpjAPyK+8@d};QijULi zd(W%0&ascI_)RBgF$e*@llca9InzLAs8V;ZtM=1bz;&65A|TJ_tXEj*PvzU!>m-$h z$~ZS(EGH!z8(y?29E#u$sJ7le5qrN=*161VZd&X7%|z@2B=7j67^;i(E;H1v+WHdF zzGW&8>KV1qzw!|PaLdbqGoUUHL+ozILsTA1?7|dCv)=}E zXq+2Hv_xL+4x0@eHw;^yBGiwd*ZmYHC{cwWP#ZpH#VLFF%I`xWje}Z!bm?th!4tY@ z0Q8wO10lX5xJKX_4Hn<8G+7X~5X}XIFWzF_+Iz1gV&3#VhK4@o!!;e==8v)Ryvm>M z7^LhiWt~q^UQN0)ue_G(dp+y}BVH1Xpa+Rq5T=eLX;IOt<3Y-xz3X@?tJDY?-Mj&Tp+LHDJWQMzO1oPOh1Q^<#>5y_ ziA6Yb&Z}SiX}6FKixlvwR|q$m+nn64fJu`U(?m5t0K9^-Bhek3n{h#>u=HW)uoT3t zxX1y1hR{_V6ygg+N9Y4XjA%DM+em`h(tGCIgl-{o#(2As4@|W=-Mj%;0v%bpF z6TAK;!Fl&R4F{7BZ7CK8XGcNz;;?`eX)%Q+?IGjZB?I-(BMG715BV5n3|_*m(;|eH zcp1ccH6iKgwCd=d8FEs}{fWsr`Y-pNn|exPntNR!nK{_qlMK%G#<2w%F!zGFWobwNEy#J>@9Ovwf;k>k@6}kk3Kt5KsZP!xH3?=FZYKt&dQ^YZ zrroXZ5HXqVcl=S8L#VifKr@$H3YlJ(O{ zN<=w|lS;aB)U4b=S}>SG5dfhJ0zkM_heQMf;!<ByE48VKFa001Z`bJywA|@I7-l zbkC$Ha=F01s(!t?I)#K?NqhK9bw%xjS=8re0|Cuj_{{l(cOCIVM_(v~s$0G^3J%8r zjG|J%*Hr92oWaEs0$tQ3FR4jh)t z$Dg1m(qWk9w^!TODA-+o&KR75Qm0*CKjMQB8Z{~7hND;1Tp*I(n#ZrV0oIL+6!PJ~ zL2Me9yT?VPvFIjlz=%lh9wOLID5E5D1(f}M}xpc?vpIdYkh+e z%mwc&1eMfsbzsUsAx-ZxkL;v!Sf@=zu%P(RkCL|j)aFPjqJ^i-GdFIF-{W!S-8kcqTXpYJ7 z8S6w!yG!8G%%FV9*D4z9lJLs3^0!yag_!RiNS>pqwmR86H&05qNIN(T&4MEuRyNP%5SXDEqw$xn8eI*`mg$i!I$M)_tqzNt}4MP6G(Um=8Tv@ zS!^65@an=sQcPukNV~M>=M&lI#wt7Q+a(n*%YJN~%$tyVT%-8(#tHPInz?MpfS-&@ zHm42Mx9rZddONYH;{Cums;_o9l9tj?Dq^-~eEx7WXQ-h}iLhoKbvTBje_nps!0fYi{^5AJ z`SYjtgwJPN58u|LJg@LFTX%eSIMFopyef>ae&OhF5>Nl4Cf;nrjq7Nt*Zf6YHeutE z+R-#IsygCBqJ z;}3rPTk!+869h$ClJP^@%kmYBSph9i;0OY~4atqo;)fMi{IH-jgFhNBPpSxka-gxm zhzwtJJ;7MXOkvzY(CquTwmT07etObL5vI@ZQ}L~d($A1-gImt^!=@M@bXxvS;pyp1 zUC9k|ZZt1nOv?qDVc?>sLBZrpcnJ)gTNjQ0NQF!zGl=El*CB2+3csAsi~>GoUo>l8 zF2I*Oyns@P^TWA&|$7P_yEt_g2bJg{( z$Ml%3!HyKw<$>(^w(TaRAUqu6v4{jXOz~P!hAce(VC6T6P&91+0+BhX*AJ03H?ZJd zBOmE_#T|GB-}YUg`te4S;OUq3owQpG|P2lH21ZOkdN^(Oq2ky;Lc6K6x0sv6XSI-PAf1ZNUgpY zuNi_T@~)_W8(SbfS^!Ch*InnaN-{3}@UdW3SJ0R-fuh`P9habYY8f{LNy%9Mz?xp(Ez?q)VjluPgQk$c@gQ)K7Qe!T z0*qg5LEybYOtINmbNUe=XRuTlx&uH%Ml(WbJwZr~u{9?yBg;=fR8Pg&Jo0NsiLRTN zYo7|FK{~sVe8sEzq~9zrIH#%f5re;q?nSn-c(~{%$!6sNt3%7YF_w9Gjy|M8FcuW@ z{>1ZSwNID{3pwKioZ3zR`W}3}vg(9Y&72xKA1Ot~6s$Ux!|*xdtpadLL}RYGxfcv6 zekOrs(pa$|MoY?$ae~e2 zJk>~v4j)Uhi`}xg&n%cYtZaRGxE)&-jcIi{oF8eV?87g!0|baJ0K3R4bSgh`5k@0j zp{6KvbIyB0Fxak>{q3491J)%<7@uH9@VJ#oV?ons-OZfx$x(X4PFQ>I>FG~F*WOdV zzl{j(47nDRAglh4)%|T0ol5Qj1UW=evDY%=aSD-QI{JziSJo@}C^V7ASX76()~09U z2hMc*q?&oHdDW8(bS`tkn5q8U?yr7)VV68xh43^kpQlD*H5+lji zov8V$DCt#47EAudkHFtz$-lyn-2Wo{Xg!+SNoj0bG24!OcQn60)Y!g9*uH*rv;Z(P z;VH~_ZgL$jQd%^1o*3GRQ#*eDM=bdhP52W{_%}xrm~m-Z2+<%k2$AX92!b;!$h;yb zdEvDN)xFSUv1C#`W(a}z!;c_rEkU9w)J$PmZ%jgAOh*Tc9+4IKDL-`D3jilHOy)wM zx`I6Q!-}cSr$_a?g6auAnf~A3UTW32I(hL{^!H&cicQ5igYB2!39L1=F$47J8}$Tk zpCPs2pq z@%a6vzd)t5`WF>43w`~7yEG6Fe&fQoA8pI;0I<({H*WkoyoHCa8sMSF(l?IQi;wB| z&(Q8{L%y5vK?mMw!e^?ZfsjQIQQl7TVLO^iXz`df;nlH95LPhDg-VMO-0j;2O1jWg zFaWz{hlL_~xuFoe4zH@q^`nh%- zPoXV$)d7H)&>&f$nHdd93X6fTEG9C@V3+QfH&ZH%rl&5s3W+>vGeMv-!Ko#ITTNP~ zm+F8Lr^1swR7OTp85xKjAyL66hQ`9UEZlf0c-g4M&aEy!ztm&JteCHz`F78v6bo(h(Sv%(2d8`# zR(o||+^c0?IDc(PaJa7-_2FB7N(cZEcw^MtS6=|3^FlIQejQ^SSnzH4fttbEaA?L@ zJe23tX48RTpgxBG_7WOmxHDid#8BAYg%yhmAGJ6C0+LQ`eh_+}tCmy8l)08!V16QatQc}~tu%qyO*ZV{4LIURn^<%L~hl2D~n2Zxb_ z@$=f($K~39B?!UURUWgfXj$Z1ie05I0bVYn=fr_UPMfCmSSL-!8gqOerm0g1z)a`b z`(3({sM8=S8r9l8VBQ!H5=7bPE|0|NThZP-dNO07z6C(Og^K%gA z=`}f~D6uYOKZQ!p{-kjsSdC=m>`Gs*{cQUSfyJ-dmSQWZ-fuCvbXr8qP_oRZ(0&U8 zsVB-~xC$2OG^Oq^xBGxB+}*vd>{${Q3gaF6+{W1^%3ezVdz`^?dvH`G1G|(N+y!4P z{G;vX?OBA;p_y}$Qo)eNR~x~DrFC8aW~wi7ZzN(8TFROgtM@hW=PA##)*SVY-Cw0O zBbIw3%?TEtBr=YS0O)m&Os%S5w(4WgF@1bdz79}u*DxkSrQ21&NQ+@Ww+>B4U# z7VedyQ#$o@ic_{neu{$zlj@;F=5FV!gQpe-gW=pkmccqgd$b^o4vj`bQbkZIkh>TC z0Wz?l05H$jTxG=n#NCLMQZCDgcNR+Kkt@X)e;#};Qo<_DXa5G4wZ{YMhnt1@ysG1^ z)d4M&&%30s+xIC_)kf5w(W`y3&@@w^V8y1z=m3T<_o)zQEC^kUCjk^FZkJyN6ybdB z`yPBQ*rVmJi=Bsy?s)KU=dq^d&mSG6_9KLH%;D-DK#AM-h8**fX7)P1X}R23@4|w^ zdzuF$sUVX&ZUjcD_2Xb03r%)85@p9zT(G?PDeB?~J-QhN08zI;&cn%Q0!;11fij%i z3MW9$4?A(&W85o|_Fa6-M4;!}dj=ky&JbNXV0`?5Ud;e2uKy*@RM(9aj#3e2vr3{s z%^~S_^du0BSM6bL?9Xxl{xVs>R2~2EG=+*ZCrLJ?X8i%czS9{8ps#*u#WK>M02uo) za8uy}G_9%YqcaYG<6S|v2tzG>rueLD0t|c+eJ0j&sfk%jA`u3_H~3=4=>j1^l}UXA zPFdg~i<=k&(8qTvI6k4xRnoP&|J^;gtQ?QhbIui+LmvFM8s0MyOv2b>g=wF{n@*i83j zEVC3TI(doPQ#YUGO)U{5ya$DpObO|=B}!RhOP5;4xOg%AH-tDPC0np?7xW!Y#fuI$ z4ioj%BTt$o)*T5g{gp*y8Ntur3lRExDu2qd<=OYyV3&(w$w=e?xe*wX8P)HfS1DU|9u zi(6W>jM(erI!57ZCjOCK(1EWVdO}h{JhVj0khf*o>NQ4zUasYCO#uCns8Z&kPJvuj zGWepJ`{2o$K*VP!PE1B;LvAx`G*nx8doo; zUonj7dcE%|Fz|PDhl`9Ri2sY|PTYS#u>3)jKhDfQ&dh(eGn4f%G_gpNqoC}TkcXVI zAfpMZ2T(tV*ma5_(3v6|2&`!0w-MRuS^TK>y9#*-0?qRrG-lulfm-NPD!$dc_)=j4 zxuYIBY06NjHRXo+`JKpIFozkmv48nuK;MEV4DNZO@cW2{{agc4)j*@ZOS9eyq~Ok) zO&c=Su?&MEk!kp)Od2e(bY6#`wFC*-I{4&m;twnpWz(z9I%ZyoT*-b&zqkCXKBakF zR>z!#-pHmI`nKFyeMWUAP!LetqD!b$fz{INL@nb)77hnBp0yvYxnhWTkV6>;Q0MCe zb&eoi{?bwaa?ppYrGW1`?OGg`+ z@clgY()_j=7`@?+JECXrICvX)^MHBr7cH@aq=LM;wvGekMbYpivjyxyiE? z#hAbk=S5;UXJi14JI=66;W}LX)nSi5x-wkx#x7BPiKFjz-KNBM3(m{LLtILhC>Ogq zg-3wK{MpTN!!G{*Y7Dx;=|uYe>rurk$rkF^C43GbMb8*dk>JJ^W&auwBBM#s9XwnL zuf54C9c^m5Ku3ebLe5D=+~ocMtzmD4I=Q69ItdBzO?N>I<&qwaxzkbkbeTj-rBPr# z0HNmYA)nE>+YLg3%$BMK?IW3{8wICW9duDItkU3%9{l$j^-P&i=^AaNY+BP~`oV#S zCOjwIPLEKJT#|Ju9!aw}DEWgN&6yJ7XjC>3zJy7jM`KyUCc7^sVeYz=y75P`56#<| z15@Ld0Ja*yiyC`xZ?{anGTeN)*1GVX--^hi1b_l-Q&6n%Ny)bfxE_~|qZbv{Nr`}X z{$hfz7kJU#$T6RIa3yo?+lrj5YWMDQ+2TxjJTy4BpEEBjn3QF+c7|rhI!8RUG}hG9 zP;Ji~7LuMu7b_^dpwi{kU!S~J@DY^hH!6I}SZs7}4ds($aIGvWu0^8Ms6N4h*Eod# z&EO)Hwu(jMC^Izqwy>y@&jcLDT3CcBbx?G~HWn$Qp2+bPxl`U{a49q^nfBqS7|wCM z9_yqIbwFbv@~ngaTb94#DaTjkXI(Cpodz;!8Q)ln=CS zeYW%!4=KL7;iXDtN$jAuEo}$|M7WI2VBJB9^W**?+q-v^`(K||NO~yWRntqDktsJi zmbAE)Kk&Neej=&BU5lZmr)%^_UAfbi#wWu$EvXZ=#92~+4^Ku6)DnQ{@dW5I01)po z%#*azryS5k@II#^zzArCJ!W4pTh3^A@FL=U)RvRv1vG^4x8id6UDhQJ06ln{r{2+4B4?nEAJ&PWq^8i31 zB|!K})M<4J8P*i>#}c$Hhz%n)UWFk8bRp4-;|>(g;Fz@LraTd`I2$^|%)VJa?sI-*e(fsEZLsonf7A}$xRmmMGB$F##qA?V9CfU;J1jf zc(4Lt$Eqx(-TKwMYT$K79$uI)h5w{cOxLI`b z^|Fgqq03$QDJ>iI%$i!m+zLT|Wt?37C;~)d!T$^?#qFTTZHwy%2G2UKAARWf4Jp^8 zNqbxGQb~J=G`@XfmyRP9DeR#yAGqn&{u7>d9p23cnG6HqY{YBxHVc4sjwbkv7D984 z51|a84;+X$xB)F727%r1#DQ~nu(a^sMidmFJm?BszoZHo--%PD#X`fUbhr?V@nFat zLuykOG&}{cEPcS3x-T!vgaR#{+>r6!Kp!I-a42v?KBH8XNRo}$3HiX>VThGqmPvH! z7GRkZ?FRZuUoei`4><*cVraN=WOpnYflO-`ZQp_@OP~Q32P|=93rJA^0HxjOHI!qD z&#Wk==TPaBzL^4~*)9poH|xu2%cZLdJra2k-mljp2V|DcuAJlOLtPq8v-f)>DYmAf zB8l@0n^yS-Vd;ub@Ozu_l>yRP2e6p0H{6?%ftcN+C<{Y5(h9jomC==M570^6ouQJfbd{3Ku zMX8pSb6*~0bXnFeh`8x(%nY*Qyy^K52p5Eb(szC(nqt`lX}syB zq;mzcMzTSDy4u!dneu?yt;DW;^C}#o$rWT*vCZkX4%V_OJ>&nmJM!=wfM)Tu%Kto& zTauB!c2r=)2z2YwKL?Z)#jINo`zuu626Nga$g8dD7%qRSJm>~a*5`A&&<|Tx-{wyE{X{;77jh@S}6REtyr7ZR_U+&l`iQ!Rc2v z-57Y*`ys1}Nj;{%+66|Pl>2EAipp}nxi=OI{3=#Bb z5b3lSkN12U^h)`)$xXYvInj7~W~#HuYc{!-pQO(+pbS!fjXuhkD3z;acPX0R>u|k> zhr~I~RE!cI`i}=9w~zED9jzW8@$9HRU>~R3o5cLoy%HVjeb&O*s$oF z>iUOX2WLcay%CI3dBb~l`F{SfT{GK3{(>L~M~ZwT8&Upt$Nn~=(EQ)IV{iR;L&_f` z${!=jA0x`Y*@(hTPHUwmC+xf$kggsCAqtbp=mF_gS_}fozW8kz(KHJT(y`pt9;Q4l z2!XTG^3;zQ9u>S2!uk=S6IX;0tllLLZO$^1#$Zmj$AuUKtY%k z`a=wq?$vS;rf7dc!PhKu4TmxN_PI!;DwOb4$CA{tmc8!ZyxBNVbU0BHw$(arM3H*5 z(aR-`{q*2n#WmtTkOa36CXue;e^8)*XYG*VIxtjFApVEQ@3;;!=m!3PqLlRWkk*CR zel+{cg0#OA$k6d?y`JxQ$N&w*F+jOxijQb1&m4&%qiH<=($0wvN&(`vGf~BG6{6-= zU+Q%xzXA}j)S%YIUSl+T00`h!U}PAPNp=OUO{hSEwr)#jxdPniF3#W-h|0JtL!c-C z0j%O>)cL^sO`U8At2kp*Jd;CHn@DF`JVniWmK)x$g?Moo>m>oE+H<;+s*H*93IJHz z)P0iIDqh{zeMJEETB)CGn`Lam!|BmvWdnfS94Mhvi^tNipn!POrIi2?>?VILz#sz% zGPoG(_RC~swgI%viH4?!L9uzs@A;uvBVl^E)Q2pdLKJ=7`e)_tm1YU8n64QLRR!PA zz?|fi?b8<%#@(-J`@~6M)Ms$L>Mkq+&Bp-&s0{<}rgI6yiL2xzX%ieUyTtRhx8GG@ zF(~9zVC(lltqOVCb4X6V2V{recOAb6E#>h$Fc0@WB|gwGo)xvpAQT25~r~= z^UxkkP%ZURz9MFEy)!+Z!g*O6z&FuU$Y&$)XbsPE*iAaQJgVOE)9$NQe)=}0svF*H z)6M!&b>Kb;ZYicF77x%SkKai@dd%XS*IN`IoxM@9rY|XGGZb5!^e|aW;6~&~zbiH~ zaduww?u>bUkL?rjw?0w}lmo@qiXf96B@n)BCBB?qk@*P>hR$^5c{|x&-XGf``&%rvb@{k`~ggQHye4T zG5N7NNm5%b2%yF;Li#lDCMu3tN-R)+3npOe>V5H+s_c_{&gdJ{ISbitp-&td$~B)E zE*#!O7dU2Z8@j75N-l@CTh3kJ<%n`k>9p+f(-XIH|2%?hwal`AF3oB`HF^*{{t)9Q z_MJ1hZts;+HEPkr*(a*svSg}?>r6RF4#S==3Jdn<4onYa?^`O_19Zzy3CLmr5s?GH zph#TAGYQqHcaRVMn50bp(uPcc7de6 zJ4$IA9SU`k_s0&%@kwId>4ZtjkNZI@702v8@+b~zVbWgppH#|<0qHD*02uRae|ZYB zbb^Lt*`%PM-rIM9-|?MhAR(SkVWl{X_mB{kc|rAq%{xEr=i>U5!;i?U0FvsmmKS~N zN}cbo$juk^MQSrFWDCHu_rsS*n_aE#Z9uZpU#dx(G6+)$(k4=b+`vwpltKO4X9xnc z_sI9#fWY3TO8d+o2^E zF?+Wb4o3ITq-F-}(K;_oy1Zli$~M5o&4-X@@7!A>06;k}oHDJ0Sr-L?VEKRi!+Jtb zbX=iaY^Egc#3`E=uY`NIa6(4nR5uD}A9(4amXYApo%i%N!n=V|X>jV6>k5k4jS?VB zCmT+X^6+jUw-Jm7?FX>LP#04ACC;%+;77@R53oeq0W{Pff-T-%+(nC!6Uu06E(m~B z$H!YG&%q&-a$+%k z8UWM91-B<-!KdB^&_SzUj4mL4t5@I2&8mPf$p0g*Psd*sm-P9#Y-u*vJg_P=cuHr5 z@vTEYSr;mxnG#_ksOUzkj^t-TMc7~a4C<@8;P#Rqfb%|GaMBK~6Uo z7ug%Tf|#mu|GDi1m6)r&{x%(K$E!Y`(yc};;`<6V?9|rm5b=!J@YA1TzpEM0gRDTG>fM|-!Zv%8J{vilWE-XMau}3$I=m}OTj2WvD zz6}~mn>`254qpoyJ%8T6p`XrB<2wPdu@O4%;!F5GCfDV6m1x)X^Z7e1HM;L3r)>a* z0m|P7Sq^q00H<(5#=O^-j+TQ{>GC!M5EKzVnj0%QhGQ+$jEN-n#XoK0uX-e>Q)#@j6vXZKh*;J_1HTSwuF- za+~9!?3BL~jzhM8f=F`yF*&V=Y(+tYGqmh4r3U^2*SZ#dQoV1~JcC%du^mlz$x3&C zL@3|UOnk>K2QqS(3w1zU-u_dJ7_Di;2RWEL^X*D?45Wb%N=@0YebVyQ{@BI6tTH@P z77C1q0^dc^)+2d7)fK zx`(ur>?0&d|1un4Jq-g;;Q$n3sq)Sl1;EiB0#u2>TSi=ziUeN3-K+N`(a9T7(sZz& zgYPUmeSp+N^ms~@<_>SntBxha7)n_`^ePpGtG0A+5$bYk1%0##?AAjZs07jzT08_T zKHSTXe$-pKX2k3Q(0T`FD%^8|1c>+NT;9#BjY5mx;IsvGs~+nST=zOfdmf8_f1Cjm zTPaE!pMBw0S5S8Ck>i!MF3uwB z%HWr$G=C;_y}S^7r%WBM4f;;L8m)=C)lihKtTG) zp`Wa#U`;>3i$wJ~nHo|)c0cp|CT5^MG*L+ZbIG43?>ymyeBu1~B~8zM%PV!Gce@lT zbk3U)CfTmWQ>2M#GFnc3;2h5%ySJwKCcZQ`G5WU&c^C;udnq3Wn6N+MQrL8f^NwY$`e)$HroUE{EzfHr3std|5WD|Lumkf9| zdf?Szoo_y^#vXBX#cL~Ps3ZgAaAMCI`6g?tYJsd4PkQlZ*t1IPgs#ZqEV9Z{VKp!u zH}jp3R-eP)q{6gPm8Ok^wv?|@;A>s)NSHVX)4!2@?h8u`*YBWq=xI`@lj6%=;(mk4 zw!d&0oJrD6&`yQrX9?wciUE|gTip!IxqsgSWuCo{z32bw9w^uT+fb#M1qP`750{2I Ar~m)} literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/modules/common/feedback/feedback.html b/src/main/webapp/assets/modules/common/feedback/feedback.html index 07eacd43e..00a9b3e1e 100644 --- a/src/main/webapp/assets/modules/common/feedback/feedback.html +++ b/src/main/webapp/assets/modules/common/feedback/feedback.html @@ -24,5 +24,7 @@
    +
    +

    diff --git a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js index 513304c6a..dc2890c66 100644 --- a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js +++ b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js @@ -1,4 +1,4 @@ -techlooper.directive("feedbackForm", function (apiService) { +techlooper.directive("feedbackForm", function (apiService, $timeout) { return { restrict: "E", replace: true, @@ -31,9 +31,13 @@ techlooper.directive("feedbackForm", function (apiService) { if(scope.composeEmail.content == '


    '){ return; } + $('#feedback-loading').css('visibility', 'inherit'); apiService.sendEmailToDailyChallengeRegistrants(scope.composeEmail.challengeId, scope.composeEmail.registrantId, scope.composeEmail) .finally(function () { - scope.cancel(); + $timeout(function(){ + $('#feedback-loading').css('visibility', 'hidden'); + scope.cancel(); + }, 500); }); } scope.cancel = function () { diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 0f098178d..a953f75cd 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -454,6 +454,7 @@ background-color: #f6f6f6 display: inline-block border-radius: 3px + position: relative .mail-body border: 0 .mail-subject diff --git a/src/main/webapp/assets/sass/main.sass b/src/main/webapp/assets/sass/main.sass index c32675458..55b1e49c6 100644 --- a/src/main/webapp/assets/sass/main.sass +++ b/src/main/webapp/assets/sass/main.sass @@ -128,7 +128,16 @@ textarea.change-color background-color: #0077b5 .buffer background-color: #323b43 - +#feedback-loading + width: 100% + height: 100% + position: absolute + z-index: 9999 + background: url("../images/send_virtual_hug.gif") #bbbbbb no-repeat center center + top: 0 + left: 0 + opacity: 0.5 + visibility: hidden .datepicker-days td, th From bd3f24eedb688eef6029a74305ae5ff872e40079 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Wed, 7 Oct 2015 18:08:51 +0700 Subject: [PATCH 042/158] Fix the issue for filter contestant function --- .../java/com/techlooper/service/ChallengeService.java | 2 +- .../techlooper/service/impl/ChallengeServiceImpl.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/techlooper/service/ChallengeService.java b/src/main/java/com/techlooper/service/ChallengeService.java index 2c6a7178c..55fd58985 100644 --- a/src/main/java/com/techlooper/service/ChallengeService.java +++ b/src/main/java/com/techlooper/service/ChallengeService.java @@ -76,7 +76,7 @@ void sendApplicationEmailToEmployer(ChallengeEntity challengeEntity, ChallengeRe List findChallengeRegistrantWithinPeriod( Long challengeId, Long currentDateTime, TimePeriodEnum period); - List filterChallengeRegistrantByDate(RegistrantFilterCondition condition); + List filterChallengeRegistrantByDate(RegistrantFilterCondition condition) throws ParseException; List findChallengeSubmissionWithinPeriod( Long challengeId, Long currentDateTime, TimePeriodEnum period); diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index e26e5c277..6d9ae3fa6 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -639,7 +639,7 @@ public List findChallengeRegistrantWithinPeriod( } @Override - public List filterChallengeRegistrantByDate(RegistrantFilterCondition condition) { + public List filterChallengeRegistrantByDate(RegistrantFilterCondition condition) throws ParseException { List result = new ArrayList<>(); if ("challengeSubmission".equals(condition.getFilterType())) { @@ -663,14 +663,16 @@ public List filterChallengeRegistrantByDate(Registran } if (StringUtils.isNotEmpty(condition.getFilterType())) { - if ("challengeRegistrant".equals(condition.getFilterType())) { + if ("registrantId".equals(condition.getFilterType())) { RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(condition.getFilterType()); if (StringUtils.isNotEmpty(condition.getFromDate())) { - rangeQueryBuilder.from(condition.getFromDate()); + Long from = string2Date(condition.getFromDate(), BASIC_DATE_PATTERN).getTime(); + rangeQueryBuilder.from(from); } if (StringUtils.isNotEmpty(condition.getToDate())) { - rangeQueryBuilder.to(condition.getToDate()); + Long to = string2Date(condition.getToDate(), BASIC_DATE_PATTERN).getTime(); + rangeQueryBuilder.from(to); } boolQueryBuilder.must(rangeQueryBuilder); From 67161d2d0a47a9468f71d391247d7bd382df3156 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Wed, 7 Oct 2015 18:10:24 +0700 Subject: [PATCH 043/158] Handle exception for find registrant service --- src/main/java/com/techlooper/service/ChallengeService.java | 2 +- .../java/com/techlooper/service/impl/ChallengeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/techlooper/service/ChallengeService.java b/src/main/java/com/techlooper/service/ChallengeService.java index 55fd58985..a78992931 100644 --- a/src/main/java/com/techlooper/service/ChallengeService.java +++ b/src/main/java/com/techlooper/service/ChallengeService.java @@ -69,7 +69,7 @@ void sendApplicationEmailToEmployer(ChallengeEntity challengeEntity, ChallengeRe ChallengeDto findChallengeById(Long id); - Set findRegistrantsByOwner(RegistrantFilterCondition condition); + Set findRegistrantsByOwner(RegistrantFilterCondition condition) throws ParseException; ChallengeRegistrantDto saveRegistrant(String ownerEmail, ChallengeRegistrantDto challengeRegistrantDto); diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 6d9ae3fa6..d15b3cd12 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -574,7 +574,7 @@ public ChallengeDto findChallengeById(Long id) { return dozerMapper.map(challengeRepository.findOne(id), ChallengeDto.class); } - public Set findRegistrantsByOwner(RegistrantFilterCondition condition) { + public Set findRegistrantsByOwner(RegistrantFilterCondition condition) throws ParseException { BoolQueryBuilder boolQueryBuilder = boolQuery(); if (StringUtils.isNotEmpty(condition.getAuthorEmail())) { From 31d6d0372aaacc2a603610c5c4eb290bb553821a Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Wed, 7 Oct 2015 18:11:12 +0700 Subject: [PATCH 044/158] Handle controller exception --- .../java/com/techlooper/controller/ChallengeController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/techlooper/controller/ChallengeController.java b/src/main/java/com/techlooper/controller/ChallengeController.java index 89cbb13c6..53ad58991 100644 --- a/src/main/java/com/techlooper/controller/ChallengeController.java +++ b/src/main/java/com/techlooper/controller/ChallengeController.java @@ -19,6 +19,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; import java.util.List; import java.util.Set; @@ -118,7 +119,7 @@ public ChallengeDto findChallengeById(@PathVariable Long challengeId) throws Exc @PreAuthorize("hasAuthority('EMPLOYER')") @RequestMapping(value = "/challenges/{challengeId}/registrants", method = RequestMethod.POST) public Set getRegistrantsById(@PathVariable Long challengeId, - @RequestBody RegistrantFilterCondition condition, HttpServletRequest request) { + @RequestBody RegistrantFilterCondition condition, HttpServletRequest request) throws ParseException { condition.setChallengeId(challengeId); condition.setAuthorEmail(request.getRemoteUser()); return challengeService.findRegistrantsByOwner(condition); From ce626bfd5d53ba04dd176e6379d35eee7b5cff6d Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Wed, 7 Oct 2015 18:14:42 +0700 Subject: [PATCH 045/158] update translate for no submission submitted yet --- .../modules/contest-detail/contestDetailReviewSubmission.html | 2 +- src/main/webapp/assets/modules/translation/messages_en.json | 1 + src/main/webapp/assets/modules/translation/messages_vi.json | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html b/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html index 7c3d98fef..33da5b321 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailReviewSubmission.html @@ -1,6 +1,6 @@
    -

    +

    diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index f4d1b27d6..040a3e13b 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -760,6 +760,7 @@ "descriptionSubmissionTips": "Write some lines to describe your submission to the challenge owner", "submissionPhaseSuccessful": "You have submitted successfully.", "review": "Review", + "noDataSubmission": "This contestant hasn't submitted yet.", "feedback": "Feedback", "subject": "Subject", "submissionLink": "Submission Link", diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json index c7beea369..2fd014932 100644 --- a/src/main/webapp/assets/modules/translation/messages_vi.json +++ b/src/main/webapp/assets/modules/translation/messages_vi.json @@ -763,8 +763,9 @@ "descriptionSubmissionTips": "Chú thích cho bài gửi của bạn", "submissionPhaseSuccessful": "Bạn đã gửi bài thành công.", "review": "Xem bài", + "noDataSubmission": "Thí sinh này chưa gửi bài.", "feedback": "Phản hồi", - "subject": "Subject", + "subject": "Tiêu đề", "submissionLink": "URL bài gửi", "date": "Date", "descriptionCol": "Chú thích", From cfb0cd75656f6f55176b713b625c872a6f1f5f35 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Thu, 8 Oct 2015 10:55:13 +0700 Subject: [PATCH 046/158] Implement registrants filter on the challenge details page --- .../assets/modules/common/resourcesService.js | 7 ++++ .../modules/contest-detail/contestDetail.html | 33 +++++++++++++++---- .../contest-detail/contestDetailController.js | 22 +++++-------- .../modules/translation/messages_en.json | 5 ++- .../modules/translation/messages_vi.json | 5 ++- .../webapp/assets/sass/contest-detail.sass | 2 ++ 6 files changed, 52 insertions(+), 22 deletions(-) diff --git a/src/main/webapp/assets/modules/common/resourcesService.js b/src/main/webapp/assets/modules/common/resourcesService.js index 71d8853b2..1fb804019 100644 --- a/src/main/webapp/assets/modules/common/resourcesService.js +++ b/src/main/webapp/assets/modules/common/resourcesService.js @@ -1,4 +1,9 @@ techlooper.factory("resourcesService", function ($translate, $q) { + var registrantsFilterOptions = [ + {translate: "allContestants", id: "allContestants"}, + {translate: "allSubmission", id: "allSubmission"} + ]; + var reviewStyleOptions = [ {translate: "contestOwnerSignOff", id: "contestOwnerSignOff"} ]; @@ -68,6 +73,7 @@ techlooper.factory("resourcesService", function ($translate, $q) { } var instance = { + registrantsFilterConfig: $.extend(true, {}, {options: registrantsFilterOptions}, titleSelectize("registrantsFilterConfig")), reviewStyleConfig: $.extend(true, {}, {options: reviewStyleOptions}, titleSelectize("reviewStyleConfig")), qualityIdeaConfig: $.extend(true, {}, {options: qualityIdeaOptions}, titleSelectize("qualityIdeaConfig")), paymentConfig: $.extend(true, {}, {options: paymentOptions}, idSelectize("paymentConfig")), @@ -98,6 +104,7 @@ techlooper.factory("resourcesService", function ($translate, $q) { } var translations = [ + {ins: instance.registrantsFilterConfig, placeholder: "exRegistrantsFilterConfig"}, {ins: instance.reviewStyleConfig, placeholder: "exContestOwnerSignOff"}, {ins: instance.qualityIdeaConfig, placeholder: "exQualityIdeaConfig"}, {ins: instance.paymentConfig, placeholder: "exPaymentConfig"}, diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 2621d194e..c8f2855ac 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -187,7 +187,6 @@

    -

    {{contestDetail.qualityIdea}}

    @@ -195,12 +194,32 @@

    -
    - - +
    +
    +
    + +
    +
    +
    + +
    + + + + +
    +
    + + + + + +
    +
    +
    +
    diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index ca1b03cae..d6ea7813a 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -1,5 +1,5 @@ techlooper.controller('contestDetailController', function ($scope, apiService, localStorageService, $location, $routeParams, - jsonValue, $translate, utils, $filter, $timeout) { + jsonValue, $translate, utils, $filter, $timeout, resourcesService) { utils.sendNotification(jsonValue.notifications.loading); var parts = $routeParams.id.split("-"); @@ -184,17 +184,13 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l else { subForm.addClass('show'); } - } - - //$scope.showActionForm = function(id){ - // $('.action-content').removeClass('show'); - // var parent = $('#id-'+id); - // var div = parent.find('.action-content'); - // if(div.hasClass('show')){ - // div.removeClass('show'); - // }else{ - // div.addClass('show'); - // } - //} + }; + $scope.config = { + registrantsFilter: resourcesService.registrantsFilterConfig + }; + $('.registrants-date').find('.date').datepicker({ + autoclose: true, + format: 'dd/mm/yyyy' + }); }); diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json index 040a3e13b..8b10e98c3 100644 --- a/src/main/webapp/assets/modules/translation/messages_en.json +++ b/src/main/webapp/assets/modules/translation/messages_en.json @@ -769,5 +769,8 @@ "join": "Join", "submitPhase": "Submit", "accept": "Accept", - "acceptDescription": "Are you sure you want to select this contestant from {{phase1}} phase to {{phase2}} phase?" + "acceptDescription": "Are you sure you want to select this contestant from {{phase1}} phase to {{phase2}} phase?", + "exRegistrantsFilterConfig": "All Contestants", + "allContestants": "All Contestants", + "allSubmission": "All Submission" } \ No newline at end of file diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json index 2fd014932..2933cbd5a 100644 --- a/src/main/webapp/assets/modules/translation/messages_vi.json +++ b/src/main/webapp/assets/modules/translation/messages_vi.json @@ -772,6 +772,9 @@ "join": "Tham Gia", "submitPhase": "Gửi Bài", "accept": "Đi Tiếp", - "acceptDescription": "Bạn có muốn chọn thí sinh này từ vòng {{phase1}} vào vòng {{phase1}}?" + "acceptDescription": "Bạn có muốn chọn thí sinh này từ vòng {{phase1}} vào vòng {{phase1}}?", + "allContestants": "Tất cả thí sinh", + "exRegistrantsFilterConfig": "Tất cả thí sinh", + "allSubmission": "Tất cả bài nộp" } diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index a953f75cd..5d9eaa87e 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -233,6 +233,8 @@ border: 1px solid #ddd border-top: 0 padding: 20px 0 + .registrants + .registrants-paging display: inline-block clear: both From acc83449b6c18490a3fbcd7b1d74308b91c3c7e9 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Thu, 8 Oct 2015 11:27:28 +0700 Subject: [PATCH 047/158] Add noLogin to VNW params --- src/main/webapp/assets/index.tem.html | 2 +- src/main/webapp/assets/modules/common/securityService.js | 6 ++++++ src/main/webapp/assets/modules/footer/footer.html | 2 +- src/main/webapp/assets/modules/navigation/nav-bar.html | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/assets/index.tem.html b/src/main/webapp/assets/index.tem.html index b9c9aa7f7..b1c78a434 100644 --- a/src/main/webapp/assets/index.tem.html +++ b/src/main/webapp/assets/index.tem.html @@ -112,7 +112,7 @@ - + diff --git a/src/main/webapp/assets/modules/footer/footer.html b/src/main/webapp/assets/modules/footer/footer.html index d10992237..bd264c3bd 100644 --- a/src/main/webapp/assets/modules/footer/footer.html +++ b/src/main/webapp/assets/modules/footer/footer.html @@ -33,7 +33,7 @@

      -
      • +
    diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass index 54a842384..83275b730 100644 --- a/src/main/webapp/assets/sass/contests.sass +++ b/src/main/webapp/assets/sass/contests.sass @@ -260,6 +260,7 @@ display: inline-block border-radius: 4px margin-top: 10px + position: relative .submit-phase-contest.show height: 280px background-color: #f1f2f7 diff --git a/src/main/webapp/assets/sass/home.sass b/src/main/webapp/assets/sass/home.sass index 6d4d2bc5c..6f26d81f1 100644 --- a/src/main/webapp/assets/sass/home.sass +++ b/src/main/webapp/assets/sass/home.sass @@ -896,8 +896,7 @@ border: 1px solid #e7e7e7 padding: 15px width: 100% - - + min-height: 580px .box-header width: 100% clear: both diff --git a/src/main/webapp/assets/sass/main.sass b/src/main/webapp/assets/sass/main.sass index 598de96d3..f673463df 100644 --- a/src/main/webapp/assets/sass/main.sass +++ b/src/main/webapp/assets/sass/main.sass @@ -139,7 +139,7 @@ textarea.change-color background-color: #0077b5 .buffer background-color: #323b43 -#feedback-loading +.feedback-loading width: 100% height: 100% position: absolute From 6d93154c34a9622e467d63c3a466abefff6dd67a Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 10:37:39 +0700 Subject: [PATCH 097/158] change id to class for feedback-loading --- .../modules/common/challenge/submissionChallenge.html | 1 + .../assets/modules/common/feedback/feedbackDirective.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html index 83f708b15..2358e723e 100644 --- a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html +++ b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html @@ -39,4 +39,5 @@ + \ No newline at end of file diff --git a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js index 484b56d03..5a4ecf565 100644 --- a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js +++ b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js @@ -31,11 +31,11 @@ techlooper.directive("feedbackForm", function (apiService, $timeout) { if(scope.composeEmail.content == '


    ' || scope.composeEmail.content == ''){ return; } - $('#feedback-loading').css('visibility', 'inherit'); + $('.feedback-loading').css('visibility', 'inherit'); apiService.sendEmailToDailyChallengeRegistrants(scope.composeEmail.challengeId, scope.composeEmail.registrantId, scope.composeEmail) .finally(function () { $timeout(function(){ - $('#feedback-loading').css('visibility', 'hidden'); + $('.feedback-loading').css('visibility', 'hidden'); scope.cancel(); }, 500); }); @@ -45,7 +45,7 @@ techlooper.directive("feedbackForm", function (apiService, $timeout) { scope.composeEmail.subject = ''; $('.summernote').code(''); delete scope.composeEmail.visible; - $('#feedback-loading').css('visibility', 'hidden'); + $('.feedback-loading').css('visibility', 'hidden'); } } } From 2420294f421d9d67a6fd35e713df4e8a2bd95b5f Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 12 Oct 2015 10:38:42 +0700 Subject: [PATCH 098/158] Fix bug about submission --- .../modules/common/challenge/submissionChallenge.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js index 7d3b02a66..c495897b3 100644 --- a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js @@ -21,20 +21,21 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe return false; } - apiService.getUrlResponseCode(scope.submission.submissionURL) - .success(function(code) { - if (code == 200) { + .success(function (code) { + var valid = (code >= 200) || (code < 400); + if (valid) { scope.submission.challengeId = scope.challenge.challengeId; apiService.submitMyResult(scope.submission) + .success(function(data) { + + }) .finally(function () { scope.hideSubmitForm(); }); } - scope.submissionForm.submissionURL.$setValidity("invalidUrl", (code >= 200) || (code < 400)); + scope.submissionForm.submissionURL.$setValidity("invalidUrl", valid); }); - - } scope.hideSubmitForm = function () { From 7a2b05df12e0d63d6c292586bfc2a63e4f272505 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 10:45:55 +0700 Subject: [PATCH 099/158] add loading for submission challenge --- .../modules/common/challenge/submissionChallenge.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js index c495897b3..4788fd1e3 100644 --- a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js @@ -1,4 +1,4 @@ -techlooper.directive("submissionChallenge", function (localStorageService, apiService) { +techlooper.directive("submissionChallenge", function (localStorageService, apiService, $timeout) { return { restrict: "E", replace: true, @@ -20,7 +20,7 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe if (scope.submissionForm.$invalid) { return false; } - + $('.feedback-loading').css('visibility', 'inherit'); apiService.getUrlResponseCode(scope.submission.submissionURL) .success(function (code) { var valid = (code >= 200) || (code < 400); @@ -35,7 +35,13 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe }); } scope.submissionForm.submissionURL.$setValidity("invalidUrl", valid); - }); + }) + .finally(function () { + $timeout(function(){ + $('.feedback-loading').css('visibility', 'hidden'); + scope.cancel(); + }, 500); + }); } scope.hideSubmitForm = function () { From 46984d75349b319705851b50c7278b3dccf1e915 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 10:52:52 +0700 Subject: [PATCH 100/158] update translate --- .../webapp/assets/modules/contest-detail/contestDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 0ea3e6d89..17d4b500f 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -80,7 +80,7 @@

    + From 3f27f5da8b6dbb8d9f6af8f56c950a4f247b8099 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 12 Oct 2015 11:01:44 +0700 Subject: [PATCH 101/158] Fix url not startWith http --- .../com/techlooper/controller/SharingController.java | 4 +++- src/main/java/com/techlooper/dto/ResourceDto.java | 3 ++- .../com/techlooper/model/ChallengeSubmissionDto.java | 10 ++++++++++ .../modules/common/challenge/submissionChallenge.js | 7 ++++--- .../modules/contest-detail/contestDetailDirective.js | 9 ++++++++- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/techlooper/controller/SharingController.java b/src/main/java/com/techlooper/controller/SharingController.java index c186a829d..2a64d994a 100644 --- a/src/main/java/com/techlooper/controller/SharingController.java +++ b/src/main/java/com/techlooper/controller/SharingController.java @@ -76,7 +76,9 @@ public String renderFreelancerProject(@PathVariable String language, @PathVariab public Long getUrlResponseCode(@RequestBody ResourceDto resourceDto) { try { HttpURLConnection.setFollowRedirects(false); - HttpURLConnection con = (HttpURLConnection) new URL(resourceDto.getUrl()).openConnection(); + String url = resourceDto.getUrl().trim(); + url = url.startsWith("http://") ? url : "http://" + url; + HttpURLConnection con = (HttpURLConnection) new URL(url).openConnection(); con.setRequestMethod("HEAD"); int responseCode = con.getResponseCode(); return Long.valueOf(responseCode); diff --git a/src/main/java/com/techlooper/dto/ResourceDto.java b/src/main/java/com/techlooper/dto/ResourceDto.java index 7fe5c44be..6dad1d571 100644 --- a/src/main/java/com/techlooper/dto/ResourceDto.java +++ b/src/main/java/com/techlooper/dto/ResourceDto.java @@ -10,7 +10,8 @@ public class ResourceDto implements Serializable { private String url; public String getUrl() { - return url; + url = url.trim(); + return url.startsWith("http://") ? url : "http://" + url; } public void setUrl(String url) { diff --git a/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java b/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java index 1844ce6e7..5762a6048 100644 --- a/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java +++ b/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java @@ -15,12 +15,22 @@ public class ChallengeSubmissionDto implements Serializable { private Long challengeId; + private Long registrantId; + private String submissionURL; private String submissionDescription; private String submissionDateTime; + public Long getRegistrantId() { + return registrantId; + } + + public void setRegistrantId(Long registrantId) { + this.registrantId = registrantId; + } + public String getRegistrantFirstName() { return registrantFirstName; } diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js index c495897b3..764909d61 100644 --- a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js @@ -1,4 +1,4 @@ -techlooper.directive("submissionChallenge", function (localStorageService, apiService) { +techlooper.directive("submissionChallenge", function (localStorageService, apiService, $rootScope) { return { restrict: "E", replace: true, @@ -23,12 +23,13 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe apiService.getUrlResponseCode(scope.submission.submissionURL) .success(function (code) { - var valid = (code >= 200) || (code < 400); + var valid = (code >= 200) && (code < 400); if (valid) { scope.submission.challengeId = scope.challenge.challengeId; apiService.submitMyResult(scope.submission) .success(function(data) { - + var submission = data; + $rootScope.$broadcast("success-submission-challenge", submission); }) .finally(function () { scope.hideSubmitForm(); diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js index 82ba24a6d..6afad2a23 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js @@ -1,5 +1,5 @@ techlooper - .directive("contestDetailAction", function ($rootScope, apiService, paginationService) { + .directive("contestDetailAction", function ($rootScope, apiService, paginationService, utils) { return { restrict: "E", replace: true, @@ -78,6 +78,13 @@ techlooper }, function (currentPage, previousPage) { scope.registrant.hide(); }); + + scope.$on("success-submission-challenge", function(submission) { + if (scope.registrant.registrantId != submission.registrantId) return; + scope.registrant.submissions.unshift(submission); + }); + + utils.sortByDate(scope.registrant.submissions, "submissionDateTime"); } }; }) From 330ed2a043ccd00cd8b47bc611f605df8e638c6f Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 11:02:36 +0700 Subject: [PATCH 102/158] Change the price job ES query to handle the location is "Any Location" --- .../service/impl/JobQueryBuilderImpl.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/techlooper/service/impl/JobQueryBuilderImpl.java b/src/main/java/com/techlooper/service/impl/JobQueryBuilderImpl.java index e713adc0b..f152f60d5 100644 --- a/src/main/java/com/techlooper/service/impl/JobQueryBuilderImpl.java +++ b/src/main/java/com/techlooper/service/impl/JobQueryBuilderImpl.java @@ -277,12 +277,22 @@ public NativeSearchQueryBuilder getSearchQueryForPriceJobReport(PriceJobEntity p FilterBuilder approvedDateRangeFilterBuilder = getRangeFilterBuilder("approvedDate", "now-6M/M", null); FilterBuilder salaryRangeFilterBuilder = getSalaryRangeFilterBuilder(MIN_SALARY_ACCEPTABLE, MAX_SALARY_ACCEPTABLE); - queryBuilder.withQuery(filteredQuery(jobTitleQueryBuilder, - boolFilter().must(locationFilterBuilder) - .must(jobLevelFilterBuilder) - .must(approvedDateRangeFilterBuilder) - .must(jobIndustriesFilterBuilder) - .must(salaryRangeFilterBuilder))); + BoolFilterBuilder boolFilterBuilder = boolFilter(); + if (priceJobEntity.getLocationId() != null && priceJobEntity.getLocationId() != 1) { + boolFilterBuilder.must(locationFilterBuilder); + } + + if (!priceJobEntity.getJobLevelIds().isEmpty()) { + boolFilterBuilder.must(jobLevelFilterBuilder); + } + + if (!priceJobEntity.getJobCategories().isEmpty()) { + boolFilterBuilder.must(jobIndustriesFilterBuilder); + } + + boolFilterBuilder.must(approvedDateRangeFilterBuilder); + boolFilterBuilder.must(salaryRangeFilterBuilder); + queryBuilder.withQuery(filteredQuery(jobTitleQueryBuilder, boolFilterBuilder)); return queryBuilder; } From e3779ce14c5fff9663162a8214e1ec0aab134bea Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 11:07:27 +0700 Subject: [PATCH 103/158] Move the ES configuration from staging ES to dev ES --- src/main/resources/local/techlooper.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/local/techlooper.properties b/src/main/resources/local/techlooper.properties index bef1afd40..19c177591 100644 --- a/src/main/resources/local/techlooper.properties +++ b/src/main/resources/local/techlooper.properties @@ -1,12 +1,12 @@ -elasticsearch.cluster.name = staging-es-w-chef +elasticsearch.cluster.name = dev-es-w-chef elasticsearch.index.name = vietnamworks #find new way to use template ip:port -elasticsearch.host = 172.16.22.27:9300 +elasticsearch.host = es-dev.vietnamworks.com:9300 -elasticsearch.userimport.cluster.name = staging-es-w-chef +elasticsearch.userimport.cluster.name = dev-es-w-chef elasticsearch.userimport.index.name = techlooper -elasticsearch.userimport.host = 172.16.22.27:9300 +elasticsearch.userimport.host = es-dev.vietnamworks.com:9300 couchbase.connectionUri = http://127.0.0.1:8091 couchbase.adminUser = Administrator From 56874c5441509372dc8c0ebc329b66ed755c1ee6 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 11:15:47 +0700 Subject: [PATCH 104/158] add word-break: break-all for subject column and link column --- src/main/webapp/assets/sass/contest-detail.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 85e29f156..f359ab166 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -427,10 +427,14 @@ width: 40% float: left text-align: left + word-break: break-all + padding-right: 5px .submission-link-col width: 50% float: left text-align: left + word-break: break-all + padding-right: 5px a text-align: left color: #337ab7 From 40f074b5dab6cf665610f2aee90b6d61bb9eb874 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 11:45:07 +0700 Subject: [PATCH 105/158] update icon for action list --- .../assets/modules/contest-detail/contestDetail.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 17d4b500f..9b6f1b5da 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -287,12 +287,12 @@

  • - {{'qualify' | translate}} + {{'qualify' | translate}}
  • {{'review' | translate}}
  • - {{'feedback' | translate}}
    • + {{'feedback' | translate}}
  • {{'accept' | translate}}
    • @@ -309,10 +309,10 @@

  • - {{'qualify' | translate}} + {{'qualify' | translate}}
  • {{'review' | translate}}
    • -
  • {{'feedback' | translate}}
    • +
  • {{'feedback' | translate}}
  • {{'accept' | translate}}
    • From 1e79652de83d41ca5156080747db5a11038a7918 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 11:50:49 +0700 Subject: [PATCH 106/158] fix bug editor can not selection bold, italic... on the toolbar --- .../assets/modules/common/feedback/feedbackDirective.js | 2 +- src/main/webapp/assets/sass/contest-detail.sass | 8 ++++---- src/main/webapp/assets/sass/main.sass | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js index 5a4ecf565..e5fd43842 100644 --- a/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js +++ b/src/main/webapp/assets/modules/common/feedback/feedbackDirective.js @@ -43,7 +43,7 @@ techlooper.directive("feedbackForm", function (apiService, $timeout) { scope.cancel = function () { if (!scope.composeEmail.visible) return; scope.composeEmail.subject = ''; - $('.summernote').code(''); + $('.summernote').code('


    '); delete scope.composeEmail.visible; $('.feedback-loading').css('visibility', 'hidden'); } diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index f359ab166..55a8d2736 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -291,16 +291,12 @@ tr.qualify color: #999999 - input - color: #999999 span - font-style: italic font-size: 12px line-height: 16px display: block word-break: break-all button - color: #999999 span display: inline-block a.btn @@ -535,14 +531,18 @@ border: 0 .mail-subject padding: 10px 0 + .control-label + color: #333 .mail-text .note-editor background-color: #fff min-height: 200px .note-toolbar background-color: #f3fafe + color: #333 .note-editable background-color: #fff text-align: left + color: #333 .email-footer text-align: right padding: 10px 0 diff --git a/src/main/webapp/assets/sass/main.sass b/src/main/webapp/assets/sass/main.sass index f673463df..c2f56be34 100644 --- a/src/main/webapp/assets/sass/main.sass +++ b/src/main/webapp/assets/sass/main.sass @@ -149,6 +149,9 @@ textarea.change-color left: 0 opacity: 0.5 visibility: hidden +.note-editable + span + width: auto !important .datepicker-days td, th From fdea0f501b4ea5d9861a3baef198d023ef7c35a1 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 11:53:51 +0700 Subject: [PATCH 107/158] add cursor for date icon --- src/main/webapp/assets/sass/contest-detail.sass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 55a8d2736..4c0d5834c 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -255,6 +255,8 @@ float: left input border: 1px solid #cccccc + .input-group-addon + cursor: pointer .input-group-addon.left border-radius: 4px 0 0 4px .input-group-addon.none From a6c897cbb443128a508c6bf41279b1699684fbd8 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 11:59:32 +0700 Subject: [PATCH 108/158] Fix issue : show expired challenge in the employer dashboard challenge list --- .../service/impl/ChallengeServiceImpl.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 063c53be7..8ce3843cf 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -540,17 +540,15 @@ public Collection findByOwnerAndCondition(String owner, } public List listChallenges(String ownerEmail) { + List result = new ArrayList<>(); + NativeSearchQueryBuilder searchQueryBuilder = new NativeSearchQueryBuilder().withTypes("challenge"); MatchQueryBuilder authorEmailQuery = matchQuery("authorEmail", ownerEmail).minimumShouldMatch("100%"); TermQueryBuilder notExpiredQuery = termQuery("expired", Boolean.TRUE); - Iterable challenges = challengeRepository.search(boolQuery().must(authorEmailQuery).mustNot(notExpiredQuery)); - ArrayList dtos = new ArrayList<>(); - challenges.forEach(challengeEntity -> { - ChallengeDetailDto challengeDetailDto = dozerMapper.map(challengeEntity, ChallengeDetailDto.class); - challengeDetailDto.setNumberOfRegistrants(getNumberOfRegistrants(challengeEntity.getChallengeId())); - dtos.add(challengeDetailDto); - }); - dozerMapper.map(challenges, dtos); - return dtos; + + searchQueryBuilder.withQuery(boolQuery().must(authorEmailQuery).mustNot(notExpiredQuery)); + List challengeEntities = DataUtils.getAllEntities(challengeRepository, searchQueryBuilder); + dozerMapper.map(challengeEntities, result); + return result; } public Collection findInProgressChallenges(String owner) { @@ -841,8 +839,16 @@ public Set findRegistrantByChallengeSubmissionDate(Long challengeId, Strin } public ChallengeDetailDto getChallengeDetail(Long challengeId, String loginEmail) { - ChallengeEntity challengeEntity = challengeRepository.findOne(challengeId); - if (challengeEntity != null && !Boolean.TRUE.equals(challengeEntity.getExpired())) { + NativeSearchQueryBuilder searchQueryBuilder = new NativeSearchQueryBuilder().withTypes("challenge"); + TermQueryBuilder challengeIdQuery = termQuery("challengeId", challengeId); + MatchQueryBuilder authorEmailQuery = matchQuery("authorEmail", loginEmail).minimumShouldMatch("100%"); + TermQueryBuilder expiredChallengeQuery = termQuery("expired", Boolean.TRUE); + + searchQueryBuilder.withQuery(boolQuery().must(challengeIdQuery).must(authorEmailQuery).mustNot(expiredChallengeQuery)); + List challengeEntities = DataUtils.getAllEntities(challengeRepository, searchQueryBuilder); + + if (!challengeEntities.isEmpty()) { + ChallengeEntity challengeEntity = challengeEntities.get(0); ChallengeDetailDto challengeDetailDto = dozerMapper.map(challengeEntity, ChallengeDetailDto.class); challengeDetailDto.setNumberOfRegistrants(getNumberOfRegistrants(challengeId)); challengeDetailDto.setCurrentPhase(getChallengeCurrentPhase(challengeEntity)); From aa90331693c6875fe47fe38876190812477a5ca6 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 14:01:44 +0700 Subject: [PATCH 109/158] Only save one record as a challenge registrant if sending email successfully --- .../com/techlooper/service/impl/ChallengeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 8ce3843cf..4b9f64644 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -316,12 +316,12 @@ public ChallengeRegistrantEntity joinChallengeEntity(ChallengeRegistrantDto chal try { sendApplicationEmailToContestant(challengeEntity, challengeRegistrantEntity); sendApplicationEmailToEmployer(challengeEntity, challengeRegistrantEntity); + challengeRegistrantEntity.setRegistrantId(new Date().getTime()); challengeRegistrantEntity.setMailSent(Boolean.TRUE); + return challengeRegistrantRepository.save(challengeRegistrantEntity); } catch (Exception e) { LOGGER.debug("Can not send email", e); } - challengeRegistrantEntity.setRegistrantId(new Date().getTime()); - return challengeRegistrantRepository.save(challengeRegistrantEntity); } return null; From 9bdb091e3d199ab07a2cf6e14420987c17432f7c Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 12 Oct 2015 14:28:00 +0700 Subject: [PATCH 110/158] Fix spring security session timeout --- .../web/DispatcherServletInitializer.java | 4 +++- .../config/web/sec/SecurityConfiguration.java | 5 +++-- .../config/web/sec/SessionListener.java | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/techlooper/config/web/sec/SessionListener.java diff --git a/src/main/java/com/techlooper/config/web/DispatcherServletInitializer.java b/src/main/java/com/techlooper/config/web/DispatcherServletInitializer.java index 8495fe424..83c80f873 100644 --- a/src/main/java/com/techlooper/config/web/DispatcherServletInitializer.java +++ b/src/main/java/com/techlooper/config/web/DispatcherServletInitializer.java @@ -19,6 +19,7 @@ import com.techlooper.config.CoreConfiguration; import com.techlooper.config.VnwDbConfiguration; import com.techlooper.config.web.sec.SecurityConfiguration; +import com.techlooper.config.web.sec.SessionListener; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; import javax.servlet.ServletContext; @@ -34,8 +35,9 @@ public class DispatcherServletInitializer extends AbstractAnnotationConfigDispat // private String profile; public void onStartup(ServletContext servletContext) throws ServletException { - servletContext.getSessionCookieConfig().setMaxAge(15770000); super.onStartup(servletContext); + servletContext.getSessionCookieConfig().setMaxAge(15770000); + servletContext.addListener(new SessionListener()); } protected Class[] getRootConfigClasses() { diff --git a/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java b/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java index dd746f3b9..1b666b055 100644 --- a/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java +++ b/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java @@ -10,6 +10,7 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; @@ -56,8 +57,8 @@ public AuthenticationManager authenticationManager() { } protected void configure(HttpSecurity http) throws Exception { - http.csrf().disable() - .authorizeRequests() + http.csrf().disable(); + http.authorizeRequests() .and().formLogin().loginPage("/login").usernameParameter("us").passwordParameter("pwd").successHandler(getSuccessHandler()).failureHandler(getAuthenticationFailureHandler()) .and().logout().logoutUrl("/logout").logoutSuccessHandler(getLogoutSuccessHandler()).invalidateHttpSession(true).deleteCookies("SESSION").permitAll() .and().exceptionHandling().authenticationEntryPoint(exceptionHandler()); diff --git a/src/main/java/com/techlooper/config/web/sec/SessionListener.java b/src/main/java/com/techlooper/config/web/sec/SessionListener.java new file mode 100644 index 000000000..96a1f85ac --- /dev/null +++ b/src/main/java/com/techlooper/config/web/sec/SessionListener.java @@ -0,0 +1,17 @@ +package com.techlooper.config.web.sec; + +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; + +/** + * Created by phuonghqh on 10/12/15. + */ +public class SessionListener implements HttpSessionListener { + + public void sessionCreated(HttpSessionEvent event) { + event.getSession().setMaxInactiveInterval(15770000); + } + + public void sessionDestroyed(HttpSessionEvent se) { + } +} From b85e644e50fa1cafce37146a74d30562c5b06a1a Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 14:56:26 +0700 Subject: [PATCH 111/158] add loading for filter registrants --- .../modules/contest-detail/contestDetailController.js | 8 +------- src/main/webapp/assets/sass/contest-detail.sass | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index 5a694ba67..3c238fc2d 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -147,12 +147,6 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l apiService.getChallengeRegistrants(registrantFilterCondition) .success(function (registrants) { $scope.registrants = registrants; - //$.each($scope.registrants, function(i, registrant){ - // if(registrant.activePhase == null){ - // registrant.activePhase = 'REGISTRATION'; - // } - // registrant.nextPhase = $scope.contestDetail.nextPhase; - //}); $scope.sortByStartDate(); var param = $location.search(); if (param.a == "registrants" && registrants.length) { @@ -168,7 +162,7 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l registrantFilterCondition.filterType = $scope.filterType; registrantFilterCondition.fromDate = $scope.fromDate; registrantFilterCondition.toDate = $scope.toDate; - + utils.sendNotification(jsonValue.notifications.loading); apiService.getChallengeRegistrants(registrantFilterCondition) .success(function (registrants) { $scope.registrants = registrants; diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 4c0d5834c..46ca96a24 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -294,7 +294,6 @@ tr.qualify color: #999999 span - font-size: 12px line-height: 16px display: block word-break: break-all @@ -305,6 +304,8 @@ span display: inline-block font-style: normal + input + color: #333 i.registration, i.in-progress, i.idea, From fe2eae0cc0acf8414635aa6c8148692daf6940fd Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 12 Oct 2015 15:06:04 +0700 Subject: [PATCH 112/158] Fix challengePhase title --- .../modules/common/filter/progressFilter.js | 11 ++++++ .../webapp/assets/modules/common/json.val.js | 20 +++++++++-- .../modules/contest-detail/contestDetail.html | 2 +- .../contestDetailAcceptance.html | 4 +-- .../contest-detail/contestDetailController.js | 36 ++++++++++--------- 5 files changed, 51 insertions(+), 22 deletions(-) diff --git a/src/main/webapp/assets/modules/common/filter/progressFilter.js b/src/main/webapp/assets/modules/common/filter/progressFilter.js index 2b10d9bdd..d77d1e552 100644 --- a/src/main/webapp/assets/modules/common/filter/progressFilter.js +++ b/src/main/webapp/assets/modules/common/filter/progressFilter.js @@ -61,6 +61,17 @@ techlooper.filter("progress", function (jsonValue, resourcesService, localStorag if (!registrant.activePhase) return jsonValue.challengePhase.getRegistration().enum; return registrant.activePhase; + case "registrantActivePhaseTitle": + var registrant = input; + if (!registrant.activePhase) input = jsonValue.challengePhase.getRegistration(); + if (!input.title) return jsonValue.challengePhase.getEnum(registrant.activePhase).title; + return input.title; + + case "challengePhaseTitle": + var phase = input ? input : jsonValue.challengePhase.getRegistration().enum; + if (!phase.title) return jsonValue.challengePhase.getEnum(phase).title; + return phase.title; + case "freelancer-review-project-payment-method": var payMethod = input; var option = resourcesService.getOption(payMethod, resourcesService.paymentConfig); diff --git a/src/main/webapp/assets/modules/common/json.val.js b/src/main/webapp/assets/modules/common/json.val.js index 5df00add4..4c4805783 100644 --- a/src/main/webapp/assets/modules/common/json.val.js +++ b/src/main/webapp/assets/modules/common/json.val.js @@ -1018,10 +1018,26 @@ techlooper.factory("jsonValue", function () { {id: "itviec-jobs-api-v2", name: "ITVIEC"} ], + //@see com.techlooper.model.ChallengePhaseEnum challengePhase: { - values: [{enum: "REGISTRATION"}], + values: [ + {enum: "REGISTRATION", title: "Registration"}, + {enum: "IDEA", title: "Idea"}, + {enum: "UIUX", title: "UI/UX"}, + {enum: "PROTOTYPE", title: "Prototype"}, + {enum: "FINAL", title: "Final App"} + ], - getRegistration: function () {return instance.challengePhase.values[0]} + getRegistration: function () {return instance.challengePhase.values[0]}, + + getEnum: function(name) { + var found = undefined; + $.each(instance.challengePhase.values, function(i, value) { + found = (value.enum == name) ? value : undefined; + return !found; + }); + return found; + } } } diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 9b6f1b5da..d3f6e5785 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -262,7 +262,7 @@

    {{user.registrantFirstName}} {{user.registrantLastName}} - {{user | progress: "registrantActivePhase" | textTruncate: "capitalize"}} + {{user | progress: "registrantActivePhaseTitle"}}

    {{'disqualifyingReason' | translate}}: {{user.disqualifiedReason}}

    diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailAcceptance.html b/src/main/webapp/assets/modules/contest-detail/contestDetailAcceptance.html index 308750b7c..826ac2656 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailAcceptance.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailAcceptance.html @@ -1,7 +1,7 @@
    -

    +

    diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index 5a694ba67..3850e68dc 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -144,23 +144,23 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l challengeId : contestId }; - apiService.getChallengeRegistrants(registrantFilterCondition) - .success(function (registrants) { - $scope.registrants = registrants; - //$.each($scope.registrants, function(i, registrant){ - // if(registrant.activePhase == null){ - // registrant.activePhase = 'REGISTRATION'; - // } - // registrant.nextPhase = $scope.contestDetail.nextPhase; - //}); - $scope.sortByStartDate(); - var param = $location.search(); - if (param.a == "registrants" && registrants.length) { - $('.nav-tabs a[href=".registrants"]').tab('show'); - } - }).finally(function () { - utils.sendNotification(jsonValue.notifications.loaded); - }); + //apiService.getChallengeRegistrants(registrantFilterCondition) + // .success(function (registrants) { + // $scope.registrants = registrants; + // //$.each($scope.registrants, function(i, registrant){ + // // if(registrant.activePhase == null){ + // // registrant.activePhase = 'REGISTRATION'; + // // } + // // registrant.nextPhase = $scope.contestDetail.nextPhase; + // //}); + // $scope.sortByStartDate(); + // var param = $location.search(); + // if (param.a == "registrants" && registrants.length) { + // $('.nav-tabs a[href=".registrants"]').tab('show'); + // } + // }).finally(function () { + // utils.sendNotification(jsonValue.notifications.loaded); + //}); $scope.filterContestant = function () { var registrantFilterCondition = {}; @@ -182,6 +182,8 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l }); }; + $scope.filterContestant(); + $scope.sortByScore = function () { delete $scope.sortStartDate; $scope.sortScore = $scope.sortScore || "asc"; From 2e88a5117728791a2c5fd69f5f67dd0f0e4eb9ce Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 15:17:14 +0700 Subject: [PATCH 113/158] Fix issue show 404 page when click on a valid challenge --- .../service/impl/ChallengeServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 4b9f64644..004bca785 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -547,7 +547,12 @@ public List listChallenges(String ownerEmail) { searchQueryBuilder.withQuery(boolQuery().must(authorEmailQuery).mustNot(notExpiredQuery)); List challengeEntities = DataUtils.getAllEntities(challengeRepository, searchQueryBuilder); - dozerMapper.map(challengeEntities, result); + + for (ChallengeEntity challengeEntity : challengeEntities) { + ChallengeDetailDto challengeDetailDto = dozerMapper.map(challengeEntity, ChallengeDetailDto.class); + challengeDetailDto.setNumberOfRegistrants(getNumberOfRegistrants(challengeDetailDto.getChallengeId())); + result.add(challengeDetailDto); + } return result; } @@ -911,9 +916,11 @@ private int getChallengeCurrentPhaseIndex(ChallengeEntity challengeEntity) { for (int i = 0; i < timeline.length; ++i) { try { String milestone = timeline[i]; - if (DateTimeUtils.daysBetween(now, milestone) < 0) break; + if (DateTimeUtils.daysBetween(now, milestone) < 0) { + break; + } currentMilestoneIndex = i; - } catch (ParseException e) { + } catch (ParseException | NullPointerException e) { continue; } } From f000e79b747a48e26834a415ba964a56e79dc74a Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 15:24:56 +0700 Subject: [PATCH 114/158] Still keep display the filter panel if there is no registrants of a challenge --- .../webapp/assets/modules/contest-detail/contestDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index d3f6e5785..ce9a28a7d 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -193,7 +193,7 @@

    -
    +
    From 7b912b7b3fb9507f7c52b8efea9c95507c1a4c99 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 15:33:02 +0700 Subject: [PATCH 115/158] Always focus on registrant tab when clicking on the number of registrant link --- .../assets/modules/contest-detail/contestDetailController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index 0b17eca0c..08b4143ec 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -168,7 +168,7 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l $scope.registrants = registrants; $scope.sortByStartDate(); var param = $location.search(); - if (param.a == "registrants" && registrants.length) { + if (param.a == "registrants") { $('.nav-tabs a[href=".registrants"]').tab('show'); } }).finally(function () { From bd18e1c19df9e7a6507e4acd0dd1ac1e7c06a532 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 15:47:01 +0700 Subject: [PATCH 116/158] Default is filter by registrant list --- .../java/com/techlooper/service/impl/ChallengeServiceImpl.java | 3 ++- .../assets/modules/contest-detail/contestDetailController.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 004bca785..d2fcb3544 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -655,7 +655,8 @@ public List filterChallengeRegistrantByDate(Registran boolQueryBuilder.must(termQuery("challengeId", condition.getChallengeId())); } - if ((StringUtils.isNotEmpty(condition.getFromDate()) || StringUtils.isNotEmpty(condition.getToDate()))) { + if (StringUtils.isNotEmpty(condition.getFilterType()) && + (StringUtils.isNotEmpty(condition.getFromDate()) || StringUtils.isNotEmpty(condition.getToDate()))) { RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(condition.getFilterType()); if (StringUtils.isNotEmpty(condition.getFromDate())) { diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index 08b4143ec..2960a2fb7 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -159,7 +159,7 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l $scope.filterContestant = function () { var registrantFilterCondition = {}; registrantFilterCondition.challengeId = contestId; - registrantFilterCondition.filterType = $scope.filterType; + registrantFilterCondition.filterType = $scope.filterType ? $scope.filterType : "registrantId"; registrantFilterCondition.fromDate = $scope.fromDate; registrantFilterCondition.toDate = $scope.toDate; utils.sendNotification(jsonValue.notifications.loading); From 296a9cd6cf8858c388e80338cee3249cb570e45c Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 12 Oct 2015 15:52:48 +0700 Subject: [PATCH 117/158] Fix cookie issue --- src/main/webapp/assets/modules/_app.js | 6 +++-- .../modules/common/filter/totalFilter.js | 5 ++++- .../assets/modules/common/securityService.js | 22 +++++-------------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/main/webapp/assets/modules/_app.js b/src/main/webapp/assets/modules/_app.js index 364380617..abd379ac0 100644 --- a/src/main/webapp/assets/modules/_app.js +++ b/src/main/webapp/assets/modules/_app.js @@ -39,10 +39,12 @@ techlooper.config(["$routeProvider", "$translateProvider", "$authProvider", "loc responseError: function (rejection) { switch (rejection.status) { - //case 403: + case 403: // $rootScope.lastPath = $location.path(); // $location.path("/login"); - // break; + // $rootScope.userInfo = undefined; + // $.removeCookie('JSESSIONID'); + break; case 500: case 404: diff --git a/src/main/webapp/assets/modules/common/filter/totalFilter.js b/src/main/webapp/assets/modules/common/filter/totalFilter.js index 20f2b7cfa..4c0524f29 100644 --- a/src/main/webapp/assets/modules/common/filter/totalFilter.js +++ b/src/main/webapp/assets/modules/common/filter/totalFilter.js @@ -1,7 +1,10 @@ techlooper.filter("total", function (jsonValue, $filter) { return function (array, property) { if (!array) return 0; - var vals = array.map(function (obj) {return obj[property];}); + var vals = array.map(function (obj) { + if (obj[property]) return obj[property]; + return 0 + }); var rs = eval(vals.join("+")); return rs || 0; } diff --git a/src/main/webapp/assets/modules/common/securityService.js b/src/main/webapp/assets/modules/common/securityService.js index c736f7684..44f811036 100644 --- a/src/main/webapp/assets/modules/common/securityService.js +++ b/src/main/webapp/assets/modules/common/securityService.js @@ -24,7 +24,6 @@ techlooper.factory("securityService", function (apiService, $route, $rootScope, return; } - if ($rootScope.userInfo) { var deferred = $q.defer(); deferred.resolve($rootScope.userInfo); @@ -32,24 +31,10 @@ techlooper.factory("securityService", function (apiService, $route, $rootScope, } $rootScope.userInfo = undefined; - //utils.sendNotification(jsonValue.notifications.loading, $(window).height()); return apiService.getCurrentUser(type) .success(function (data) { - //utils.sendNotification(jsonValue.notifications.loaded, $(window).height()); - $rootScope.userInfo = data; - - //var lastFoot = localStorageService.get("lastFoot"); - //if (lastFoot && ["/login", "/user-type"].indexOf(lastFoot) == -1) { - // localStorageService.remove("lastFoot"); - // return $location.path(lastFoot); - //} - //localStorageService.remove("lastFoot"); - - //instance.routeByRole(); }); - //.error(function () { - // utils.sendNotification(jsonValue.notifications.loaded, $(window).height());}); }, login: function (username, password, type) { @@ -139,13 +124,18 @@ techlooper.factory("securityService", function (apiService, $route, $rootScope, //$rootScope.currentUiView = utils.getUiView(); if (roles.length > 0) {//is protected pages instance.getCurrentUser().error(function (userInfo) { - return $location.path(uiView.loginUrl); + $location.path(uiView.loginUrl); + utils.sendNotification(jsonValue.notifications.loaded, $(window).height()); }); } }); if (!$rootScope.userInfo) instance.getCurrentUser(); + + $rootScope.$watch(function () {return $.cookie("JSESSIONID"); }, function () { + $rootScope.userInfo = undefined; + }); } }; From 0a11649ba44531a19599e02a56aa70651450c647 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 12 Oct 2015 16:03:09 +0700 Subject: [PATCH 118/158] Fix cookie issue --- src/main/webapp/assets/modules/common/securityService.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/assets/modules/common/securityService.js b/src/main/webapp/assets/modules/common/securityService.js index 44f811036..d099072d8 100644 --- a/src/main/webapp/assets/modules/common/securityService.js +++ b/src/main/webapp/assets/modules/common/securityService.js @@ -135,6 +135,7 @@ techlooper.factory("securityService", function (apiService, $route, $rootScope, $rootScope.$watch(function () {return $.cookie("JSESSIONID"); }, function () { $rootScope.userInfo = undefined; + instance.getCurrentUser(); }); } }; From e51f51918465992ba00d78cda5a8758d4622fa2b Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 16:21:04 +0700 Subject: [PATCH 119/158] Load challenge registrants filter by url params --- .../modules/contest-detail/contestDetailController.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index 2960a2fb7..7f6304e9f 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -157,17 +157,17 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l //}); $scope.filterContestant = function () { + var param = $location.search(); var registrantFilterCondition = {}; registrantFilterCondition.challengeId = contestId; - registrantFilterCondition.filterType = $scope.filterType ? $scope.filterType : "registrantId"; - registrantFilterCondition.fromDate = $scope.fromDate; - registrantFilterCondition.toDate = $scope.toDate; + registrantFilterCondition.filterType = $scope.filterType ? $scope.filterType : param.filterType ? param.filterType : "registrantId"; + registrantFilterCondition.fromDate = $scope.fromDate ? $scope.fromDate : param.fromDate; + registrantFilterCondition.toDate = $scope.toDate ? $scope.toDate : param.toDate; utils.sendNotification(jsonValue.notifications.loading); apiService.getChallengeRegistrants(registrantFilterCondition) .success(function (registrants) { $scope.registrants = registrants; $scope.sortByStartDate(); - var param = $location.search(); if (param.a == "registrants") { $('.nav-tabs a[href=".registrants"]').tab('show'); } From c52e6eeb5e0de5b9330d30d306c638170e3b3c0b Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 12 Oct 2015 16:30:49 +0700 Subject: [PATCH 120/158] Fix header issue --- .../com/techlooper/config/web/sec/SecurityConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java b/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java index 1b666b055..f4f1b6b70 100644 --- a/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java +++ b/src/main/java/com/techlooper/config/web/sec/SecurityConfiguration.java @@ -58,6 +58,7 @@ public AuthenticationManager authenticationManager() { protected void configure(HttpSecurity http) throws Exception { http.csrf().disable(); + http.headers().frameOptions().disable(); http.authorizeRequests() .and().formLogin().loginPage("/login").usernameParameter("us").passwordParameter("pwd").successHandler(getSuccessHandler()).failureHandler(getAuthenticationFailureHandler()) .and().logout().logoutUrl("/logout").logoutSuccessHandler(getLogoutSuccessHandler()).invalidateHttpSession(true).deleteCookies("SESSION").permitAll() From f308c89f46d1119ba52c23b23b35c5969fa9b4f6 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 16:43:59 +0700 Subject: [PATCH 121/158] Integrate email's Accept link with Registrant filter --- .../service/impl/ChallengeServiceImpl.java | 1 + .../com/techlooper/util/DateTimeUtils.java | 81 ++++++++++--------- .../template/challengeDailySummary.en.ftl | 2 +- .../template/challengeDailySummary.vi.ftl | 2 +- 4 files changed, 48 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index d2fcb3544..c1e27cc32 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -737,6 +737,7 @@ public void sendDailySummaryEmailToChallengeOwner(ChallengeEntity challengeEntit templateModel.put("challengeId", challengeEntity.getChallengeId().toString()); templateModel.put("challengeNameAlias", challengeEntity.getChallengeName().replaceAll("\\W", "-")); templateModel.put("currentDateTime", String.valueOf(new Date().getTime())); + templateModel.put("yesterdayDateTime", DateTimeUtils.yesterdayDate()); Long currentDateTime = new Date().getTime(); List latestRegistrants = findChallengeRegistrantWithinPeriod( diff --git a/src/main/java/com/techlooper/util/DateTimeUtils.java b/src/main/java/com/techlooper/util/DateTimeUtils.java index 17d747ca7..e410d3692 100644 --- a/src/main/java/com/techlooper/util/DateTimeUtils.java +++ b/src/main/java/com/techlooper/util/DateTimeUtils.java @@ -16,54 +16,63 @@ */ public class DateTimeUtils { - public static final Logger LOGGER = LoggerFactory.getLogger(DateTimeUtils.class); + public static final Logger LOGGER = LoggerFactory.getLogger(DateTimeUtils.class); - public static final String BASIC_DATE_PATTERN = "dd/MM/yyyy"; + public static final String BASIC_DATE_PATTERN = "dd/MM/yyyy"; - public static final String BASIC_DATE_TIME_PATTERN = "dd/MM/yyyy HH:mm"; + public static final String BASIC_DATE_TIME_PATTERN = "dd/MM/yyyy HH:mm"; // public static final String ISO_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ssZZ"; - public static DateTime parseBasicDate(String text) { - if (StringUtils.hasText(text)) { - try { - return DateTimeFormat.forPattern(BASIC_DATE_PATTERN).parseDateTime(text); - } - catch (Exception e) { - LOGGER.debug("Couldn't parse date-time [{}] by format [{}]", text, BASIC_DATE_PATTERN); - } + public static DateTime parseBasicDate(String text) { + if (StringUtils.hasText(text)) { + try { + return DateTimeFormat.forPattern(BASIC_DATE_PATTERN).parseDateTime(text); + } catch (Exception e) { + LOGGER.debug("Couldn't parse date-time [{}] by format [{}]", text, BASIC_DATE_PATTERN); + } + } + return null; } - return null; - } - public static Date string2Date(String datetime, String pattern) throws ParseException { - SimpleDateFormat formatter = new SimpleDateFormat(pattern); - return formatter.parse(datetime); - } + public static Date string2Date(String datetime, String pattern) throws ParseException { + SimpleDateFormat formatter = new SimpleDateFormat(pattern); + return formatter.parse(datetime); + } // public static String date2String(Date datetime, String pattern) { // SimpleDateFormat formatter = new SimpleDateFormat(pattern); // return formatter.format(datetime); // } - public static String currentDate() { - SimpleDateFormat formatter = new SimpleDateFormat(BASIC_DATE_PATTERN); - return formatter.format(new Date()); - } - - public static String currentDate(String pattern) { - SimpleDateFormat formatter = new SimpleDateFormat(pattern); - return formatter.format(new Date()); - } - - public static int daysBetween(Date firstDate, Date secondDate) { - return Days.daysBetween(new DateTime(firstDate), new DateTime(secondDate)).getDays(); - } - - public static int daysBetween(String firstDateStr, String secondDateStr) throws ParseException { - DateTime firstDateTime = new DateTime(string2Date(firstDateStr, BASIC_DATE_PATTERN)); - DateTime secondDateTime = new DateTime(string2Date(secondDateStr, BASIC_DATE_PATTERN)); - return Days.daysBetween(firstDateTime, secondDateTime).getDays(); - } + public static String currentDate() { + SimpleDateFormat formatter = new SimpleDateFormat(BASIC_DATE_PATTERN); + return formatter.format(new Date()); + } + + public static String yesterdayDate() { + SimpleDateFormat formatter = new SimpleDateFormat(BASIC_DATE_PATTERN); + DateTime yesterday = DateTime.now().minusDays(1); + return formatter.format(yesterday.toDate()); + } + + public static String currentDate(String pattern) { + SimpleDateFormat formatter = new SimpleDateFormat(pattern); + return formatter.format(new Date()); + } + + public static int daysBetween(Date firstDate, Date secondDate) { + return Days.daysBetween(new DateTime(firstDate), new DateTime(secondDate)).getDays(); + } + + public static int daysBetween(String firstDateStr, String secondDateStr) throws ParseException { + DateTime firstDateTime = new DateTime(string2Date(firstDateStr, BASIC_DATE_PATTERN)); + DateTime secondDateTime = new DateTime(string2Date(secondDateStr, BASIC_DATE_PATTERN)); + return Days.daysBetween(firstDateTime, secondDateTime).getDays(); + } + + public static void main(String args[]) { + System.out.println(yesterdayDate()); + } } diff --git a/src/main/resources/template/challengeDailySummary.en.ftl b/src/main/resources/template/challengeDailySummary.en.ftl index 3c6cf8dbb..d6f11701e 100644 --- a/src/main/resources/template/challengeDailySummary.en.ftl +++ b/src/main/resources/template/challengeDailySummary.en.ftl @@ -336,7 +336,7 @@ Feedback

    diff --git a/src/main/resources/template/challengeDailySummary.vi.ftl b/src/main/resources/template/challengeDailySummary.vi.ftl index 25fb26e09..fd954fd88 100644 --- a/src/main/resources/template/challengeDailySummary.vi.ftl +++ b/src/main/resources/template/challengeDailySummary.vi.ftl @@ -336,7 +336,7 @@ Phản Hồi
    - Accept
    - Đi Tiếp + Đi Tiếp
    From e39f52c6b83fa79fda7ba80f010f1d1ce810cc63 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 17:06:47 +0700 Subject: [PATCH 122/158] fix bug responsive for milestone timeline --- .../modules/contest-detail/contestDetail.html | 53 ++++++++++++++---- .../webapp/assets/sass/contest-detail.sass | 4 ++ .../assets/sass/z-responsive-candidate.sass | 54 ++++++++++++++++++- 3 files changed, 100 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetail.html b/src/main/webapp/assets/modules/contest-detail/contestDetail.html index 9b6f1b5da..991dd2bf8 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetail.html +++ b/src/main/webapp/assets/modules/contest-detail/contestDetail.html @@ -97,8 +97,49 @@

    - -
    +
    +
    + + + + {{contestDetail.startDateTime}} + {{contestDetail.registrationDateTime}} + +
    +
    + + + + + {{contestDetail.ideaSubmissionDateTime}} + +
    +
    + + + + + {{contestDetail.uxSubmissionDateTime}} + +
    +
    + + + + + {{contestDetail.prototypeSubmissionDateTime}} + +
    +
    + + + + + {{contestDetail.submissionDateTime}} + +
    +
    +
    @@ -129,14 +170,8 @@

    - {{contestDetail.prototypeSubmissionDateTime}} + {{contestDetail.prototypeSubmissionDateTime}}

    - - - - -
    diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 46ca96a24..2a6049353 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -715,6 +715,10 @@ width: 25% .phase-box.five-cols width: 20% + .timeLine-milestone.mobile + display: none + .timeLine-milestone.desktop + display: inline-block .col-md-3 -webkit-border-top-right-radius: 5px -webkit-border-bottom-right-radius: 5px diff --git a/src/main/webapp/assets/sass/z-responsive-candidate.sass b/src/main/webapp/assets/sass/z-responsive-candidate.sass index 78d48f68c..8253f0523 100644 --- a/src/main/webapp/assets/sass/z-responsive-candidate.sass +++ b/src/main/webapp/assets/sass/z-responsive-candidate.sass @@ -1245,12 +1245,62 @@ background-color: #fff .contest-content-item .timeLine-milestone + text-align: center + width: 100% .phase-box - width: 100% !important + width: 250px !important clear: both - margin-bottom: 10px + float: none + text-align: center + margin: auto + span.line-color + width: 5px + height: 100px + float: left span border: none !important + float: left + width: auto + clear: none + span + width: 100% + clear: both + text-align: left + padding: 25px 0 + span.details + width: 35% + float: left + text-align: left + clear: none + height: 100px + padding-left: 5px + span.name + float: left + width: 45% + padding-right: 5px + display: inline-block + clear: none + text-align: right + padding-top: 40px + span.date-right + text-align: left + float: left + padding-top: 70px + i + margin-right: 0 !important + span.date-left + text-align: left + float: left + min-width: 50px + min-height: 15px + i + margin-left: 0 !important + .timeLine-milestone.mobile + display: inline-block + .timeLine-milestone.desktop + display: none + p.detail span.tag + margin-bottom: 5px .contest-content-tab-detail .label-col display: block From b0ace67f3aeaedce36c89e3e5a0b249e66137990 Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 17:12:11 +0700 Subject: [PATCH 123/158] update css --- src/main/webapp/assets/sass/contest-detail.sass | 1 + src/main/webapp/assets/sass/z-responsive-candidate.sass | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass index 2a6049353..05e79934a 100644 --- a/src/main/webapp/assets/sass/contest-detail.sass +++ b/src/main/webapp/assets/sass/contest-detail.sass @@ -257,6 +257,7 @@ border: 1px solid #cccccc .input-group-addon cursor: pointer + text-transform: capitalize .input-group-addon.left border-radius: 4px 0 0 4px .input-group-addon.none diff --git a/src/main/webapp/assets/sass/z-responsive-candidate.sass b/src/main/webapp/assets/sass/z-responsive-candidate.sass index 8253f0523..e4ee3d5e7 100644 --- a/src/main/webapp/assets/sass/z-responsive-candidate.sass +++ b/src/main/webapp/assets/sass/z-responsive-candidate.sass @@ -1241,6 +1241,12 @@ .input-group-addon.none-left border-radius: 4px 0 0 4px border-left: 1px solid #ccc + .submit-filter + text-align: center + width: 100% + button + margin: auto + padding: 6px 30px tr background-color: #fff .contest-content-item From 431ca881808e8e5507f67b872ef41d404f6212ae Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Mon, 12 Oct 2015 17:30:02 +0700 Subject: [PATCH 124/158] update loading for filter registrants --- .../assets/modules/contest-detail/contestDetailController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index 7f6304e9f..5f740a577 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -157,13 +157,13 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l //}); $scope.filterContestant = function () { + utils.sendNotification(jsonValue.notifications.loading); var param = $location.search(); var registrantFilterCondition = {}; registrantFilterCondition.challengeId = contestId; registrantFilterCondition.filterType = $scope.filterType ? $scope.filterType : param.filterType ? param.filterType : "registrantId"; registrantFilterCondition.fromDate = $scope.fromDate ? $scope.fromDate : param.fromDate; registrantFilterCondition.toDate = $scope.toDate ? $scope.toDate : param.toDate; - utils.sendNotification(jsonValue.notifications.loading); apiService.getChallengeRegistrants(registrantFilterCondition) .success(function (registrants) { $scope.registrants = registrants; From 4c154a34b057b0cda94c8a9b833d56208ef8d5c6 Mon Sep 17 00:00:00 2001 From: Phuong H Date: Mon, 12 Oct 2015 18:07:17 +0700 Subject: [PATCH 125/158] Fix progess fitlter too slow --- src/main/webapp/assets/modules/common/filter/progressFilter.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/assets/modules/common/filter/progressFilter.js b/src/main/webapp/assets/modules/common/filter/progressFilter.js index d77d1e552..f05f7f499 100644 --- a/src/main/webapp/assets/modules/common/filter/progressFilter.js +++ b/src/main/webapp/assets/modules/common/filter/progressFilter.js @@ -4,6 +4,7 @@ techlooper.filter("progress", function (jsonValue, resourcesService, localStorag switch (type) { case "challenge": var contestDetail = input; + if (contestDetail.progress) return contestDetail.progress.title; var joinContests = localStorageService.get("joinContests") || ""; var email = localStorageService.get("email") || ""; From ec095b0fa5f2be0e3b7d2dbe0d4c72729b05cce2 Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Mon, 12 Oct 2015 18:25:22 +0700 Subject: [PATCH 126/158] Integrate email's Accept link with Registrant filter --- .../cron/ChallengeTimelineNotifier.java | 5 +++- .../DailyChallengeSummaryEmailSender.java | 6 ++++- .../techlooper/cron/JobAlertEmailSender.java | 6 ++++- .../service/impl/ChallengeServiceImpl.java | 12 ++------- .../com/techlooper/util/DateTimeUtils.java | 6 +++++ .../contest-detail/contestDetailController.js | 27 ++++++++++++++++--- 6 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java b/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java index 1c26d0711..a6b770935 100644 --- a/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java +++ b/src/main/java/com/techlooper/cron/ChallengeTimelineNotifier.java @@ -53,9 +53,12 @@ public synchronized void notifyRegistrantAboutChallengeTimeline() throws Excepti Set challengeRegistrants = challengeService.findRegistrantsByOwner(condition); for (ChallengeRegistrantDto challengeRegistrant : challengeRegistrants) { + if (StringUtils.isEmpty(challengeRegistrant.getLastEmailSentDateTime())) { + challengeRegistrant.setLastEmailSentDateTime(yesterdayDate(BASIC_DATE_TIME_PATTERN)); + } + Date lastSentDate = string2Date(challengeRegistrant.getLastEmailSentDateTime(), BASIC_DATE_TIME_PATTERN); Date currentDate = new Date(); - if (daysBetween(lastSentDate, currentDate) > 0) { ChallengeRegistrantEntity challengeRegistrantEntity = dozerMapper.map(challengeRegistrant, ChallengeRegistrantEntity.class); try { diff --git a/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java b/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java index 132536f02..0d3974501 100644 --- a/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java +++ b/src/main/java/com/techlooper/cron/DailyChallengeSummaryEmailSender.java @@ -4,6 +4,7 @@ import com.techlooper.model.ChallengePhaseEnum; import com.techlooper.model.EmailSentResultEnum; import com.techlooper.service.ChallengeService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -39,9 +40,12 @@ public synchronized void sendDailyEmailAboutChallengeSummary() throws Exception for (ChallengeEntity challengeEntity : challengeEntities) { try { + if (StringUtils.isEmpty(challengeEntity.getLastEmailSentDateTime())) { + challengeEntity.setLastEmailSentDateTime(yesterdayDate(BASIC_DATE_TIME_PATTERN)); + } + Date lastSentDate = string2Date(challengeEntity.getLastEmailSentDateTime(), BASIC_DATE_TIME_PATTERN); Date currentDate = new Date(); - if (daysBetween(lastSentDate, currentDate) > 0) { challengeService.sendDailySummaryEmailToChallengeOwner(challengeEntity); challengeService.updateSendEmailToChallengeOwnerResultCode(challengeEntity, EmailSentResultEnum.OK); diff --git a/src/main/java/com/techlooper/cron/JobAlertEmailSender.java b/src/main/java/com/techlooper/cron/JobAlertEmailSender.java index 0ba4fbf64..0409924cf 100644 --- a/src/main/java/com/techlooper/cron/JobAlertEmailSender.java +++ b/src/main/java/com/techlooper/cron/JobAlertEmailSender.java @@ -5,6 +5,7 @@ import com.techlooper.model.JobSearchCriteria; import com.techlooper.model.JobSearchResponse; import com.techlooper.service.JobAggregatorService; +import org.apache.commons.lang3.StringUtils; import org.dozer.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,9 +57,12 @@ public synchronized void sendJobAlertEmail() throws Exception { if (!jobAlertRegistrationEntities.isEmpty()) { int count = 0; for (JobAlertRegistrationEntity jobAlertRegistrationEntity : jobAlertRegistrationEntities) { + if (StringUtils.isEmpty(jobAlertRegistrationEntity.getLastEmailSentDateTime())) { + jobAlertRegistrationEntity.setLastEmailSentDateTime(yesterdayDate(BASIC_DATE_TIME_PATTERN)); + } + Date lastSentDate = string2Date(jobAlertRegistrationEntity.getLastEmailSentDateTime(), BASIC_DATE_TIME_PATTERN); Date currentDate = new Date(); - if (daysBetween(lastSentDate, currentDate) > 0) { JobSearchCriteria criteria = dozerMapper.map(jobAlertRegistrationEntity, JobSearchCriteria.class); JobSearchResponse jobSearchResponse = jobAggregatorService.findJob(criteria); diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index c1e27cc32..9c6992eba 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -686,19 +686,11 @@ public List findChallengeSubmissionWithinPeriod( BoolQueryBuilder boolQueryBuilder = boolQuery(); boolQueryBuilder.must(termQuery("challengeId", challengeId)); - Long pastTime = currentDateTime - period.getMiliseconds() > 0 ? currentDateTime - period.getMiliseconds() : 0; - boolQueryBuilder.must(rangeQuery("challengeSubmissionId").from(pastTime)); + boolQueryBuilder.must(rangeQuery("submissionDateTime").from(yesterdayDate())); searchQueryBuilder.withQuery(boolQueryBuilder); searchQueryBuilder.withSort(fieldSort("challengeSubmissionId").order(SortOrder.DESC)); - searchQueryBuilder.withPageable(new PageRequest(0, 100)); - - List result = new ArrayList<>(); - Iterator iterator = challengeSubmissionRepository.search(searchQueryBuilder.build()).iterator(); - while (iterator.hasNext()) { - result.add(iterator.next()); - } - return result; + return DataUtils.getAllEntities(challengeSubmissionRepository, searchQueryBuilder); } @Override diff --git a/src/main/java/com/techlooper/util/DateTimeUtils.java b/src/main/java/com/techlooper/util/DateTimeUtils.java index e410d3692..fafcbd566 100644 --- a/src/main/java/com/techlooper/util/DateTimeUtils.java +++ b/src/main/java/com/techlooper/util/DateTimeUtils.java @@ -56,6 +56,12 @@ public static String yesterdayDate() { return formatter.format(yesterday.toDate()); } + public static String yesterdayDate(String pattern) { + SimpleDateFormat formatter = new SimpleDateFormat(pattern); + DateTime yesterday = DateTime.now().minusDays(1); + return formatter.format(yesterday.toDate()); + } + public static String currentDate(String pattern) { SimpleDateFormat formatter = new SimpleDateFormat(pattern); return formatter.format(new Date()); diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js index 7f6304e9f..22a9ee90e 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailController.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailController.js @@ -160,9 +160,30 @@ techlooper.controller('contestDetailController', function ($scope, apiService, l var param = $location.search(); var registrantFilterCondition = {}; registrantFilterCondition.challengeId = contestId; - registrantFilterCondition.filterType = $scope.filterType ? $scope.filterType : param.filterType ? param.filterType : "registrantId"; - registrantFilterCondition.fromDate = $scope.fromDate ? $scope.fromDate : param.fromDate; - registrantFilterCondition.toDate = $scope.toDate ? $scope.toDate : param.toDate; + + if ($scope.filterType) { + registrantFilterCondition.filterType = $scope.filterType; + } else if (param.filterType) { + registrantFilterCondition.filterType = param.filterType; + $scope.filterType = param.filterType; + } else { + registrantFilterCondition.filterType = "registrantId"; + } + + if ($scope.fromDate) { + registrantFilterCondition.fromDate = $scope.fromDate; + } else { + registrantFilterCondition.fromDate = param.fromDate; + $scope.fromDate = param.fromDate; + } + + if ($scope.toDate) { + registrantFilterCondition.toDate = $scope.toDate; + } else { + registrantFilterCondition.toDate = param.toDate; + $scope.toDate = param.toDate + } + utils.sendNotification(jsonValue.notifications.loading); apiService.getChallengeRegistrants(registrantFilterCondition) .success(function (registrants) { From 1d7c4822953d3ac35026cc7fca5ef5a94c137cea Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Tue, 13 Oct 2015 10:03:25 +0700 Subject: [PATCH 127/158] Change utm_medium value of button View More Topics in job alert email --- src/main/resources/template/jobAlert.en.ftl | 2 +- src/main/resources/template/jobAlert.vi.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/template/jobAlert.en.ftl b/src/main/resources/template/jobAlert.en.ftl index 04f3efbef..52db7cc08 100644 --- a/src/main/resources/template/jobAlert.en.ftl +++ b/src/main/resources/template/jobAlert.en.ftl @@ -473,7 +473,7 @@ - View More Topics diff --git a/src/main/resources/template/jobAlert.vi.ftl b/src/main/resources/template/jobAlert.vi.ftl index c250baf16..58e9ea5db 100644 --- a/src/main/resources/template/jobAlert.vi.ftl +++ b/src/main/resources/template/jobAlert.vi.ftl @@ -405,7 +405,7 @@ - Xem Thêm Chủ Đề From 968dd13f1d0de8b81baf625070c6200c9a453efe Mon Sep 17 00:00:00 2001 From: Phuong H Date: Tue, 13 Oct 2015 10:30:41 +0700 Subject: [PATCH 128/158] Fix current status of challenge missed --- src/main/webapp/assets/modules/common/filter/progressFilter.js | 2 +- src/main/webapp/assets/modules/contests/contests.con.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/webapp/assets/modules/common/filter/progressFilter.js b/src/main/webapp/assets/modules/common/filter/progressFilter.js index f05f7f499..f0a934652 100644 --- a/src/main/webapp/assets/modules/common/filter/progressFilter.js +++ b/src/main/webapp/assets/modules/common/filter/progressFilter.js @@ -4,7 +4,7 @@ techlooper.filter("progress", function (jsonValue, resourcesService, localStorag switch (type) { case "challenge": var contestDetail = input; - if (contestDetail.progress) return contestDetail.progress.title; + if (contestDetail.progress) return contestDetail.progress.translate; var joinContests = localStorageService.get("joinContests") || ""; var email = localStorageService.get("email") || ""; diff --git a/src/main/webapp/assets/modules/contests/contests.con.js b/src/main/webapp/assets/modules/contests/contests.con.js index 258ce79fe..2dcdb642c 100644 --- a/src/main/webapp/assets/modules/contests/contests.con.js +++ b/src/main/webapp/assets/modules/contests/contests.con.js @@ -47,7 +47,6 @@ techlooper.controller('contestsController', function (apiService, $scope, jsonVa } apiService.searchContests().success(function (contests) { - //contests.sort(sortByStartDate); utils.sortByDate(contests, "startDateTime"); $scope.contestsList = contests; }).finally(function () { From be9ef1c7e2cc610eeaeac47bf0b25af79b3dcb9b Mon Sep 17 00:00:00 2001 From: khoa-nd Date: Tue, 13 Oct 2015 11:00:07 +0700 Subject: [PATCH 129/158] Fix the issue on filtering registrant by date --- .../com/techlooper/service/impl/ChallengeServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java index 9c6992eba..702fca2b0 100644 --- a/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java +++ b/src/main/java/com/techlooper/service/impl/ChallengeServiceImpl.java @@ -664,7 +664,8 @@ public List filterChallengeRegistrantByDate(Registran rangeQueryBuilder.from(from); } if (StringUtils.isNotEmpty(condition.getToDate())) { - Long to = string2Date(condition.getToDate(), BASIC_DATE_PATTERN).getTime(); + Long to = string2Date(condition.getToDate(), BASIC_DATE_PATTERN).getTime() + + TimePeriodEnum.TWENTY_FOUR_HOURS.getMiliseconds(); rangeQueryBuilder.to(to); } @@ -840,10 +841,10 @@ public Set findRegistrantByChallengeSubmissionDate(Long challengeId, Strin public ChallengeDetailDto getChallengeDetail(Long challengeId, String loginEmail) { NativeSearchQueryBuilder searchQueryBuilder = new NativeSearchQueryBuilder().withTypes("challenge"); TermQueryBuilder challengeIdQuery = termQuery("challengeId", challengeId); - MatchQueryBuilder authorEmailQuery = matchQuery("authorEmail", loginEmail).minimumShouldMatch("100%"); + //MatchQueryBuilder authorEmailQuery = matchQuery("authorEmail", loginEmail).minimumShouldMatch("100%"); TermQueryBuilder expiredChallengeQuery = termQuery("expired", Boolean.TRUE); - searchQueryBuilder.withQuery(boolQuery().must(challengeIdQuery).must(authorEmailQuery).mustNot(expiredChallengeQuery)); + searchQueryBuilder.withQuery(boolQuery().must(challengeIdQuery).mustNot(expiredChallengeQuery)); List challengeEntities = DataUtils.getAllEntities(challengeRepository, searchQueryBuilder); if (!challengeEntities.isEmpty()) { From 2d28efd30437ac36f8bd06e37f00ed64b104edef Mon Sep 17 00:00:00 2001 From: Phuong H Date: Tue, 13 Oct 2015 13:10:18 +0700 Subject: [PATCH 130/158] Able to submit challange milestone --- .../controller/SharingController.java | 19 ++++++++++++++++--- .../java/com/techlooper/dto/ResourceDto.java | 3 +-- .../model/ChallengeSubmissionDto.java | 10 ++++++++++ .../assets/modules/common/apiService.js | 16 +++++++++++----- .../common/challenge/submissionChallenge.js | 18 ++++++++---------- .../contest-detail/contestDetailDirective.js | 5 +++-- 6 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/techlooper/controller/SharingController.java b/src/main/java/com/techlooper/controller/SharingController.java index 2a64d994a..2fd3d6ebe 100644 --- a/src/main/java/com/techlooper/controller/SharingController.java +++ b/src/main/java/com/techlooper/controller/SharingController.java @@ -13,9 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.io.OutputStream; import java.net.HttpURLConnection; -import java.net.InetAddress; import java.net.URL; /** @@ -77,7 +75,7 @@ public Long getUrlResponseCode(@RequestBody ResourceDto resourceDto) { try { HttpURLConnection.setFollowRedirects(false); String url = resourceDto.getUrl().trim(); - url = url.startsWith("http://") ? url : "http://" + url; + url = (url.startsWith("https://") || url.startsWith("http://")) ? url : "http://" + url; HttpURLConnection con = (HttpURLConnection) new URL(url).openConnection(); con.setRequestMethod("HEAD"); int responseCode = con.getResponseCode(); @@ -88,4 +86,19 @@ public Long getUrlResponseCode(@RequestBody ResourceDto resourceDto) { } return 404L; } +// +// public static void main(String[] args) { +// try { +// HttpURLConnection.setFollowRedirects(false); +// String url = "https://facebook.com"; +// url = (url.startsWith("https://") || url.startsWith("http://")) ? url : "http://" + url; +// HttpURLConnection con = (HttpURLConnection) new URL(url).openConnection(); +// con.setRequestMethod("HEAD"); +// int responseCode = con.getResponseCode(); +// System.out.println(responseCode); +// } +// catch (Exception e) { +// e.printStackTrace(); +// } +// } } diff --git a/src/main/java/com/techlooper/dto/ResourceDto.java b/src/main/java/com/techlooper/dto/ResourceDto.java index 6dad1d571..7fe5c44be 100644 --- a/src/main/java/com/techlooper/dto/ResourceDto.java +++ b/src/main/java/com/techlooper/dto/ResourceDto.java @@ -10,8 +10,7 @@ public class ResourceDto implements Serializable { private String url; public String getUrl() { - url = url.trim(); - return url.startsWith("http://") ? url : "http://" + url; + return url; } public void setUrl(String url) { diff --git a/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java b/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java index 5762a6048..874d35ef0 100644 --- a/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java +++ b/src/main/java/com/techlooper/model/ChallengeSubmissionDto.java @@ -7,6 +7,8 @@ */ public class ChallengeSubmissionDto implements Serializable { + private Long challengeSubmissionId; + private String registrantEmail; private String registrantFirstName; @@ -23,6 +25,14 @@ public class ChallengeSubmissionDto implements Serializable { private String submissionDateTime; + public Long getChallengeSubmissionId() { + return challengeSubmissionId; + } + + public void setChallengeSubmissionId(Long challengeSubmissionId) { + this.challengeSubmissionId = challengeSubmissionId; + } + public Long getRegistrantId() { return registrantId; } diff --git a/src/main/webapp/assets/modules/common/apiService.js b/src/main/webapp/assets/modules/common/apiService.js index 434f709c0..3386d0b6e 100644 --- a/src/main/webapp/assets/modules/common/apiService.js +++ b/src/main/webapp/assets/modules/common/apiService.js @@ -1,4 +1,5 @@ -techlooper.factory("apiService", function ($rootScope, $location, jsonValue, $http, localStorageService, utils, $translate) { +techlooper.factory("apiService", function ($rootScope, $location, jsonValue, $http, localStorageService, + utils, $translate, $filter) { var instance = { login: function (techlooperKey) { @@ -50,6 +51,11 @@ techlooper.factory("apiService", function ($rootScope, $location, jsonValue, $ht searchContests: function () { return $http.get("challenge/list"); + //.success(function (contests) { + // $.each(contests, function (i, contest) { + // $filter("progress")(contest, "challenge"); + // }); + //}); }, getSuggestSkills: function (text) { @@ -228,7 +234,7 @@ techlooper.factory("apiService", function ($rootScope, $location, jsonValue, $ht /** * @see com.techlooper.controller.UserController.sendFeedbackToRegistrant * */ - sendFeedbackToRegistrant: function(challengeId, registrantId, emailContent) { + sendFeedbackToRegistrant: function (challengeId, registrantId, emailContent) { emailContent.language = $translate.use(); return $http.post("user/challenge/feedback/" + challengeId + "/" + registrantId, emailContent); }, @@ -236,21 +242,21 @@ techlooper.factory("apiService", function ($rootScope, $location, jsonValue, $ht /** * @see com.techlooper.controller.UserController.acceptChallengeRegistrant * */ - acceptChallengeRegistrant: function(registrantId) { + acceptChallengeRegistrant: function (registrantId) { return $http.get("user/challenge/accept/" + registrantId); }, /** * @see com.techlooper.controller.ChallengeSubmissionController.submitMyResult * */ - submitMyResult: function(submission) { + submitMyResult: function (submission) { return $http.post("user/challengeSubmission", submission); }, /** * @see com.techlooper.controller.SharingController.getUrlResponseCode * */ - getUrlResponseCode: function(url) { + getUrlResponseCode: function (url) { return $http.post("resource/getUrlResponseCode", {url: url}, {transformResponse: function (d, h) {return d;}}); } }; diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js index 600fb8604..97873cae5 100644 --- a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js @@ -20,29 +20,27 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe if (scope.submissionForm.$invalid) { return false; } - $('.feedback-loading').css('visibility', 'inherit'); + //$('.feedback-loading').css('visibility', 'inherit'); apiService.getUrlResponseCode(scope.submission.submissionURL) .success(function (code) { var valid = (code >= 200) && (code < 400); if (valid) { scope.submission.challengeId = scope.challenge.challengeId; + $('.feedback-loading').css('visibility', 'inherit'); apiService.submitMyResult(scope.submission) - .success(function(data) { + .success(function (data) { var submission = data; $rootScope.$broadcast("success-submission-challenge", submission); }) .finally(function () { - scope.hideSubmitForm(); + $timeout(function () { + $('.feedback-loading').css('visibility', 'hidden'); + scope.hideSubmitForm(); + }, 500); }); } scope.submissionForm.submissionURL.$setValidity("invalidUrl", valid); - }) - .finally(function () { - $timeout(function(){ - $('.feedback-loading').css('visibility', 'hidden'); - scope.cancel(); - }, 500); - }); + }); } scope.hideSubmitForm = function () { diff --git a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js index 6afad2a23..7669032b5 100644 --- a/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js +++ b/src/main/webapp/assets/modules/contest-detail/contestDetailDirective.js @@ -79,12 +79,13 @@ techlooper scope.registrant.hide(); }); - scope.$on("success-submission-challenge", function(submission) { + scope.$on("success-submission-challenge", function(sc, submission) { if (scope.registrant.registrantId != submission.registrantId) return; scope.registrant.submissions.unshift(submission); + console.log(scope.registrant.submissions); }); - utils.sortByDate(scope.registrant.submissions, "submissionDateTime"); + utils.sortByNumber(scope.registrant.submissions, "challengeSubmissionId"); } }; }) From 0e693f600675627d2b1b5bf5cc231f6f812a1b4a Mon Sep 17 00:00:00 2001 From: Phuong H Date: Tue, 13 Oct 2015 13:22:16 +0700 Subject: [PATCH 131/158] Show loading when submit challlenge --- .../modules/common/challenge/submissionChallenge.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js index 97873cae5..b09bfce17 100644 --- a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js +++ b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js @@ -20,7 +20,7 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe if (scope.submissionForm.$invalid) { return false; } - //$('.feedback-loading').css('visibility', 'inherit'); + $('.feedback-loading').css('visibility', 'inherit'); apiService.getUrlResponseCode(scope.submission.submissionURL) .success(function (code) { var valid = (code >= 200) && (code < 400); @@ -40,7 +40,13 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe }); } scope.submissionForm.submissionURL.$setValidity("invalidUrl", valid); - }); + }) + .finally(function () { + $timeout(function () { + $('.feedback-loading').css('visibility', 'hidden'); + scope.hideSubmitForm(); + }, 500); + });; } scope.hideSubmitForm = function () { From abec4a8a5d82070d54b73cc7af1c5bc001a1413a Mon Sep 17 00:00:00 2001 From: johnsonpham Date: Tue, 13 Oct 2015 13:43:59 +0700 Subject: [PATCH 132/158] change summernote from js to angularjs --- bower.json | 6 +- .../summernote-bs3.css | 0 .../summernote.css | 0 .../swrap-bootstrap/summernote-bs3.css | 5970 +++++++++++++++++ .../custom-css/swrap-bootstrap/summernote.css | 446 ++ .../plugins/slimscroll/jquery.slimscroll.js | 470 -- .../slimscroll/jquery.slimscroll.min.js | 16 - .../plugins/summernote/summernote.min.js | 2 - src/main/webapp/assets/index.tem.html | 4 +- src/main/webapp/assets/modules/_app.js | 2 +- .../modules/common/feedback/feedback.html | 3 +- .../common/feedback/feedbackDirective.js | 33 +- .../contest-detail/contestDetailController.js | 18 +- .../webapp/assets/sass/contest-detail.sass | 7 + 14 files changed, 6453 insertions(+), 524 deletions(-) rename src/main/webapp/assets/custom-css/swrap-bootstrap/{summernote => summernote 10.58.36}/summernote-bs3.css (100%) rename src/main/webapp/assets/custom-css/swrap-bootstrap/{summernote => summernote 10.58.36}/summernote.css (100%) create mode 100644 src/main/webapp/assets/custom-css/swrap-bootstrap/summernote-bs3.css create mode 100644 src/main/webapp/assets/custom-css/swrap-bootstrap/summernote.css delete mode 100644 src/main/webapp/assets/custom-js/plugins/slimscroll/jquery.slimscroll.js delete mode 100644 src/main/webapp/assets/custom-js/plugins/slimscroll/jquery.slimscroll.min.js delete mode 100644 src/main/webapp/assets/custom-js/plugins/summernote/summernote.min.js diff --git a/bower.json b/bower.json index c756b45e6..12eee0c96 100644 --- a/bower.json +++ b/bower.json @@ -44,7 +44,8 @@ "angular-sanitize": "latest", "moment": "latest", "angular-strap": "latest", - "datetimepicker": "latest" + "datetimepicker": "latest", + "angular-summernote": "latest" }, "overrides": { "jquery": { @@ -161,6 +162,9 @@ "build/css/bootstrap-datetimepicker.min.css", "build/js/bootstrap-datetimepicker.min.js" ] + }, + "angular-summernote": { + "main": "dist/angular-summernote.js" } }, "resolutions": { diff --git a/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote/summernote-bs3.css b/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote 10.58.36/summernote-bs3.css similarity index 100% rename from src/main/webapp/assets/custom-css/swrap-bootstrap/summernote/summernote-bs3.css rename to src/main/webapp/assets/custom-css/swrap-bootstrap/summernote 10.58.36/summernote-bs3.css diff --git a/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote/summernote.css b/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote 10.58.36/summernote.css similarity index 100% rename from src/main/webapp/assets/custom-css/swrap-bootstrap/summernote/summernote.css rename to src/main/webapp/assets/custom-css/swrap-bootstrap/summernote 10.58.36/summernote.css diff --git a/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote-bs3.css b/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote-bs3.css new file mode 100644 index 000000000..5090cd9fe --- /dev/null +++ b/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote-bs3.css @@ -0,0 +1,5970 @@ +.note-editor { + /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ + +} +.note-editor article, +.note-editor aside, +.note-editor details, +.note-editor figcaption, +.note-editor figure, +.note-editor footer, +.note-editor header, +.note-editor hgroup, +.note-editor main, +.note-editor nav, +.note-editor section, +.note-editor summary { + display: block; +} +.note-editor audio, +.note-editor canvas, +.note-editor video { + display: inline-block; +} +.note-editor audio:not([controls]) { + display: none; + height: 0; +} +.note-editor [hidden], +.note-editor template { + display: none; +} +.note-editor html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; +} +.note-editor body { + margin: 0; +} +.note-editor a { + background: transparent; +} +.note-editor a:focus { + outline: thin dotted; +} +.note-editor a:active, +.note-editor a:hover { + outline: 0; +} +.note-editor h1 { + font-size: 2em; + margin: 0.67em 0; +} +.note-editor abbr[title] { + border-bottom: 1px dotted; +} +.note-editor b, +.note-editor strong { + font-weight: bold; +} +.note-editor dfn { + font-style: italic; +} +.note-editor hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} +.note-editor mark { + background: #ff0; + color: #000; +} +.note-editor code, +.note-editor kbd, +.note-editor pre, +.note-editor samp { + font-family: monospace, serif; + font-size: 1em; +} +.note-editor pre { + white-space: pre-wrap; +} +.note-editor q { + quotes: "\201C" "\201D" "\2018" "\2019"; +} +.note-editor small { + font-size: 80%; +} +.note-editor sub, +.note-editor sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +.note-editor sup { + top: -0.5em; +} +.note-editor sub { + bottom: -0.25em; +} +.note-editor img { + border: 0; +} +.note-editor svg:not(:root) { + overflow: hidden; +} +.note-editor figure { + margin: 0; +} +.note-editor fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} +.note-editor legend { + border: 0; + padding: 0; +} +.note-editor button, +.note-editor input, +.note-editor select, +.note-editor textarea { + font-family: inherit; + font-size: 100%; + margin: 0; +} +.note-editor button, +.note-editor input { + line-height: normal; +} +.note-editor button, +.note-editor select { + text-transform: none; +} +.note-editor button, +.note-editor html input[type="button"], +.note-editor input[type="reset"], +.note-editor input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} +.note-editor button[disabled], +.note-editor html input[disabled] { + cursor: default; +} +.note-editor input[type="checkbox"], +.note-editor input[type="radio"] { + box-sizing: border-box; + padding: 0; +} +.note-editor input[type="search"] { + -webkit-appearance: textfield; + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + box-sizing: content-box; +} +.note-editor input[type="search"]::-webkit-search-cancel-button, +.note-editor input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +.note-editor button::-moz-focus-inner, +.note-editor input::-moz-focus-inner { + border: 0; + padding: 0; +} +.note-editor textarea { + overflow: auto; + vertical-align: top; +} +.note-editor table { + border-collapse: collapse; + border-spacing: 0; +} +@media print { + .note-editor * { + text-shadow: none !important; + color: #000 !important; + background: transparent !important; + box-shadow: none !important; + } + .note-editor a, + .note-editor a:visited { + text-decoration: underline; + } + .note-editor a[href]:after { + content: " (" attr(href) ")"; + } + .note-editor abbr[title]:after { + content: " (" attr(title) ")"; + } + .note-editor .ir a:after, + .note-editor a[href^="javascript:"]:after, + .note-editor a[href^="#"]:after { + content: ""; + } + .note-editor pre, + .note-editor blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + .note-editor thead { + display: table-header-group; + } + .note-editor tr, + .note-editor img { + page-break-inside: avoid; + } + .note-editor img { + max-width: 100% !important; + } + @page { + margin: 2cm .5cm; + } + .note-editor p, + .note-editor h2, + .note-editor h3 { + orphans: 3; + widows: 3; + } + .note-editor h2, + .note-editor h3 { + page-break-after: avoid; + } + .note-editor .navbar { + display: none; + } + .note-editor .table td, + .note-editor .table th { + background-color: #fff !important; + } + .note-editor .btn > .caret, + .note-editor .dropup > .btn > .caret { + border-top-color: #000 !important; + } + .note-editor .label { + border: 1px solid #000; + } + .note-editor .table { + border-collapse: collapse !important; + } + .note-editor .table-bordered th, + .note-editor .table-bordered td { + border: 1px solid #ddd !important; + } +} +.note-editor *, +.note-editor *:before, +.note-editor *:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.note-editor html { + font-size: 62.5%; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} +.note-editor body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 1.428571429; + color: #333333; + background-color: #ffffff; +} +.note-editor input, +.note-editor button, +.note-editor select, +.note-editor textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} +.note-editor a { + color: #428bca; + text-decoration: none; +} +.note-editor a:hover, +.note-editor a:focus { + color: #2a6496; + text-decoration: underline; +} +.note-editor a:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.note-editor img { + vertical-align: middle; +} +.note-editor .img-responsive { + display: block; + max-width: 100%; + height: auto; +} +.note-editor .img-rounded { + border-radius: 6px; +} +.note-editor .img-thumbnail { + padding: 4px; + line-height: 1.428571429; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 4px; + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + display: inline-block; + max-width: 100%; + height: auto; +} +.note-editor .img-circle { + border-radius: 50%; +} +.note-editor hr { + margin-top: 20px; + margin-bottom: 20px; + border: 0; + border-top: 1px solid #eeeeee; +} +.note-editor .sr-only { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} +.note-editor p { + margin: 0 0 10px; +} +.note-editor .lead { + margin-bottom: 20px; + font-size: 16px; + font-weight: 200; + line-height: 1.4; +} +@media (min-width: 768px) { + .note-editor .lead { + font-size: 21px; + } +} +.note-editor small, +.note-editor .small { + font-size: 85%; +} +.note-editor cite { + font-style: normal; +} +.note-editor .text-muted { + color: #999999; +} +.note-editor .text-primary { + color: #428bca; +} +.note-editor .text-primary:hover { + color: #3071a9; +} +.note-editor .text-warning { + color: #c09853; +} +.note-editor .text-warning:hover { + color: #a47e3c; +} +.note-editor .text-danger { + color: #b94a48; +} +.note-editor .text-danger:hover { + color: #953b39; +} +.note-editor .text-success { + color: #468847; +} +.note-editor .text-success:hover { + color: #356635; +} +.note-editor .text-info { + color: #3a87ad; +} +.note-editor .text-info:hover { + color: #2d6987; +} +.note-editor .text-left { + text-align: left; +} +.note-editor .text-right { + text-align: right; +} +.note-editor .text-center { + text-align: center; +} +.note-editor h1, +.note-editor h2, +.note-editor h3, +.note-editor h4, +.note-editor h5, +.note-editor h6, +.note-editor .h1, +.note-editor .h2, +.note-editor .h3, +.note-editor .h4, +.note-editor .h5, +.note-editor .h6 { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-weight: 500; + line-height: 1.1; + color: inherit; +} +.note-editor h1 small, +.note-editor h2 small, +.note-editor h3 small, +.note-editor h4 small, +.note-editor h5 small, +.note-editor h6 small, +.note-editor .h1 small, +.note-editor .h2 small, +.note-editor .h3 small, +.note-editor .h4 small, +.note-editor .h5 small, +.note-editor .h6 small, +.note-editor h1 .small, +.note-editor h2 .small, +.note-editor h3 .small, +.note-editor h4 .small, +.note-editor h5 .small, +.note-editor h6 .small, +.note-editor .h1 .small, +.note-editor .h2 .small, +.note-editor .h3 .small, +.note-editor .h4 .small, +.note-editor .h5 .small, +.note-editor .h6 .small { + font-weight: normal; + line-height: 1; + color: #999999; +} +.note-editor h1, +.note-editor h2, +.note-editor h3 { + margin-top: 20px; + margin-bottom: 10px; +} +.note-editor h1 small, +.note-editor h2 small, +.note-editor h3 small, +.note-editor h1 .small, +.note-editor h2 .small, +.note-editor h3 .small { + font-size: 65%; +} +.note-editor h4, +.note-editor h5, +.note-editor h6 { + margin-top: 10px; + margin-bottom: 10px; +} +.note-editor h4 small, +.note-editor h5 small, +.note-editor h6 small, +.note-editor h4 .small, +.note-editor h5 .small, +.note-editor h6 .small { + font-size: 75%; +} +.note-editor h1, +.note-editor .h1 { + font-size: 36px; +} +.note-editor h2, +.note-editor .h2 { + font-size: 30px; +} +.note-editor h3, +.note-editor .h3 { + font-size: 24px; +} +.note-editor h4, +.note-editor .h4 { + font-size: 18px; +} +.note-editor h5, +.note-editor .h5 { + font-size: 14px; +} +.note-editor h6, +.note-editor .h6 { + font-size: 12px; +} +.note-editor .page-header { + padding-bottom: 9px; + margin: 40px 0 20px; + border-bottom: 1px solid #eeeeee; +} +.note-editor ul, +.note-editor ol { + margin-top: 0; + margin-bottom: 10px; +} +.note-editor ul ul, +.note-editor ol ul, +.note-editor ul ol, +.note-editor ol ol { + margin-bottom: 0; +} +.note-editor .list-unstyled { + padding-left: 0; + list-style: none; +} +.note-editor .list-inline { + padding-left: 0; + list-style: none; +} +.note-editor .list-inline > li { + display: inline-block; + padding-left: 5px; + padding-right: 5px; +} +.note-editor dl { + margin-bottom: 20px; +} +.note-editor dt, +.note-editor dd { + line-height: 1.428571429; +} +.note-editor dt { + font-weight: bold; +} +.note-editor dd { + margin-left: 0; +} +@media (min-width: 768px) { + .note-editor .dl-horizontal dt { + float: left; + width: 160px; + clear: left; + text-align: right; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .note-editor .dl-horizontal dd { + margin-left: 180px; + } + .note-editor .dl-horizontal dd:before, + .note-editor .dl-horizontal dd:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + + } + .note-editor .dl-horizontal dd:after { + clear: both; + } + .note-editor .dl-horizontal dd:before, + .note-editor .dl-horizontal dd:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + + } + .note-editor .dl-horizontal dd:after { + clear: both; + } +} +.note-editor abbr[title], +.note-editor abbr[data-original-title] { + cursor: help; + border-bottom: 1px dotted #999999; +} +.note-editor abbr.initialism { + font-size: 90%; + text-transform: uppercase; +} +.note-editor blockquote { + padding: 10px 20px; + margin: 0 0 20px; + border-left: 5px solid #eeeeee; +} +.note-editor blockquote p { + font-size: 17.5px; + font-weight: 300; + line-height: 1.25; +} +.note-editor blockquote p:last-child { + margin-bottom: 0; +} +.note-editor blockquote small { + display: block; + line-height: 1.428571429; + color: #999999; +} +.note-editor blockquote small:before { + content: '\2014 \00A0'; +} +.note-editor blockquote.pull-right { + padding-right: 15px; + padding-left: 0; + border-right: 5px solid #eeeeee; + border-left: 0; +} +.note-editor blockquote.pull-right p, +.note-editor blockquote.pull-right small, +.note-editor blockquote.pull-right .small { + text-align: right; +} +.note-editor blockquote.pull-right small:before, +.note-editor blockquote.pull-right .small:before { + content: ''; +} +.note-editor blockquote.pull-right small:after, +.note-editor blockquote.pull-right .small:after { + content: '\00A0 \2014'; +} +.note-editor blockquote:before, +.note-editor blockquote:after { + content: ""; +} +.note-editor address { + margin-bottom: 20px; + font-style: normal; + line-height: 1.428571429; +} +.note-editor code, +.note-editor kdb, +.note-editor pre, +.note-editor samp { + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; +} +.note-editor code { + padding: 2px 4px; + font-size: 90%; + color: #c7254e; + background-color: #f9f2f4; + white-space: nowrap; + border-radius: 4px; +} +.note-editor pre { + display: block; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 1.428571429; + word-break: break-all; + word-wrap: break-word; + color: #333333; + background-color: #f5f5f5; + border: 1px solid #cccccc; + border-radius: 4px; +} +.note-editor pre code { + padding: 0; + font-size: inherit; + color: inherit; + white-space: pre-wrap; + background-color: transparent; + border-radius: 0; +} +.note-editor .pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} +.note-editor .container { + margin-right: auto; + margin-left: auto; + padding-left: 15px; + padding-right: 15px; +} +.note-editor .container:before, +.note-editor .container:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .container:after { + clear: both; +} +.note-editor .container:before, +.note-editor .container:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .container:after { + clear: both; +} +.note-editor .row { + margin-left: -15px; + margin-right: -15px; +} +.note-editor .row:before, +.note-editor .row:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .row:after { + clear: both; +} +.note-editor .row:before, +.note-editor .row:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .row:after { + clear: both; +} +.note-editor .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { + position: relative; + min-height: 1px; + padding-left: 15px; + padding-right: 15px; +} +.note-editor .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11 { + float: left; +} +.note-editor .col-xs-12 { + width: 100%; +} +.note-editor .col-xs-11 { + width: 91.66666666666666%; +} +.note-editor .col-xs-10 { + width: 83.33333333333334%; +} +.note-editor .col-xs-9 { + width: 75%; +} +.note-editor .col-xs-8 { + width: 66.66666666666666%; +} +.note-editor .col-xs-7 { + width: 58.333333333333336%; +} +.note-editor .col-xs-6 { + width: 50%; +} +.note-editor .col-xs-5 { + width: 41.66666666666667%; +} +.note-editor .col-xs-4 { + width: 33.33333333333333%; +} +.note-editor .col-xs-3 { + width: 25%; +} +.note-editor .col-xs-2 { + width: 16.666666666666664%; +} +.note-editor .col-xs-1 { + width: 8.333333333333332%; +} +.note-editor .col-xs-pull-12 { + right: 100%; +} +.note-editor .col-xs-pull-11 { + right: 91.66666666666666%; +} +.note-editor .col-xs-pull-10 { + right: 83.33333333333334%; +} +.note-editor .col-xs-pull-9 { + right: 75%; +} +.note-editor .col-xs-pull-8 { + right: 66.66666666666666%; +} +.note-editor .col-xs-pull-7 { + right: 58.333333333333336%; +} +.note-editor .col-xs-pull-6 { + right: 50%; +} +.note-editor .col-xs-pull-5 { + right: 41.66666666666667%; +} +.note-editor .col-xs-pull-4 { + right: 33.33333333333333%; +} +.note-editor .col-xs-pull-3 { + right: 25%; +} +.note-editor .col-xs-pull-2 { + right: 16.666666666666664%; +} +.note-editor .col-xs-pull-1 { + right: 8.333333333333332%; +} +.note-editor .col-xs-push-12 { + left: 100%; +} +.note-editor .col-xs-push-11 { + left: 91.66666666666666%; +} +.note-editor .col-xs-push-10 { + left: 83.33333333333334%; +} +.note-editor .col-xs-push-9 { + left: 75%; +} +.note-editor .col-xs-push-8 { + left: 66.66666666666666%; +} +.note-editor .col-xs-push-7 { + left: 58.333333333333336%; +} +.note-editor .col-xs-push-6 { + left: 50%; +} +.note-editor .col-xs-push-5 { + left: 41.66666666666667%; +} +.note-editor .col-xs-push-4 { + left: 33.33333333333333%; +} +.note-editor .col-xs-push-3 { + left: 25%; +} +.note-editor .col-xs-push-2 { + left: 16.666666666666664%; +} +.note-editor .col-xs-push-1 { + left: 8.333333333333332%; +} +.note-editor .col-xs-offset-12 { + margin-left: 100%; +} +.note-editor .col-xs-offset-11 { + margin-left: 91.66666666666666%; +} +.note-editor .col-xs-offset-10 { + margin-left: 83.33333333333334%; +} +.note-editor .col-xs-offset-9 { + margin-left: 75%; +} +.note-editor .col-xs-offset-8 { + margin-left: 66.66666666666666%; +} +.note-editor .col-xs-offset-7 { + margin-left: 58.333333333333336%; +} +.note-editor .col-xs-offset-6 { + margin-left: 50%; +} +.note-editor .col-xs-offset-5 { + margin-left: 41.66666666666667%; +} +.note-editor .col-xs-offset-4 { + margin-left: 33.33333333333333%; +} +.note-editor .col-xs-offset-3 { + margin-left: 25%; +} +.note-editor .col-xs-offset-2 { + margin-left: 16.666666666666664%; +} +.note-editor .col-xs-offset-1 { + margin-left: 8.333333333333332%; +} +@media (min-width: 768px) { + .note-editor .container { + width: 750px; + } + .note-editor .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11 { + float: left; + } + .note-editor .col-sm-12 { + width: 100%; + } + .note-editor .col-sm-11 { + width: 91.66666666666666%; + } + .note-editor .col-sm-10 { + width: 83.33333333333334%; + } + .note-editor .col-sm-9 { + width: 75%; + } + .note-editor .col-sm-8 { + width: 66.66666666666666%; + } + .note-editor .col-sm-7 { + width: 58.333333333333336%; + } + .note-editor .col-sm-6 { + width: 50%; + } + .note-editor .col-sm-5 { + width: 41.66666666666667%; + } + .note-editor .col-sm-4 { + width: 33.33333333333333%; + } + .note-editor .col-sm-3 { + width: 25%; + } + .note-editor .col-sm-2 { + width: 16.666666666666664%; + } + .note-editor .col-sm-1 { + width: 8.333333333333332%; + } + .note-editor .col-sm-pull-12 { + right: 100%; + } + .note-editor .col-sm-pull-11 { + right: 91.66666666666666%; + } + .note-editor .col-sm-pull-10 { + right: 83.33333333333334%; + } + .note-editor .col-sm-pull-9 { + right: 75%; + } + .note-editor .col-sm-pull-8 { + right: 66.66666666666666%; + } + .note-editor .col-sm-pull-7 { + right: 58.333333333333336%; + } + .note-editor .col-sm-pull-6 { + right: 50%; + } + .note-editor .col-sm-pull-5 { + right: 41.66666666666667%; + } + .note-editor .col-sm-pull-4 { + right: 33.33333333333333%; + } + .note-editor .col-sm-pull-3 { + right: 25%; + } + .note-editor .col-sm-pull-2 { + right: 16.666666666666664%; + } + .note-editor .col-sm-pull-1 { + right: 8.333333333333332%; + } + .note-editor .col-sm-push-12 { + left: 100%; + } + .note-editor .col-sm-push-11 { + left: 91.66666666666666%; + } + .note-editor .col-sm-push-10 { + left: 83.33333333333334%; + } + .note-editor .col-sm-push-9 { + left: 75%; + } + .note-editor .col-sm-push-8 { + left: 66.66666666666666%; + } + .note-editor .col-sm-push-7 { + left: 58.333333333333336%; + } + .note-editor .col-sm-push-6 { + left: 50%; + } + .note-editor .col-sm-push-5 { + left: 41.66666666666667%; + } + .note-editor .col-sm-push-4 { + left: 33.33333333333333%; + } + .note-editor .col-sm-push-3 { + left: 25%; + } + .note-editor .col-sm-push-2 { + left: 16.666666666666664%; + } + .note-editor .col-sm-push-1 { + left: 8.333333333333332%; + } + .note-editor .col-sm-offset-12 { + margin-left: 100%; + } + .note-editor .col-sm-offset-11 { + margin-left: 91.66666666666666%; + } + .note-editor .col-sm-offset-10 { + margin-left: 83.33333333333334%; + } + .note-editor .col-sm-offset-9 { + margin-left: 75%; + } + .note-editor .col-sm-offset-8 { + margin-left: 66.66666666666666%; + } + .note-editor .col-sm-offset-7 { + margin-left: 58.333333333333336%; + } + .note-editor .col-sm-offset-6 { + margin-left: 50%; + } + .note-editor .col-sm-offset-5 { + margin-left: 41.66666666666667%; + } + .note-editor .col-sm-offset-4 { + margin-left: 33.33333333333333%; + } + .note-editor .col-sm-offset-3 { + margin-left: 25%; + } + .note-editor .col-sm-offset-2 { + margin-left: 16.666666666666664%; + } + .note-editor .col-sm-offset-1 { + margin-left: 8.333333333333332%; + } +} +@media (min-width: 992px) { + .note-editor .container { + width: 970px; + } + .note-editor .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11 { + float: left; + } + .note-editor .col-md-12 { + width: 100%; + } + .note-editor .col-md-11 { + width: 91.66666666666666%; + } + .note-editor .col-md-10 { + width: 83.33333333333334%; + } + .note-editor .col-md-9 { + width: 75%; + } + .note-editor .col-md-8 { + width: 66.66666666666666%; + } + .note-editor .col-md-7 { + width: 58.333333333333336%; + } + .note-editor .col-md-6 { + width: 50%; + } + .note-editor .col-md-5 { + width: 41.66666666666667%; + } + .note-editor .col-md-4 { + width: 33.33333333333333%; + } + .note-editor .col-md-3 { + width: 25%; + } + .note-editor .col-md-2 { + width: 16.666666666666664%; + } + .note-editor .col-md-1 { + width: 8.333333333333332%; + } + .note-editor .col-md-pull-12 { + right: 100%; + } + .note-editor .col-md-pull-11 { + right: 91.66666666666666%; + } + .note-editor .col-md-pull-10 { + right: 83.33333333333334%; + } + .note-editor .col-md-pull-9 { + right: 75%; + } + .note-editor .col-md-pull-8 { + right: 66.66666666666666%; + } + .note-editor .col-md-pull-7 { + right: 58.333333333333336%; + } + .note-editor .col-md-pull-6 { + right: 50%; + } + .note-editor .col-md-pull-5 { + right: 41.66666666666667%; + } + .note-editor .col-md-pull-4 { + right: 33.33333333333333%; + } + .note-editor .col-md-pull-3 { + right: 25%; + } + .note-editor .col-md-pull-2 { + right: 16.666666666666664%; + } + .note-editor .col-md-pull-1 { + right: 8.333333333333332%; + } + .note-editor .col-md-push-12 { + left: 100%; + } + .note-editor .col-md-push-11 { + left: 91.66666666666666%; + } + .note-editor .col-md-push-10 { + left: 83.33333333333334%; + } + .note-editor .col-md-push-9 { + left: 75%; + } + .note-editor .col-md-push-8 { + left: 66.66666666666666%; + } + .note-editor .col-md-push-7 { + left: 58.333333333333336%; + } + .note-editor .col-md-push-6 { + left: 50%; + } + .note-editor .col-md-push-5 { + left: 41.66666666666667%; + } + .note-editor .col-md-push-4 { + left: 33.33333333333333%; + } + .note-editor .col-md-push-3 { + left: 25%; + } + .note-editor .col-md-push-2 { + left: 16.666666666666664%; + } + .note-editor .col-md-push-1 { + left: 8.333333333333332%; + } + .note-editor .col-md-offset-12 { + margin-left: 100%; + } + .note-editor .col-md-offset-11 { + margin-left: 91.66666666666666%; + } + .note-editor .col-md-offset-10 { + margin-left: 83.33333333333334%; + } + .note-editor .col-md-offset-9 { + margin-left: 75%; + } + .note-editor .col-md-offset-8 { + margin-left: 66.66666666666666%; + } + .note-editor .col-md-offset-7 { + margin-left: 58.333333333333336%; + } + .note-editor .col-md-offset-6 { + margin-left: 50%; + } + .note-editor .col-md-offset-5 { + margin-left: 41.66666666666667%; + } + .note-editor .col-md-offset-4 { + margin-left: 33.33333333333333%; + } + .note-editor .col-md-offset-3 { + margin-left: 25%; + } + .note-editor .col-md-offset-2 { + margin-left: 16.666666666666664%; + } + .note-editor .col-md-offset-1 { + margin-left: 8.333333333333332%; + } +} +@media (min-width: 1200px) { + .note-editor .container { + width: 1170px; + } + .note-editor .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11 { + float: left; + } + .note-editor .col-lg-12 { + width: 100%; + } + .note-editor .col-lg-11 { + width: 91.66666666666666%; + } + .note-editor .col-lg-10 { + width: 83.33333333333334%; + } + .note-editor .col-lg-9 { + width: 75%; + } + .note-editor .col-lg-8 { + width: 66.66666666666666%; + } + .note-editor .col-lg-7 { + width: 58.333333333333336%; + } + .note-editor .col-lg-6 { + width: 50%; + } + .note-editor .col-lg-5 { + width: 41.66666666666667%; + } + .note-editor .col-lg-4 { + width: 33.33333333333333%; + } + .note-editor .col-lg-3 { + width: 25%; + } + .note-editor .col-lg-2 { + width: 16.666666666666664%; + } + .note-editor .col-lg-1 { + width: 8.333333333333332%; + } + .note-editor .col-lg-pull-12 { + right: 100%; + } + .note-editor .col-lg-pull-11 { + right: 91.66666666666666%; + } + .note-editor .col-lg-pull-10 { + right: 83.33333333333334%; + } + .note-editor .col-lg-pull-9 { + right: 75%; + } + .note-editor .col-lg-pull-8 { + right: 66.66666666666666%; + } + .note-editor .col-lg-pull-7 { + right: 58.333333333333336%; + } + .note-editor .col-lg-pull-6 { + right: 50%; + } + .note-editor .col-lg-pull-5 { + right: 41.66666666666667%; + } + .note-editor .col-lg-pull-4 { + right: 33.33333333333333%; + } + .note-editor .col-lg-pull-3 { + right: 25%; + } + .note-editor .col-lg-pull-2 { + right: 16.666666666666664%; + } + .note-editor .col-lg-pull-1 { + right: 8.333333333333332%; + } + .note-editor .col-lg-push-12 { + left: 100%; + } + .note-editor .col-lg-push-11 { + left: 91.66666666666666%; + } + .note-editor .col-lg-push-10 { + left: 83.33333333333334%; + } + .note-editor .col-lg-push-9 { + left: 75%; + } + .note-editor .col-lg-push-8 { + left: 66.66666666666666%; + } + .note-editor .col-lg-push-7 { + left: 58.333333333333336%; + } + .note-editor .col-lg-push-6 { + left: 50%; + } + .note-editor .col-lg-push-5 { + left: 41.66666666666667%; + } + .note-editor .col-lg-push-4 { + left: 33.33333333333333%; + } + .note-editor .col-lg-push-3 { + left: 25%; + } + .note-editor .col-lg-push-2 { + left: 16.666666666666664%; + } + .note-editor .col-lg-push-1 { + left: 8.333333333333332%; + } + .note-editor .col-lg-offset-12 { + margin-left: 100%; + } + .note-editor .col-lg-offset-11 { + margin-left: 91.66666666666666%; + } + .note-editor .col-lg-offset-10 { + margin-left: 83.33333333333334%; + } + .note-editor .col-lg-offset-9 { + margin-left: 75%; + } + .note-editor .col-lg-offset-8 { + margin-left: 66.66666666666666%; + } + .note-editor .col-lg-offset-7 { + margin-left: 58.333333333333336%; + } + .note-editor .col-lg-offset-6 { + margin-left: 50%; + } + .note-editor .col-lg-offset-5 { + margin-left: 41.66666666666667%; + } + .note-editor .col-lg-offset-4 { + margin-left: 33.33333333333333%; + } + .note-editor .col-lg-offset-3 { + margin-left: 25%; + } + .note-editor .col-lg-offset-2 { + margin-left: 16.666666666666664%; + } + .note-editor .col-lg-offset-1 { + margin-left: 8.333333333333332%; + } +} +.note-editor table { + max-width: 100%; + background-color: transparent; +} +.note-editor th { + text-align: left; +} +.note-editor .table { + width: 100%; + margin-bottom: 20px; +} +.note-editor .table > thead > tr > th, +.note-editor .table > tbody > tr > th, +.note-editor .table > tfoot > tr > th, +.note-editor .table > thead > tr > td, +.note-editor .table > tbody > tr > td, +.note-editor .table > tfoot > tr > td { + padding: 8px; + line-height: 1.428571429; + vertical-align: top; + border-top: 1px solid #dddddd; +} +.note-editor .table > thead > tr > th { + vertical-align: bottom; + border-bottom: 2px solid #dddddd; +} +.note-editor .table > caption + thead > tr:first-child > th, +.note-editor .table > colgroup + thead > tr:first-child > th, +.note-editor .table > thead:first-child > tr:first-child > th, +.note-editor .table > caption + thead > tr:first-child > td, +.note-editor .table > colgroup + thead > tr:first-child > td, +.note-editor .table > thead:first-child > tr:first-child > td { + border-top: 0; +} +.note-editor .table > tbody + tbody { + border-top: 2px solid #dddddd; +} +.note-editor .table .table { + background-color: #ffffff; +} +.note-editor .table-condensed > thead > tr > th, +.note-editor .table-condensed > tbody > tr > th, +.note-editor .table-condensed > tfoot > tr > th, +.note-editor .table-condensed > thead > tr > td, +.note-editor .table-condensed > tbody > tr > td, +.note-editor .table-condensed > tfoot > tr > td { + padding: 5px; +} +.note-editor .table-bordered { + border: 1px solid #dddddd; +} +.note-editor .table-bordered > thead > tr > th, +.note-editor .table-bordered > tbody > tr > th, +.note-editor .table-bordered > tfoot > tr > th, +.note-editor .table-bordered > thead > tr > td, +.note-editor .table-bordered > tbody > tr > td, +.note-editor .table-bordered > tfoot > tr > td { + border: 1px solid #dddddd; +} +.note-editor .table-bordered > thead > tr > th, +.note-editor .table-bordered > thead > tr > td { + border-bottom-width: 2px; +} +.note-editor .table-striped > tbody > tr:nth-child(odd) > td, +.note-editor .table-striped > tbody > tr:nth-child(odd) > th { + background-color: #f9f9f9; +} +.note-editor .table-hover > tbody > tr:hover > td, +.note-editor .table-hover > tbody > tr:hover > th { + background-color: #f5f5f5; +} +.note-editor table col[class*="col-"] { + float: none; + display: table-column; +} +.note-editor table td[class*="col-"], +.note-editor table th[class*="col-"] { + float: none; + display: table-cell; +} +.note-editor .table > thead > tr > td.active, +.note-editor .table > tbody > tr > td.active, +.note-editor .table > tfoot > tr > td.active, +.note-editor .table > thead > tr > th.active, +.note-editor .table > tbody > tr > th.active, +.note-editor .table > tfoot > tr > th.active, +.note-editor .table > thead > tr.active > td, +.note-editor .table > tbody > tr.active > td, +.note-editor .table > tfoot > tr.active > td, +.note-editor .table > thead > tr.active > th, +.note-editor .table > tbody > tr.active > th, +.note-editor .table > tfoot > tr.active > th { + background-color: #f5f5f5; +} +.note-editor .table > thead > tr > td.success, +.note-editor .table > tbody > tr > td.success, +.note-editor .table > tfoot > tr > td.success, +.note-editor .table > thead > tr > th.success, +.note-editor .table > tbody > tr > th.success, +.note-editor .table > tfoot > tr > th.success, +.note-editor .table > thead > tr.success > td, +.note-editor .table > tbody > tr.success > td, +.note-editor .table > tfoot > tr.success > td, +.note-editor .table > thead > tr.success > th, +.note-editor .table > tbody > tr.success > th, +.note-editor .table > tfoot > tr.success > th { + background-color: #dff0d8; + border-color: #d6e9c6; +} +.note-editor .table-hover > tbody > tr > td.success:hover, +.note-editor .table-hover > tbody > tr > th.success:hover, +.note-editor .table-hover > tbody > tr.success:hover > td, +.note-editor .table-hover > tbody > tr.success:hover > th { + background-color: #d0e9c6; + border-color: #c9e2b3; +} +.note-editor .table > thead > tr > td.danger, +.note-editor .table > tbody > tr > td.danger, +.note-editor .table > tfoot > tr > td.danger, +.note-editor .table > thead > tr > th.danger, +.note-editor .table > tbody > tr > th.danger, +.note-editor .table > tfoot > tr > th.danger, +.note-editor .table > thead > tr.danger > td, +.note-editor .table > tbody > tr.danger > td, +.note-editor .table > tfoot > tr.danger > td, +.note-editor .table > thead > tr.danger > th, +.note-editor .table > tbody > tr.danger > th, +.note-editor .table > tfoot > tr.danger > th { + background-color: #f2dede; + border-color: #ebccd1; +} +.note-editor .table-hover > tbody > tr > td.danger:hover, +.note-editor .table-hover > tbody > tr > th.danger:hover, +.note-editor .table-hover > tbody > tr.danger:hover > td, +.note-editor .table-hover > tbody > tr.danger:hover > th { + background-color: #ebcccc; + border-color: #e4b9c0; +} +.note-editor .table > thead > tr > td.warning, +.note-editor .table > tbody > tr > td.warning, +.note-editor .table > tfoot > tr > td.warning, +.note-editor .table > thead > tr > th.warning, +.note-editor .table > tbody > tr > th.warning, +.note-editor .table > tfoot > tr > th.warning, +.note-editor .table > thead > tr.warning > td, +.note-editor .table > tbody > tr.warning > td, +.note-editor .table > tfoot > tr.warning > td, +.note-editor .table > thead > tr.warning > th, +.note-editor .table > tbody > tr.warning > th, +.note-editor .table > tfoot > tr.warning > th { + background-color: #fcf8e3; + border-color: #faebcc; +} +.note-editor .table-hover > tbody > tr > td.warning:hover, +.note-editor .table-hover > tbody > tr > th.warning:hover, +.note-editor .table-hover > tbody > tr.warning:hover > td, +.note-editor .table-hover > tbody > tr.warning:hover > th { + background-color: #faf2cc; + border-color: #f7e1b5; +} +@media (max-width: 767px) { + .note-editor .table-responsive { + width: 100%; + margin-bottom: 15px; + overflow-y: hidden; + overflow-x: scroll; + -ms-overflow-style: -ms-autohiding-scrollbar; + border: 1px solid #dddddd; + -webkit-overflow-scrolling: touch; + } + .note-editor .table-responsive > .table { + margin-bottom: 0; + } + .note-editor .table-responsive > .table > thead > tr > th, + .note-editor .table-responsive > .table > tbody > tr > th, + .note-editor .table-responsive > .table > tfoot > tr > th, + .note-editor .table-responsive > .table > thead > tr > td, + .note-editor .table-responsive > .table > tbody > tr > td, + .note-editor .table-responsive > .table > tfoot > tr > td { + white-space: nowrap; + } + .note-editor .table-responsive > .table-bordered { + border: 0; + } + .note-editor .table-responsive > .table-bordered > thead > tr > th:first-child, + .note-editor .table-responsive > .table-bordered > tbody > tr > th:first-child, + .note-editor .table-responsive > .table-bordered > tfoot > tr > th:first-child, + .note-editor .table-responsive > .table-bordered > thead > tr > td:first-child, + .note-editor .table-responsive > .table-bordered > tbody > tr > td:first-child, + .note-editor .table-responsive > .table-bordered > tfoot > tr > td:first-child { + border-left: 0; + } + .note-editor .table-responsive > .table-bordered > thead > tr > th:last-child, + .note-editor .table-responsive > .table-bordered > tbody > tr > th:last-child, + .note-editor .table-responsive > .table-bordered > tfoot > tr > th:last-child, + .note-editor .table-responsive > .table-bordered > thead > tr > td:last-child, + .note-editor .table-responsive > .table-bordered > tbody > tr > td:last-child, + .note-editor .table-responsive > .table-bordered > tfoot > tr > td:last-child { + border-right: 0; + } + .note-editor .table-responsive > .table-bordered > tbody > tr:last-child > th, + .note-editor .table-responsive > .table-bordered > tfoot > tr:last-child > th, + .note-editor .table-responsive > .table-bordered > tbody > tr:last-child > td, + .note-editor .table-responsive > .table-bordered > tfoot > tr:last-child > td { + border-bottom: 0; + } +} +.note-editor fieldset { + padding: 0; + margin: 0; + border: 0; +} +.note-editor legend { + display: block; + width: 100%; + padding: 0; + margin-bottom: 20px; + font-size: 21px; + line-height: inherit; + color: #333333; + border: 0; + border-bottom: 1px solid #e5e5e5; +} +.note-editor label { + display: inline-block; + margin-bottom: 5px; + font-weight: bold; +} +.note-editor input[type="search"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.note-editor input[type="radio"], +.note-editor input[type="checkbox"] { + margin: 4px 0 0; + margin-top: 1px \9; + /* IE8-9 */ + + line-height: normal; +} +.note-editor input[type="file"] { + display: block; +} +.note-editor select[multiple], +.note-editor select[size] { + height: auto; +} +.note-editor select optgroup { + font-size: inherit; + font-style: inherit; + font-family: inherit; +} +.note-editor input[type="file"]:focus, +.note-editor input[type="radio"]:focus, +.note-editor input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.note-editor input[type="number"]::-webkit-outer-spin-button, +.note-editor input[type="number"]::-webkit-inner-spin-button { + height: auto; +} +.note-editor output { + display: block; + padding-top: 7px; + font-size: 14px; + line-height: 1.428571429; + color: #555555; + vertical-align: middle; +} +.note-editor .form-control:-moz-placeholder { + color: #999999; +} +.note-editor .form-control::-moz-placeholder { + color: #999999; +} +.note-editor .form-control:-ms-input-placeholder { + color: #999999; +} +.note-editor .form-control::-webkit-input-placeholder { + color: #999999; +} +.note-editor .form-control { + display: block; + width: 100%; + height: 34px; + padding: 6px 12px; + font-size: 14px; + line-height: 1.428571429; + color: #555555; + vertical-align: middle; + background-color: #ffffff; + background-image: none; + border: 1px solid #cccccc; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; +} +.note-editor .form-control:focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); +} +.note-editor .form-control[disabled], +.note-editor .form-control[readonly], +fieldset[disabled] .note-editor .form-control { + cursor: not-allowed; + background-color: #eeeeee; +} +textarea.note-editor .form-control { + height: auto; +} +.note-editor .form-group { + margin-bottom: 15px; +} +.note-editor .radio, +.note-editor .checkbox { + display: block; + min-height: 20px; + margin-top: 10px; + margin-bottom: 10px; + padding-left: 20px; + vertical-align: middle; +} +.note-editor .radio label, +.note-editor .checkbox label { + display: inline; + margin-bottom: 0; + font-weight: normal; + cursor: pointer; +} +.note-editor .radio input[type="radio"], +.note-editor .radio-inline input[type="radio"], +.note-editor .checkbox input[type="checkbox"], +.note-editor .checkbox-inline input[type="checkbox"] { + float: left; + margin-left: -20px; +} +.note-editor .radio + .radio, +.note-editor .checkbox + .checkbox { + margin-top: -5px; +} +.note-editor .radio-inline, +.note-editor .checkbox-inline { + display: inline-block; + padding-left: 20px; + margin-bottom: 0; + vertical-align: middle; + font-weight: normal; + cursor: pointer; +} +.note-editor .radio-inline + .radio-inline, +.note-editor .checkbox-inline + .checkbox-inline { + margin-top: 0; + margin-left: 10px; +} +.note-editor input[type="radio"][disabled], +.note-editor input[type="checkbox"][disabled], +.note-editor .radio[disabled], +.note-editor .radio-inline[disabled], +.note-editor .checkbox[disabled], +.note-editor .checkbox-inline[disabled], +fieldset[disabled] .note-editor input[type="radio"], +fieldset[disabled] .note-editor input[type="checkbox"], +fieldset[disabled] .note-editor .radio, +fieldset[disabled] .note-editor .radio-inline, +fieldset[disabled] .note-editor .checkbox, +fieldset[disabled] .note-editor .checkbox-inline { + cursor: not-allowed; +} +.note-editor .input-sm { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.note-editor .input-sm { + height: 30px; + line-height: 30px; +} +textarea.note-editor .input-sm { + height: auto; +} +.note-editor .input-lg { + height: 45px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +select.note-editor .input-lg { + height: 45px; + line-height: 45px; +} +textarea.note-editor .input-lg { + height: auto; +} +.note-editor .has-warning .help-block, +.note-editor .has-warning .control-label { + color: #c09853; +} +.note-editor .has-warning .form-control { + border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.note-editor .has-warning .form-control:focus { + border-color: #a47e3c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; +} +.note-editor .has-warning .input-group-addon { + color: #c09853; + border-color: #c09853; + background-color: #fcf8e3; +} +.note-editor .has-error .help-block, +.note-editor .has-error .control-label { + color: #b94a48; +} +.note-editor .has-error .form-control { + border-color: #b94a48; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.note-editor .has-error .form-control:focus { + border-color: #953b39; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; +} +.note-editor .has-error .input-group-addon { + color: #b94a48; + border-color: #b94a48; + background-color: #f2dede; +} +.note-editor .has-success .help-block, +.note-editor .has-success .control-label { + color: #468847; +} +.note-editor .has-success .form-control { + border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.note-editor .has-success .form-control:focus { + border-color: #356635; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; +} +.note-editor .has-success .input-group-addon { + color: #468847; + border-color: #468847; + background-color: #dff0d8; +} +.note-editor .form-control-static { + margin-bottom: 0; +} +.note-editor .help-block { + display: block; + margin-top: 5px; + margin-bottom: 10px; + color: #737373; +} +@media (min-width: 768px) { + .note-editor .form-inline .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .note-editor .form-inline .form-control { + display: inline-block; + } + .note-editor .form-inline .radio, + .note-editor .form-inline .checkbox { + display: inline-block; + margin-top: 0; + margin-bottom: 0; + padding-left: 0; + } + .note-editor .form-inline .radio input[type="radio"], + .note-editor .form-inline .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } +} +.note-editor .form-horizontal .control-label, +.note-editor .form-horizontal .radio, +.note-editor .form-horizontal .checkbox, +.note-editor .form-horizontal .radio-inline, +.note-editor .form-horizontal .checkbox-inline { + margin-top: 0; + margin-bottom: 0; + padding-top: 7px; +} +.note-editor .form-horizontal .form-group { + margin-left: -15px; + margin-right: -15px; +} +.note-editor .form-horizontal .form-group:before, +.note-editor .form-horizontal .form-group:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .form-horizontal .form-group:after { + clear: both; +} +.note-editor .form-horizontal .form-group:before, +.note-editor .form-horizontal .form-group:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .form-horizontal .form-group:after { + clear: both; +} +.note-editor .form-horizontal .form-control-static { + padding-top: 7px; +} +@media (min-width: 768px) { + .note-editor .form-horizontal .control-label { + text-align: right; + } +} +.note-editor .btn { + display: inline-block; + margin-bottom: 0; + font-weight: normal; + text-align: center; + vertical-align: middle; + cursor: pointer; + background-image: none; + border: 1px solid transparent; + white-space: nowrap; + padding: 6px 12px; + font-size: 14px; + line-height: 1.428571429; + border-radius: 4px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; +} +.note-editor .btn:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.note-editor .btn:hover, +.note-editor .btn:focus { + color: #333333; + text-decoration: none; +} +.note-editor .btn:active, +.note-editor .btn.active { + outline: 0; + background-image: none; + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} +.note-editor .btn.disabled, +.note-editor .btn[disabled], +fieldset[disabled] .note-editor .btn { + cursor: not-allowed; + pointer-events: none; + opacity: 0.65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + box-shadow: none; +} +.note-editor .btn-default { + color: #333333; + background-color: #ffffff; + border-color: #cccccc; +} +.note-editor .btn-default:hover, +.note-editor .btn-default:focus, +.note-editor .btn-default:active, +.note-editor .btn-default.active, +.open .dropdown-toggle.note-editor .btn-default { + color: #333333; + background-color: #ebebeb; + border-color: #adadad; +} +.note-editor .btn-default:active, +.note-editor .btn-default.active, +.open .dropdown-toggle.note-editor .btn-default { + background-image: none; +} +.note-editor .btn-default.disabled, +.note-editor .btn-default[disabled], +fieldset[disabled] .note-editor .btn-default, +.note-editor .btn-default.disabled:hover, +.note-editor .btn-default[disabled]:hover, +fieldset[disabled] .note-editor .btn-default:hover, +.note-editor .btn-default.disabled:focus, +.note-editor .btn-default[disabled]:focus, +fieldset[disabled] .note-editor .btn-default:focus, +.note-editor .btn-default.disabled:active, +.note-editor .btn-default[disabled]:active, +fieldset[disabled] .note-editor .btn-default:active, +.note-editor .btn-default.disabled.active, +.note-editor .btn-default[disabled].active, +fieldset[disabled] .note-editor .btn-default.active { + background-color: #ffffff; + border-color: #cccccc; +} +.note-editor .btn-primary { + color: #ffffff; + background-color: #428bca; + border-color: #357ebd; +} +.note-editor .btn-primary:hover, +.note-editor .btn-primary:focus, +.note-editor .btn-primary:active, +.note-editor .btn-primary.active, +.open .dropdown-toggle.note-editor .btn-primary { + color: #ffffff; + background-color: #3276b1; + border-color: #285e8e; +} +.note-editor .btn-primary:active, +.note-editor .btn-primary.active, +.open .dropdown-toggle.note-editor .btn-primary { + background-image: none; +} +.note-editor .btn-primary.disabled, +.note-editor .btn-primary[disabled], +fieldset[disabled] .note-editor .btn-primary, +.note-editor .btn-primary.disabled:hover, +.note-editor .btn-primary[disabled]:hover, +fieldset[disabled] .note-editor .btn-primary:hover, +.note-editor .btn-primary.disabled:focus, +.note-editor .btn-primary[disabled]:focus, +fieldset[disabled] .note-editor .btn-primary:focus, +.note-editor .btn-primary.disabled:active, +.note-editor .btn-primary[disabled]:active, +fieldset[disabled] .note-editor .btn-primary:active, +.note-editor .btn-primary.disabled.active, +.note-editor .btn-primary[disabled].active, +fieldset[disabled] .note-editor .btn-primary.active { + background-color: #428bca; + border-color: #357ebd; +} +.note-editor .btn-warning { + color: #ffffff; + background-color: #f0ad4e; + border-color: #eea236; +} +.note-editor .btn-warning:hover, +.note-editor .btn-warning:focus, +.note-editor .btn-warning:active, +.note-editor .btn-warning.active, +.open .dropdown-toggle.note-editor .btn-warning { + color: #ffffff; + background-color: #ed9c28; + border-color: #d58512; +} +.note-editor .btn-warning:active, +.note-editor .btn-warning.active, +.open .dropdown-toggle.note-editor .btn-warning { + background-image: none; +} +.note-editor .btn-warning.disabled, +.note-editor .btn-warning[disabled], +fieldset[disabled] .note-editor .btn-warning, +.note-editor .btn-warning.disabled:hover, +.note-editor .btn-warning[disabled]:hover, +fieldset[disabled] .note-editor .btn-warning:hover, +.note-editor .btn-warning.disabled:focus, +.note-editor .btn-warning[disabled]:focus, +fieldset[disabled] .note-editor .btn-warning:focus, +.note-editor .btn-warning.disabled:active, +.note-editor .btn-warning[disabled]:active, +fieldset[disabled] .note-editor .btn-warning:active, +.note-editor .btn-warning.disabled.active, +.note-editor .btn-warning[disabled].active, +fieldset[disabled] .note-editor .btn-warning.active { + background-color: #f0ad4e; + border-color: #eea236; +} +.note-editor .btn-danger { + color: #ffffff; + background-color: #d9534f; + border-color: #d43f3a; +} +.note-editor .btn-danger:hover, +.note-editor .btn-danger:focus, +.note-editor .btn-danger:active, +.note-editor .btn-danger.active, +.open .dropdown-toggle.note-editor .btn-danger { + color: #ffffff; + background-color: #d2322d; + border-color: #ac2925; +} +.note-editor .btn-danger:active, +.note-editor .btn-danger.active, +.open .dropdown-toggle.note-editor .btn-danger { + background-image: none; +} +.note-editor .btn-danger.disabled, +.note-editor .btn-danger[disabled], +fieldset[disabled] .note-editor .btn-danger, +.note-editor .btn-danger.disabled:hover, +.note-editor .btn-danger[disabled]:hover, +fieldset[disabled] .note-editor .btn-danger:hover, +.note-editor .btn-danger.disabled:focus, +.note-editor .btn-danger[disabled]:focus, +fieldset[disabled] .note-editor .btn-danger:focus, +.note-editor .btn-danger.disabled:active, +.note-editor .btn-danger[disabled]:active, +fieldset[disabled] .note-editor .btn-danger:active, +.note-editor .btn-danger.disabled.active, +.note-editor .btn-danger[disabled].active, +fieldset[disabled] .note-editor .btn-danger.active { + background-color: #d9534f; + border-color: #d43f3a; +} +.note-editor .btn-success { + color: #ffffff; + background-color: #5cb85c; + border-color: #4cae4c; +} +.note-editor .btn-success:hover, +.note-editor .btn-success:focus, +.note-editor .btn-success:active, +.note-editor .btn-success.active, +.open .dropdown-toggle.note-editor .btn-success { + color: #ffffff; + background-color: #47a447; + border-color: #398439; +} +.note-editor .btn-success:active, +.note-editor .btn-success.active, +.open .dropdown-toggle.note-editor .btn-success { + background-image: none; +} +.note-editor .btn-success.disabled, +.note-editor .btn-success[disabled], +fieldset[disabled] .note-editor .btn-success, +.note-editor .btn-success.disabled:hover, +.note-editor .btn-success[disabled]:hover, +fieldset[disabled] .note-editor .btn-success:hover, +.note-editor .btn-success.disabled:focus, +.note-editor .btn-success[disabled]:focus, +fieldset[disabled] .note-editor .btn-success:focus, +.note-editor .btn-success.disabled:active, +.note-editor .btn-success[disabled]:active, +fieldset[disabled] .note-editor .btn-success:active, +.note-editor .btn-success.disabled.active, +.note-editor .btn-success[disabled].active, +fieldset[disabled] .note-editor .btn-success.active { + background-color: #5cb85c; + border-color: #4cae4c; +} +.note-editor .btn-info { + color: #ffffff; + background-color: #5bc0de; + border-color: #46b8da; +} +.note-editor .btn-info:hover, +.note-editor .btn-info:focus, +.note-editor .btn-info:active, +.note-editor .btn-info.active, +.open .dropdown-toggle.note-editor .btn-info { + color: #ffffff; + background-color: #39b3d7; + border-color: #269abc; +} +.note-editor .btn-info:active, +.note-editor .btn-info.active, +.open .dropdown-toggle.note-editor .btn-info { + background-image: none; +} +.note-editor .btn-info.disabled, +.note-editor .btn-info[disabled], +fieldset[disabled] .note-editor .btn-info, +.note-editor .btn-info.disabled:hover, +.note-editor .btn-info[disabled]:hover, +fieldset[disabled] .note-editor .btn-info:hover, +.note-editor .btn-info.disabled:focus, +.note-editor .btn-info[disabled]:focus, +fieldset[disabled] .note-editor .btn-info:focus, +.note-editor .btn-info.disabled:active, +.note-editor .btn-info[disabled]:active, +fieldset[disabled] .note-editor .btn-info:active, +.note-editor .btn-info.disabled.active, +.note-editor .btn-info[disabled].active, +fieldset[disabled] .note-editor .btn-info.active { + background-color: #5bc0de; + border-color: #46b8da; +} +.note-editor .btn-link { + color: #428bca; + font-weight: normal; + cursor: pointer; + border-radius: 0; +} +.note-editor .btn-link, +.note-editor .btn-link:active, +.note-editor .btn-link[disabled], +fieldset[disabled] .note-editor .btn-link { + background-color: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} +.note-editor .btn-link, +.note-editor .btn-link:hover, +.note-editor .btn-link:focus, +.note-editor .btn-link:active { + border-color: transparent; +} +.note-editor .btn-link:hover, +.note-editor .btn-link:focus { + color: #2a6496; + text-decoration: underline; + background-color: transparent; +} +.note-editor .btn-link[disabled]:hover, +fieldset[disabled] .note-editor .btn-link:hover, +.note-editor .btn-link[disabled]:focus, +fieldset[disabled] .note-editor .btn-link:focus { + color: #999999; + text-decoration: none; +} +.note-editor .btn-lg { + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +.note-editor .btn-sm, +.note-editor .btn-xs { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.note-editor .btn-xs { + padding: 1px 5px; +} +.note-editor .btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; +} +.note-editor .btn-block + .btn-block { + margin-top: 5px; +} +.note-editor input[type="submit"].btn-block, +.note-editor input[type="reset"].btn-block, +.note-editor input[type="button"].btn-block { + width: 100%; +} +.note-editor .fade { + opacity: 0; + -webkit-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; +} +.note-editor .fade.in { + opacity: 1; +} +.note-editor .collapse { + display: none; +} +.note-editor .collapse.in { + display: block; +} +.note-editor .collapsing { + position: relative; + height: 0; + overflow: hidden; + -webkit-transition: height 0.35s ease; + transition: height 0.35s ease; +} +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('../fonts/glyphicons-halflings-regular.eot'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); +} +.note-editor .glyphicon { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; +} +.note-editor .glyphicon:empty { + width: 1em; +} +.note-editor .glyphicon-asterisk:before { + content: "\2a"; +} +.note-editor .glyphicon-plus:before { + content: "\2b"; +} +.note-editor .glyphicon-euro:before { + content: "\20ac"; +} +.note-editor .glyphicon-minus:before { + content: "\2212"; +} +.note-editor .glyphicon-cloud:before { + content: "\2601"; +} +.note-editor .glyphicon-envelope:before { + content: "\2709"; +} +.note-editor .glyphicon-pencil:before { + content: "\270f"; +} +.note-editor .glyphicon-glass:before { + content: "\e001"; +} +.note-editor .glyphicon-music:before { + content: "\e002"; +} +.note-editor .glyphicon-search:before { + content: "\e003"; +} +.note-editor .glyphicon-heart:before { + content: "\e005"; +} +.note-editor .glyphicon-star:before { + content: "\e006"; +} +.note-editor .glyphicon-star-empty:before { + content: "\e007"; +} +.note-editor .glyphicon-user:before { + content: "\e008"; +} +.note-editor .glyphicon-film:before { + content: "\e009"; +} +.note-editor .glyphicon-th-large:before { + content: "\e010"; +} +.note-editor .glyphicon-th:before { + content: "\e011"; +} +.note-editor .glyphicon-th-list:before { + content: "\e012"; +} +.note-editor .glyphicon-ok:before { + content: "\e013"; +} +.note-editor .glyphicon-remove:before { + content: "\e014"; +} +.note-editor .glyphicon-zoom-in:before { + content: "\e015"; +} +.note-editor .glyphicon-zoom-out:before { + content: "\e016"; +} +.note-editor .glyphicon-off:before { + content: "\e017"; +} +.note-editor .glyphicon-signal:before { + content: "\e018"; +} +.note-editor .glyphicon-cog:before { + content: "\e019"; +} +.note-editor .glyphicon-trash:before { + content: "\e020"; +} +.note-editor .glyphicon-home:before { + content: "\e021"; +} +.note-editor .glyphicon-file:before { + content: "\e022"; +} +.note-editor .glyphicon-time:before { + content: "\e023"; +} +.note-editor .glyphicon-road:before { + content: "\e024"; +} +.note-editor .glyphicon-download-alt:before { + content: "\e025"; +} +.note-editor .glyphicon-download:before { + content: "\e026"; +} +.note-editor .glyphicon-upload:before { + content: "\e027"; +} +.note-editor .glyphicon-inbox:before { + content: "\e028"; +} +.note-editor .glyphicon-play-circle:before { + content: "\e029"; +} +.note-editor .glyphicon-repeat:before { + content: "\e030"; +} +.note-editor .glyphicon-refresh:before { + content: "\e031"; +} +.note-editor .glyphicon-list-alt:before { + content: "\e032"; +} +.note-editor .glyphicon-lock:before { + content: "\e033"; +} +.note-editor .glyphicon-flag:before { + content: "\e034"; +} +.note-editor .glyphicon-headphones:before { + content: "\e035"; +} +.note-editor .glyphicon-volume-off:before { + content: "\e036"; +} +.note-editor .glyphicon-volume-down:before { + content: "\e037"; +} +.note-editor .glyphicon-volume-up:before { + content: "\e038"; +} +.note-editor .glyphicon-qrcode:before { + content: "\e039"; +} +.note-editor .glyphicon-barcode:before { + content: "\e040"; +} +.note-editor .glyphicon-tag:before { + content: "\e041"; +} +.note-editor .glyphicon-tags:before { + content: "\e042"; +} +.note-editor .glyphicon-book:before { + content: "\e043"; +} +.note-editor .glyphicon-bookmark:before { + content: "\e044"; +} +.note-editor .glyphicon-print:before { + content: "\e045"; +} +.note-editor .glyphicon-camera:before { + content: "\e046"; +} +.note-editor .glyphicon-font:before { + content: "\e047"; +} +.note-editor .glyphicon-bold:before { + content: "\e048"; +} +.note-editor .glyphicon-italic:before { + content: "\e049"; +} +.note-editor .glyphicon-text-height:before { + content: "\e050"; +} +.note-editor .glyphicon-text-width:before { + content: "\e051"; +} +.note-editor .glyphicon-align-left:before { + content: "\e052"; +} +.note-editor .glyphicon-align-center:before { + content: "\e053"; +} +.note-editor .glyphicon-align-right:before { + content: "\e054"; +} +.note-editor .glyphicon-align-justify:before { + content: "\e055"; +} +.note-editor .glyphicon-list:before { + content: "\e056"; +} +.note-editor .glyphicon-indent-left:before { + content: "\e057"; +} +.note-editor .glyphicon-indent-right:before { + content: "\e058"; +} +.note-editor .glyphicon-facetime-video:before { + content: "\e059"; +} +.note-editor .glyphicon-picture:before { + content: "\e060"; +} +.note-editor .glyphicon-map-marker:before { + content: "\e062"; +} +.note-editor .glyphicon-adjust:before { + content: "\e063"; +} +.note-editor .glyphicon-tint:before { + content: "\e064"; +} +.note-editor .glyphicon-edit:before { + content: "\e065"; +} +.note-editor .glyphicon-share:before { + content: "\e066"; +} +.note-editor .glyphicon-check:before { + content: "\e067"; +} +.note-editor .glyphicon-move:before { + content: "\e068"; +} +.note-editor .glyphicon-step-backward:before { + content: "\e069"; +} +.note-editor .glyphicon-fast-backward:before { + content: "\e070"; +} +.note-editor .glyphicon-backward:before { + content: "\e071"; +} +.note-editor .glyphicon-play:before { + content: "\e072"; +} +.note-editor .glyphicon-pause:before { + content: "\e073"; +} +.note-editor .glyphicon-stop:before { + content: "\e074"; +} +.note-editor .glyphicon-forward:before { + content: "\e075"; +} +.note-editor .glyphicon-fast-forward:before { + content: "\e076"; +} +.note-editor .glyphicon-step-forward:before { + content: "\e077"; +} +.note-editor .glyphicon-eject:before { + content: "\e078"; +} +.note-editor .glyphicon-chevron-left:before { + content: "\e079"; +} +.note-editor .glyphicon-chevron-right:before { + content: "\e080"; +} +.note-editor .glyphicon-plus-sign:before { + content: "\e081"; +} +.note-editor .glyphicon-minus-sign:before { + content: "\e082"; +} +.note-editor .glyphicon-remove-sign:before { + content: "\e083"; +} +.note-editor .glyphicon-ok-sign:before { + content: "\e084"; +} +.note-editor .glyphicon-question-sign:before { + content: "\e085"; +} +.note-editor .glyphicon-info-sign:before { + content: "\e086"; +} +.note-editor .glyphicon-screenshot:before { + content: "\e087"; +} +.note-editor .glyphicon-remove-circle:before { + content: "\e088"; +} +.note-editor .glyphicon-ok-circle:before { + content: "\e089"; +} +.note-editor .glyphicon-ban-circle:before { + content: "\e090"; +} +.note-editor .glyphicon-arrow-left:before { + content: "\e091"; +} +.note-editor .glyphicon-arrow-right:before { + content: "\e092"; +} +.note-editor .glyphicon-arrow-up:before { + content: "\e093"; +} +.note-editor .glyphicon-arrow-down:before { + content: "\e094"; +} +.note-editor .glyphicon-share-alt:before { + content: "\e095"; +} +.note-editor .glyphicon-resize-full:before { + content: "\e096"; +} +.note-editor .glyphicon-resize-small:before { + content: "\e097"; +} +.note-editor .glyphicon-exclamation-sign:before { + content: "\e101"; +} +.note-editor .glyphicon-gift:before { + content: "\e102"; +} +.note-editor .glyphicon-leaf:before { + content: "\e103"; +} +.note-editor .glyphicon-fire:before { + content: "\e104"; +} +.note-editor .glyphicon-eye-open:before { + content: "\e105"; +} +.note-editor .glyphicon-eye-close:before { + content: "\e106"; +} +.note-editor .glyphicon-warning-sign:before { + content: "\e107"; +} +.note-editor .glyphicon-plane:before { + content: "\e108"; +} +.note-editor .glyphicon-calendar:before { + content: "\e109"; +} +.note-editor .glyphicon-random:before { + content: "\e110"; +} +.note-editor .glyphicon-comment:before { + content: "\e111"; +} +.note-editor .glyphicon-magnet:before { + content: "\e112"; +} +.note-editor .glyphicon-chevron-up:before { + content: "\e113"; +} +.note-editor .glyphicon-chevron-down:before { + content: "\e114"; +} +.note-editor .glyphicon-retweet:before { + content: "\e115"; +} +.note-editor .glyphicon-shopping-cart:before { + content: "\e116"; +} +.note-editor .glyphicon-folder-close:before { + content: "\e117"; +} +.note-editor .glyphicon-folder-open:before { + content: "\e118"; +} +.note-editor .glyphicon-resize-vertical:before { + content: "\e119"; +} +.note-editor .glyphicon-resize-horizontal:before { + content: "\e120"; +} +.note-editor .glyphicon-hdd:before { + content: "\e121"; +} +.note-editor .glyphicon-bullhorn:before { + content: "\e122"; +} +.note-editor .glyphicon-bell:before { + content: "\e123"; +} +.note-editor .glyphicon-certificate:before { + content: "\e124"; +} +.note-editor .glyphicon-thumbs-up:before { + content: "\e125"; +} +.note-editor .glyphicon-thumbs-down:before { + content: "\e126"; +} +.note-editor .glyphicon-hand-right:before { + content: "\e127"; +} +.note-editor .glyphicon-hand-left:before { + content: "\e128"; +} +.note-editor .glyphicon-hand-up:before { + content: "\e129"; +} +.note-editor .glyphicon-hand-down:before { + content: "\e130"; +} +.note-editor .glyphicon-circle-arrow-right:before { + content: "\e131"; +} +.note-editor .glyphicon-circle-arrow-left:before { + content: "\e132"; +} +.note-editor .glyphicon-circle-arrow-up:before { + content: "\e133"; +} +.note-editor .glyphicon-circle-arrow-down:before { + content: "\e134"; +} +.note-editor .glyphicon-globe:before { + content: "\e135"; +} +.note-editor .glyphicon-wrench:before { + content: "\e136"; +} +.note-editor .glyphicon-tasks:before { + content: "\e137"; +} +.note-editor .glyphicon-filter:before { + content: "\e138"; +} +.note-editor .glyphicon-briefcase:before { + content: "\e139"; +} +.note-editor .glyphicon-fullscreen:before { + content: "\e140"; +} +.note-editor .glyphicon-dashboard:before { + content: "\e141"; +} +.note-editor .glyphicon-paperclip:before { + content: "\e142"; +} +.note-editor .glyphicon-heart-empty:before { + content: "\e143"; +} +.note-editor .glyphicon-link:before { + content: "\e144"; +} +.note-editor .glyphicon-phone:before { + content: "\e145"; +} +.note-editor .glyphicon-pushpin:before { + content: "\e146"; +} +.note-editor .glyphicon-usd:before { + content: "\e148"; +} +.note-editor .glyphicon-gbp:before { + content: "\e149"; +} +.note-editor .glyphicon-sort:before { + content: "\e150"; +} +.note-editor .glyphicon-sort-by-alphabet:before { + content: "\e151"; +} +.note-editor .glyphicon-sort-by-alphabet-alt:before { + content: "\e152"; +} +.note-editor .glyphicon-sort-by-order:before { + content: "\e153"; +} +.note-editor .glyphicon-sort-by-order-alt:before { + content: "\e154"; +} +.note-editor .glyphicon-sort-by-attributes:before { + content: "\e155"; +} +.note-editor .glyphicon-sort-by-attributes-alt:before { + content: "\e156"; +} +.note-editor .glyphicon-unchecked:before { + content: "\e157"; +} +.note-editor .glyphicon-expand:before { + content: "\e158"; +} +.note-editor .glyphicon-collapse-down:before { + content: "\e159"; +} +.note-editor .glyphicon-collapse-up:before { + content: "\e160"; +} +.note-editor .glyphicon-log-in:before { + content: "\e161"; +} +.note-editor .glyphicon-flash:before { + content: "\e162"; +} +.note-editor .glyphicon-log-out:before { + content: "\e163"; +} +.note-editor .glyphicon-new-window:before { + content: "\e164"; +} +.note-editor .glyphicon-record:before { + content: "\e165"; +} +.note-editor .glyphicon-save:before { + content: "\e166"; +} +.note-editor .glyphicon-open:before { + content: "\e167"; +} +.note-editor .glyphicon-saved:before { + content: "\e168"; +} +.note-editor .glyphicon-import:before { + content: "\e169"; +} +.note-editor .glyphicon-export:before { + content: "\e170"; +} +.note-editor .glyphicon-send:before { + content: "\e171"; +} +.note-editor .glyphicon-floppy-disk:before { + content: "\e172"; +} +.note-editor .glyphicon-floppy-saved:before { + content: "\e173"; +} +.note-editor .glyphicon-floppy-remove:before { + content: "\e174"; +} +.note-editor .glyphicon-floppy-save:before { + content: "\e175"; +} +.note-editor .glyphicon-floppy-open:before { + content: "\e176"; +} +.note-editor .glyphicon-credit-card:before { + content: "\e177"; +} +.note-editor .glyphicon-transfer:before { + content: "\e178"; +} +.note-editor .glyphicon-cutlery:before { + content: "\e179"; +} +.note-editor .glyphicon-header:before { + content: "\e180"; +} +.note-editor .glyphicon-compressed:before { + content: "\e181"; +} +.note-editor .glyphicon-earphone:before { + content: "\e182"; +} +.note-editor .glyphicon-phone-alt:before { + content: "\e183"; +} +.note-editor .glyphicon-tower:before { + content: "\e184"; +} +.note-editor .glyphicon-stats:before { + content: "\e185"; +} +.note-editor .glyphicon-sd-video:before { + content: "\e186"; +} +.note-editor .glyphicon-hd-video:before { + content: "\e187"; +} +.note-editor .glyphicon-subtitles:before { + content: "\e188"; +} +.note-editor .glyphicon-sound-stereo:before { + content: "\e189"; +} +.note-editor .glyphicon-sound-dolby:before { + content: "\e190"; +} +.note-editor .glyphicon-sound-5-1:before { + content: "\e191"; +} +.note-editor .glyphicon-sound-6-1:before { + content: "\e192"; +} +.note-editor .glyphicon-sound-7-1:before { + content: "\e193"; +} +.note-editor .glyphicon-copyright-mark:before { + content: "\e194"; +} +.note-editor .glyphicon-registration-mark:before { + content: "\e195"; +} +.note-editor .glyphicon-cloud-download:before { + content: "\e197"; +} +.note-editor .glyphicon-cloud-upload:before { + content: "\e198"; +} +.note-editor .glyphicon-tree-conifer:before { + content: "\e199"; +} +.note-editor .glyphicon-tree-deciduous:before { + content: "\e200"; +} +.note-editor .caret { + display: inline-block; + width: 0; + height: 0; + margin-left: 2px; + vertical-align: middle; + border-top: 4px solid #000000; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + border-bottom: 0 dotted; +} +.note-editor .dropdown { + position: relative; +} +.note-editor .dropdown-toggle:focus { + outline: 0; +} +.note-editor .dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; + list-style: none; + font-size: 14px; + background-color: #ffffff; + border: 1px solid #cccccc; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + background-clip: padding-box; +} +.note-editor .dropdown-menu.pull-right { + right: 0; + left: auto; +} +.note-editor .dropdown-menu .divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; +} +.note-editor .dropdown-menu > li > a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: 1.428571429; + color: #333333; + white-space: nowrap; +} +.note-editor .dropdown-menu > li > a:hover, +.note-editor .dropdown-menu > li > a:focus { + text-decoration: none; + color: #262626; + background-color: #f5f5f5; +} +.note-editor .dropdown-menu > .active > a, +.note-editor .dropdown-menu > .active > a:hover, +.note-editor .dropdown-menu > .active > a:focus { + color: #ffffff; + text-decoration: none; + outline: 0; + background-color: #428bca; +} +.note-editor .dropdown-menu > .disabled > a, +.note-editor .dropdown-menu > .disabled > a:hover, +.note-editor .dropdown-menu > .disabled > a:focus { + color: #999999; +} +.note-editor .dropdown-menu > .disabled > a:hover, +.note-editor .dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: not-allowed; +} +.note-editor .open > .dropdown-menu { + display: block; +} +.note-editor .open > a { + outline: 0; +} +.note-editor .dropdown-header { + display: block; + padding: 3px 20px; + font-size: 12px; + line-height: 1.428571429; + color: #999999; +} +.note-editor .dropdown-backdrop { + position: fixed; + left: 0; + right: 0; + bottom: 0; + top: 0; + z-index: 990; +} +.note-editor .pull-right > .dropdown-menu { + right: 0; + left: auto; +} +.note-editor .dropup .caret, +.note-editor .navbar-fixed-bottom .dropdown .caret { + border-top: 0 dotted; + border-bottom: 4px solid #000000; + content: ""; +} +.note-editor .dropup .dropdown-menu, +.note-editor .navbar-fixed-bottom .dropdown .dropdown-menu { + top: auto; + bottom: 100%; + margin-bottom: 1px; +} +@media (min-width: 768px) { + .note-editor .navbar-right .dropdown-menu { + right: 0; + left: auto; + } +} +.btn-default .note-editor .caret { + border-top-color: #333333; +} +.btn-primary .note-editor .caret, +.btn-success .note-editor .caret, +.btn-warning .note-editor .caret, +.btn-danger .note-editor .caret, +.btn-info .note-editor .caret { + border-top-color: #fff; +} +.note-editor .dropup .btn-default .caret { + border-bottom-color: #333333; +} +.note-editor .dropup .btn-primary .caret, +.note-editor .dropup .btn-success .caret, +.note-editor .dropup .btn-warning .caret, +.note-editor .dropup .btn-danger .caret, +.note-editor .dropup .btn-info .caret { + border-bottom-color: #fff; +} +.note-editor .btn-group, +.note-editor .btn-group-vertical { + position: relative; + display: inline-block; + vertical-align: middle; +} +.note-editor .btn-group > .btn, +.note-editor .btn-group-vertical > .btn { + position: relative; + float: left; +} +.note-editor .btn-group > .btn:hover, +.note-editor .btn-group-vertical > .btn:hover, +.note-editor .btn-group > .btn:focus, +.note-editor .btn-group-vertical > .btn:focus, +.note-editor .btn-group > .btn:active, +.note-editor .btn-group-vertical > .btn:active, +.note-editor .btn-group > .btn.active, +.note-editor .btn-group-vertical > .btn.active { + z-index: 2; +} +.note-editor .btn-group > .btn:focus, +.note-editor .btn-group-vertical > .btn:focus { + outline: none; +} +.note-editor .btn-group .btn + .btn, +.note-editor .btn-group .btn + .btn-group, +.note-editor .btn-group .btn-group + .btn, +.note-editor .btn-group .btn-group + .btn-group { + margin-left: -1px; +} +.note-editor .btn-toolbar:before, +.note-editor .btn-toolbar:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .btn-toolbar:after { + clear: both; +} +.note-editor .btn-toolbar:before, +.note-editor .btn-toolbar:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .btn-toolbar:after { + clear: both; +} +.note-editor .btn-toolbar .btn-group { + float: left; +} +.note-editor .btn-toolbar > .btn + .btn, +.note-editor .btn-toolbar > .btn-group + .btn, +.note-editor .btn-toolbar > .btn + .btn-group, +.note-editor .btn-toolbar > .btn-group + .btn-group { + margin-left: 5px; +} +.note-editor .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { + border-radius: 0; +} +.note-editor .btn-group > .btn:first-child { + margin-left: 0; +} +.note-editor .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.note-editor .btn-group > .btn:last-child:not(:first-child), +.note-editor .btn-group > .dropdown-toggle:not(:first-child) { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.note-editor .btn-group > .btn-group { + float: left; +} +.note-editor .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.note-editor .btn-group > .btn-group:first-child > .btn:last-child, +.note-editor .btn-group > .btn-group:first-child > .dropdown-toggle { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.note-editor .btn-group > .btn-group:last-child > .btn:first-child { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.note-editor .btn-group .dropdown-toggle:active, +.note-editor .btn-group.open .dropdown-toggle { + outline: 0; +} +.note-editor .btn-group-xs > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; + padding: 1px 5px; +} +.note-editor .btn-group-sm > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.note-editor .btn-group-lg > .btn { + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +.note-editor .btn-group > .btn + .dropdown-toggle { + padding-left: 5px; + padding-right: 5px; +} +.note-editor .btn-group > .btn-lg + .dropdown-toggle { + padding-left: 12px; + padding-right: 12px; +} +.note-editor .btn-group.open .dropdown-toggle { + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} +.note-editor .btn .caret { + margin-left: 0; +} +.note-editor .btn-lg .caret { + border-width: 5px 5px 0; + border-bottom-width: 0; +} +.note-editor .dropup .btn-lg .caret { + border-width: 0 5px 5px; +} +.note-editor .btn-group-vertical > .btn, +.note-editor .btn-group-vertical > .btn-group { + display: block; + float: none; + width: 100%; + max-width: 100%; +} +.note-editor .btn-group-vertical > .btn-group:before, +.note-editor .btn-group-vertical > .btn-group:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .btn-group-vertical > .btn-group:after { + clear: both; +} +.note-editor .btn-group-vertical > .btn-group:before, +.note-editor .btn-group-vertical > .btn-group:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .btn-group-vertical > .btn-group:after { + clear: both; +} +.note-editor .btn-group-vertical > .btn-group > .btn { + float: none; +} +.note-editor .btn-group-vertical > .btn + .btn, +.note-editor .btn-group-vertical > .btn + .btn-group, +.note-editor .btn-group-vertical > .btn-group + .btn, +.note-editor .btn-group-vertical > .btn-group + .btn-group { + margin-top: -1px; + margin-left: 0; +} +.note-editor .btn-group-vertical > .btn:not(:first-child):not(:last-child) { + border-radius: 0; +} +.note-editor .btn-group-vertical > .btn:first-child:not(:last-child) { + border-top-right-radius: 4px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.note-editor .btn-group-vertical > .btn:last-child:not(:first-child) { + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.note-editor .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.note-editor .btn-group-vertical > .btn-group:first-child > .btn:last-child, +.note-editor .btn-group-vertical > .btn-group:first-child > .dropdown-toggle { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.note-editor .btn-group-vertical > .btn-group:last-child > .btn:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.note-editor .btn-group-justified { + display: table; + width: 100%; + table-layout: fixed; + border-collapse: separate; +} +.note-editor .btn-group-justified .btn { + float: none; + display: table-cell; + width: 1%; +} +.note-editor [data-toggle="buttons"] > .btn > input[type="radio"], +.note-editor [data-toggle="buttons"] > .btn > input[type="checkbox"] { + display: none; +} +.note-editor .input-group { + position: relative; + display: table; + border-collapse: separate; +} +.note-editor .input-group.col { + float: none; + padding-left: 0; + padding-right: 0; +} +.note-editor .input-group .form-control { + width: 100%; + margin-bottom: 0; +} +.note-editor .input-group-lg > .form-control, +.note-editor .input-group-lg > .input-group-addon, +.note-editor .input-group-lg > .input-group-btn > .btn { + height: 45px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +select.note-editor .input-group-lg > .form-control, +select.note-editor .input-group-lg > .input-group-addon, +select.note-editor .input-group-lg > .input-group-btn > .btn { + height: 45px; + line-height: 45px; +} +textarea.note-editor .input-group-lg > .form-control, +textarea.note-editor .input-group-lg > .input-group-addon, +textarea.note-editor .input-group-lg > .input-group-btn > .btn { + height: auto; +} +.note-editor .input-group-sm > .form-control, +.note-editor .input-group-sm > .input-group-addon, +.note-editor .input-group-sm > .input-group-btn > .btn { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.note-editor .input-group-sm > .form-control, +select.note-editor .input-group-sm > .input-group-addon, +select.note-editor .input-group-sm > .input-group-btn > .btn { + height: 30px; + line-height: 30px; +} +textarea.note-editor .input-group-sm > .form-control, +textarea.note-editor .input-group-sm > .input-group-addon, +textarea.note-editor .input-group-sm > .input-group-btn > .btn { + height: auto; +} +.note-editor .input-group-addon, +.note-editor .input-group-btn, +.note-editor .input-group .form-control { + display: table-cell; +} +.note-editor .input-group-addon:not(:first-child):not(:last-child), +.note-editor .input-group-btn:not(:first-child):not(:last-child), +.note-editor .input-group .form-control:not(:first-child):not(:last-child) { + border-radius: 0; +} +.note-editor .input-group-addon, +.note-editor .input-group-btn { + width: 1%; + white-space: nowrap; + vertical-align: middle; +} +.note-editor .input-group-addon { + padding: 6px 12px; + font-size: 14px; + font-weight: normal; + line-height: 1; + color: #555555; + text-align: center; + background-color: #eeeeee; + border: 1px solid #cccccc; + border-radius: 4px; +} +.note-editor .input-group-addon.input-sm { + padding: 5px 10px; + font-size: 12px; + border-radius: 3px; +} +.note-editor .input-group-addon.input-lg { + padding: 10px 16px; + font-size: 18px; + border-radius: 6px; +} +.note-editor .input-group-addon input[type="radio"], +.note-editor .input-group-addon input[type="checkbox"] { + margin-top: 0; +} +.note-editor .input-group .form-control:first-child, +.note-editor .input-group-addon:first-child, +.note-editor .input-group-btn:first-child > .btn, +.note-editor .input-group-btn:first-child > .dropdown-toggle, +.note-editor .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.note-editor .input-group-addon:first-child { + border-right: 0; +} +.note-editor .input-group .form-control:last-child, +.note-editor .input-group-addon:last-child, +.note-editor .input-group-btn:last-child > .btn, +.note-editor .input-group-btn:last-child > .dropdown-toggle, +.note-editor .input-group-btn:first-child > .btn:not(:first-child) { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.note-editor .input-group-addon:last-child { + border-left: 0; +} +.note-editor .input-group-btn { + position: relative; + white-space: nowrap; +} +.note-editor .input-group-btn:first-child > .btn { + margin-right: -1px; +} +.note-editor .input-group-btn:last-child > .btn { + margin-left: -1px; +} +.note-editor .input-group-btn > .btn { + position: relative; +} +.note-editor .input-group-btn > .btn + .btn { + margin-left: -4px; +} +.note-editor .input-group-btn > .btn:hover, +.note-editor .input-group-btn > .btn:active { + z-index: 2; +} +.note-editor .nav { + margin-bottom: 0; + padding-left: 0; + list-style: none; +} +.note-editor .nav:before, +.note-editor .nav:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .nav:after { + clear: both; +} +.note-editor .nav:before, +.note-editor .nav:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .nav:after { + clear: both; +} +.note-editor .nav > li { + position: relative; + display: block; +} +.note-editor .nav > li > a { + position: relative; + display: block; + padding: 10px 15px; +} +.note-editor .nav > li > a:hover, +.note-editor .nav > li > a:focus { + text-decoration: none; + background-color: #eeeeee; +} +.note-editor .nav > li.disabled > a { + color: #999999; +} +.note-editor .nav > li.disabled > a:hover, +.note-editor .nav > li.disabled > a:focus { + color: #999999; + text-decoration: none; + background-color: transparent; + cursor: not-allowed; +} +.note-editor .nav .open > a, +.note-editor .nav .open > a:hover, +.note-editor .nav .open > a:focus { + background-color: #eeeeee; + border-color: #428bca; +} +.note-editor .nav .open > a .caret, +.note-editor .nav .open > a:hover .caret, +.note-editor .nav .open > a:focus .caret { + border-top-color: #2a6496; + border-bottom-color: #2a6496; +} +.note-editor .nav .nav-divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; +} +.note-editor .nav > li > a > img { + max-width: none; +} +.note-editor .nav-tabs { + border-bottom: 1px solid #dddddd; +} +.note-editor .nav-tabs > li { + float: left; + margin-bottom: -1px; +} +.note-editor .nav-tabs > li > a { + margin-right: 2px; + line-height: 1.428571429; + border: 1px solid transparent; + border-radius: 4px 4px 0 0; +} +.note-editor .nav-tabs > li > a:hover { + border-color: #eeeeee #eeeeee #dddddd; +} +.note-editor .nav-tabs > li.active > a, +.note-editor .nav-tabs > li.active > a:hover, +.note-editor .nav-tabs > li.active > a:focus { + color: #555555; + background-color: #ffffff; + border: 1px solid #dddddd; + border-bottom-color: transparent; + cursor: default; +} +.note-editor .nav-tabs.nav-justified { + width: 100%; + border-bottom: 0; +} +.note-editor .nav-tabs.nav-justified > li { + float: none; +} +.note-editor .nav-tabs.nav-justified > li > a { + text-align: center; + margin-bottom: 5px; +} +@media (min-width: 768px) { + .note-editor .nav-tabs.nav-justified > li { + display: table-cell; + width: 1%; + } + .note-editor .nav-tabs.nav-justified > li > a { + margin-bottom: 0; + } +} +.note-editor .nav-tabs.nav-justified > li > a { + margin-right: 0; + border-radius: 4px; +} +.note-editor .nav-tabs.nav-justified > .active > a, +.note-editor .nav-tabs.nav-justified > .active > a:hover, +.note-editor .nav-tabs.nav-justified > .active > a:focus { + border: 1px solid #dddddd; +} +@media (min-width: 768px) { + .note-editor .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid #dddddd; + border-radius: 4px 4px 0 0; + } + .note-editor .nav-tabs.nav-justified > .active > a, + .note-editor .nav-tabs.nav-justified > .active > a:hover, + .note-editor .nav-tabs.nav-justified > .active > a:focus { + border-bottom-color: #ffffff; + } +} +.note-editor .nav-pills > li { + float: left; +} +.note-editor .nav-pills > li > a { + border-radius: 4px; +} +.note-editor .nav-pills > li + li { + margin-left: 2px; +} +.note-editor .nav-pills > li.active > a, +.note-editor .nav-pills > li.active > a:hover, +.note-editor .nav-pills > li.active > a:focus { + color: #ffffff; + background-color: #428bca; +} +.note-editor .nav-pills > li.active > a .caret, +.note-editor .nav-pills > li.active > a:hover .caret, +.note-editor .nav-pills > li.active > a:focus .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.note-editor .nav-stacked > li { + float: none; +} +.note-editor .nav-stacked > li + li { + margin-top: 2px; + margin-left: 0; +} +.note-editor .nav-justified { + width: 100%; +} +.note-editor .nav-justified > li { + float: none; +} +.note-editor .nav-justified > li > a { + text-align: center; + margin-bottom: 5px; +} +@media (min-width: 768px) { + .note-editor .nav-justified > li { + display: table-cell; + width: 1%; + } + .note-editor .nav-justified > li > a { + margin-bottom: 0; + } +} +.note-editor .nav-tabs-justified { + border-bottom: 0; +} +.note-editor .nav-tabs-justified > li > a { + margin-right: 0; + border-radius: 4px; +} +.note-editor .nav-tabs-justified > .active > a, +.note-editor .nav-tabs-justified > .active > a:hover, +.note-editor .nav-tabs-justified > .active > a:focus { + border: 1px solid #dddddd; +} +@media (min-width: 768px) { + .note-editor .nav-tabs-justified > li > a { + border-bottom: 1px solid #dddddd; + border-radius: 4px 4px 0 0; + } + .note-editor .nav-tabs-justified > .active > a, + .note-editor .nav-tabs-justified > .active > a:hover, + .note-editor .nav-tabs-justified > .active > a:focus { + border-bottom-color: #ffffff; + } +} +.note-editor .tab-content > .tab-pane { + display: none; +} +.note-editor .tab-content > .active { + display: block; +} +.note-editor .nav .caret { + border-top-color: #428bca; + border-bottom-color: #428bca; +} +.note-editor .nav a:hover .caret { + border-top-color: #2a6496; + border-bottom-color: #2a6496; +} +.note-editor .nav-tabs .dropdown-menu { + margin-top: -1px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.note-editor .navbar { + position: relative; + z-index: 1000; + min-height: 50px; + margin-bottom: 20px; + border: 1px solid transparent; +} +.note-editor .navbar:before, +.note-editor .navbar:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .navbar:after { + clear: both; +} +.note-editor .navbar:before, +.note-editor .navbar:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .navbar:after { + clear: both; +} +@media (min-width: 768px) { + .note-editor .navbar { + border-radius: 4px; + } +} +.note-editor .navbar-header:before, +.note-editor .navbar-header:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .navbar-header:after { + clear: both; +} +.note-editor .navbar-header:before, +.note-editor .navbar-header:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .navbar-header:after { + clear: both; +} +@media (min-width: 768px) { + .note-editor .navbar-header { + float: left; + } +} +.note-editor .navbar-collapse { + max-height: 340px; + overflow-x: visible; + padding-right: 15px; + padding-left: 15px; + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); + -webkit-overflow-scrolling: touch; +} +.note-editor .navbar-collapse:before, +.note-editor .navbar-collapse:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .navbar-collapse:after { + clear: both; +} +.note-editor .navbar-collapse:before, +.note-editor .navbar-collapse:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .navbar-collapse:after { + clear: both; +} +.note-editor .navbar-collapse.in { + overflow-y: auto; +} +@media (min-width: 768px) { + .note-editor .navbar-collapse { + width: auto; + border-top: 0; + box-shadow: none; + } + .note-editor .navbar-collapse.collapse { + display: block !important; + height: auto !important; + padding-bottom: 0; + overflow: visible !important; + } + .note-editor .navbar-collapse.in { + overflow-y: visible; + } + .note-editor .navbar-collapse .navbar-nav.navbar-left:first-child { + margin-left: -15px; + } + .note-editor .navbar-collapse .navbar-nav.navbar-right:last-child { + margin-right: -15px; + } + .note-editor .navbar-collapse .navbar-text:last-child { + margin-right: 0; + } +} +.note-editor .container > .navbar-header, +.note-editor .container > .navbar-collapse { + margin-right: -15px; + margin-left: -15px; +} +@media (min-width: 768px) { + .note-editor .container > .navbar-header, + .note-editor .container > .navbar-collapse { + margin-right: 0; + margin-left: 0; + } +} +.note-editor .navbar-static-top { + border-width: 0 0 1px; +} +@media (min-width: 768px) { + .note-editor .navbar-static-top { + border-radius: 0; + } +} +.note-editor .navbar-fixed-top, +.note-editor .navbar-fixed-bottom { + position: fixed; + right: 0; + left: 0; + border-width: 0 0 1px; +} +@media (min-width: 768px) { + .note-editor .navbar-fixed-top, + .note-editor .navbar-fixed-bottom { + border-radius: 0; + } +} +.note-editor .navbar-fixed-top { + z-index: 1030; + top: 0; +} +.note-editor .navbar-fixed-bottom { + bottom: 0; + margin-bottom: 0; +} +.note-editor .navbar-brand { + float: left; + padding: 15px 15px; + font-size: 18px; + line-height: 20px; +} +.note-editor .navbar-brand:hover, +.note-editor .navbar-brand:focus { + text-decoration: none; +} +@media (min-width: 768px) { + .navbar > .container .note-editor .navbar-brand { + margin-left: -15px; + } +} +.note-editor .navbar-toggle { + position: relative; + float: right; + margin-right: 15px; + padding: 9px 10px; + margin-top: 8px; + margin-bottom: 8px; + background-color: transparent; + border: 1px solid transparent; + border-radius: 4px; +} +.note-editor .navbar-toggle .icon-bar { + display: block; + width: 22px; + height: 2px; + border-radius: 1px; +} +.note-editor .navbar-toggle .icon-bar + .icon-bar { + margin-top: 4px; +} +@media (min-width: 768px) { + .note-editor .navbar-toggle { + display: none; + } +} +.note-editor .navbar-nav { + margin: 7.5px -15px; +} +.note-editor .navbar-nav > li > a { + padding-top: 10px; + padding-bottom: 10px; + line-height: 20px; +} +@media (max-width: 767px) { + .note-editor .navbar-nav .open .dropdown-menu { + position: static; + float: none; + width: auto; + margin-top: 0; + background-color: transparent; + border: 0; + box-shadow: none; + } + .note-editor .navbar-nav .open .dropdown-menu > li > a, + .note-editor .navbar-nav .open .dropdown-menu .dropdown-header { + padding: 5px 15px 5px 25px; + } + .note-editor .navbar-nav .open .dropdown-menu > li > a { + line-height: 20px; + } + .note-editor .navbar-nav .open .dropdown-menu > li > a:hover, + .note-editor .navbar-nav .open .dropdown-menu > li > a:focus { + background-image: none; + } +} +@media (min-width: 768px) { + .note-editor .navbar-nav { + float: left; + margin: 0; + } + .note-editor .navbar-nav > li { + float: left; + } + .note-editor .navbar-nav > li > a { + padding-top: 15px; + padding-bottom: 15px; + } +} +@media (min-width: 768px) { + .note-editor .navbar-left { + float: left !important; + } + .note-editor .navbar-right { + float: right !important; + } +} +.note-editor .navbar-form { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + margin-top: 8px; + margin-bottom: 8px; +} +@media (min-width: 768px) { + .note-editor .navbar-form .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; + } + .note-editor .navbar-form .form-control { + display: inline-block; + } + .note-editor .navbar-form .radio, + .note-editor .navbar-form .checkbox { + display: inline-block; + margin-top: 0; + margin-bottom: 0; + padding-left: 0; + } + .note-editor .navbar-form .radio input[type="radio"], + .note-editor .navbar-form .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; + } +} +@media (max-width: 767px) { + .note-editor .navbar-form .form-group { + margin-bottom: 5px; + } +} +@media (min-width: 768px) { + .note-editor .navbar-form { + width: auto; + border: 0; + margin-left: 0; + margin-right: 0; + padding-top: 0; + padding-bottom: 0; + -webkit-box-shadow: none; + box-shadow: none; + } +} +.note-editor .navbar-nav > li > .dropdown-menu { + margin-top: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.note-editor .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.note-editor .navbar-nav.pull-right > li > .dropdown-menu, +.note-editor .navbar-nav > li > .dropdown-menu.pull-right { + left: auto; + right: 0; +} +.note-editor .navbar-btn { + margin-top: 8px; + margin-bottom: 8px; +} +.note-editor .navbar-text { + float: left; + margin-top: 15px; + margin-bottom: 15px; +} +@media (min-width: 768px) { + .note-editor .navbar-text { + margin-left: 15px; + margin-right: 15px; + } +} +.note-editor .navbar-default { + background-color: #f8f8f8; + border-color: #e7e7e7; +} +.note-editor .navbar-default .navbar-brand { + color: #777777; +} +.note-editor .navbar-default .navbar-brand:hover, +.note-editor .navbar-default .navbar-brand:focus { + color: #5e5e5e; + background-color: transparent; +} +.note-editor .navbar-default .navbar-text { + color: #777777; +} +.note-editor .navbar-default .navbar-nav > li > a { + color: #777777; +} +.note-editor .navbar-default .navbar-nav > li > a:hover, +.note-editor .navbar-default .navbar-nav > li > a:focus { + color: #333333; + background-color: transparent; +} +.note-editor .navbar-default .navbar-nav > .active > a, +.note-editor .navbar-default .navbar-nav > .active > a:hover, +.note-editor .navbar-default .navbar-nav > .active > a:focus { + color: #555555; + background-color: #e7e7e7; +} +.note-editor .navbar-default .navbar-nav > .disabled > a, +.note-editor .navbar-default .navbar-nav > .disabled > a:hover, +.note-editor .navbar-default .navbar-nav > .disabled > a:focus { + color: #cccccc; + background-color: transparent; +} +.note-editor .navbar-default .navbar-toggle { + border-color: #dddddd; +} +.note-editor .navbar-default .navbar-toggle:hover, +.note-editor .navbar-default .navbar-toggle:focus { + background-color: #dddddd; +} +.note-editor .navbar-default .navbar-toggle .icon-bar { + background-color: #cccccc; +} +.note-editor .navbar-default .navbar-collapse, +.note-editor .navbar-default .navbar-form { + border-color: #e7e7e7; +} +.note-editor .navbar-default .navbar-nav > .dropdown > a:hover .caret, +.note-editor .navbar-default .navbar-nav > .dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; +} +.note-editor .navbar-default .navbar-nav > .open > a, +.note-editor .navbar-default .navbar-nav > .open > a:hover, +.note-editor .navbar-default .navbar-nav > .open > a:focus { + background-color: #e7e7e7; + color: #555555; +} +.note-editor .navbar-default .navbar-nav > .open > a .caret, +.note-editor .navbar-default .navbar-nav > .open > a:hover .caret, +.note-editor .navbar-default .navbar-nav > .open > a:focus .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.note-editor .navbar-default .navbar-nav > .dropdown > a .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +@media (max-width: 767px) { + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #777777; + } + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { + color: #333333; + background-color: transparent; + } + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > .active > a, + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #555555; + background-color: #e7e7e7; + } + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .note-editor .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #cccccc; + background-color: transparent; + } +} +.note-editor .navbar-default .navbar-link { + color: #777777; +} +.note-editor .navbar-default .navbar-link:hover { + color: #333333; +} +.note-editor .navbar-inverse { + background-color: #222222; + border-color: #080808; +} +.note-editor .navbar-inverse .navbar-brand { + color: #999999; +} +.note-editor .navbar-inverse .navbar-brand:hover, +.note-editor .navbar-inverse .navbar-brand:focus { + color: #ffffff; + background-color: transparent; +} +.note-editor .navbar-inverse .navbar-text { + color: #999999; +} +.note-editor .navbar-inverse .navbar-nav > li > a { + color: #999999; +} +.note-editor .navbar-inverse .navbar-nav > li > a:hover, +.note-editor .navbar-inverse .navbar-nav > li > a:focus { + color: #ffffff; + background-color: transparent; +} +.note-editor .navbar-inverse .navbar-nav > .active > a, +.note-editor .navbar-inverse .navbar-nav > .active > a:hover, +.note-editor .navbar-inverse .navbar-nav > .active > a:focus { + color: #ffffff; + background-color: #080808; +} +.note-editor .navbar-inverse .navbar-nav > .disabled > a, +.note-editor .navbar-inverse .navbar-nav > .disabled > a:hover, +.note-editor .navbar-inverse .navbar-nav > .disabled > a:focus { + color: #444444; + background-color: transparent; +} +.note-editor .navbar-inverse .navbar-toggle { + border-color: #333333; +} +.note-editor .navbar-inverse .navbar-toggle:hover, +.note-editor .navbar-inverse .navbar-toggle:focus { + background-color: #333333; +} +.note-editor .navbar-inverse .navbar-toggle .icon-bar { + background-color: #ffffff; +} +.note-editor .navbar-inverse .navbar-collapse, +.note-editor .navbar-inverse .navbar-form { + border-color: #101010; +} +.note-editor .navbar-inverse .navbar-nav > .open > a, +.note-editor .navbar-inverse .navbar-nav > .open > a:hover, +.note-editor .navbar-inverse .navbar-nav > .open > a:focus { + background-color: #080808; + color: #ffffff; +} +.note-editor .navbar-inverse .navbar-nav > .dropdown > a:hover .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.note-editor .navbar-inverse .navbar-nav > .dropdown > a .caret { + border-top-color: #999999; + border-bottom-color: #999999; +} +.note-editor .navbar-inverse .navbar-nav > .open > a .caret, +.note-editor .navbar-inverse .navbar-nav > .open > a:hover .caret, +.note-editor .navbar-inverse .navbar-nav > .open > a:focus .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +@media (max-width: 767px) { + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { + border-color: #080808; + } + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { + color: #999999; + } + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { + color: #ffffff; + background-color: transparent; + } + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { + color: #ffffff; + background-color: #080808; + } + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, + .note-editor .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { + color: #444444; + background-color: transparent; + } +} +.note-editor .navbar-inverse .navbar-link { + color: #999999; +} +.note-editor .navbar-inverse .navbar-link:hover { + color: #ffffff; +} +.note-editor .breadcrumb { + padding: 8px 15px; + margin-bottom: 20px; + list-style: none; + background-color: #f5f5f5; + border-radius: 4px; +} +.note-editor .breadcrumb > li { + display: inline-block; +} +.note-editor .breadcrumb > li + li:before { + content: "/\00a0"; + padding: 0 5px; + color: #cccccc; +} +.note-editor .breadcrumb > .active { + color: #999999; +} +.note-editor .pagination { + display: inline-block; + padding-left: 0; + margin: 20px 0; + border-radius: 4px; +} +.note-editor .pagination > li { + display: inline; +} +.note-editor .pagination > li > a, +.note-editor .pagination > li > span { + position: relative; + float: left; + padding: 6px 12px; + line-height: 1.428571429; + text-decoration: none; + background-color: #ffffff; + border: 1px solid #dddddd; + margin-left: -1px; +} +.note-editor .pagination > li:first-child > a, +.note-editor .pagination > li:first-child > span { + margin-left: 0; + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; +} +.note-editor .pagination > li:last-child > a, +.note-editor .pagination > li:last-child > span { + border-bottom-right-radius: 4px; + border-top-right-radius: 4px; +} +.note-editor .pagination > li > a:hover, +.note-editor .pagination > li > span:hover, +.note-editor .pagination > li > a:focus, +.note-editor .pagination > li > span:focus { + background-color: #eeeeee; +} +.note-editor .pagination > .active > a, +.note-editor .pagination > .active > span, +.note-editor .pagination > .active > a:hover, +.note-editor .pagination > .active > span:hover, +.note-editor .pagination > .active > a:focus, +.note-editor .pagination > .active > span:focus { + z-index: 2; + color: #ffffff; + background-color: #428bca; + border-color: #428bca; + cursor: default; +} +.note-editor .pagination > .disabled > span, +.note-editor .pagination > .disabled > span:hover, +.note-editor .pagination > .disabled > span:focus, +.note-editor .pagination > .disabled > a, +.note-editor .pagination > .disabled > a:hover, +.note-editor .pagination > .disabled > a:focus { + color: #999999; + background-color: #ffffff; + border-color: #dddddd; + cursor: not-allowed; +} +.note-editor .pagination-lg > li > a, +.note-editor .pagination-lg > li > span { + padding: 10px 16px; + font-size: 18px; +} +.note-editor .pagination-lg > li:first-child > a, +.note-editor .pagination-lg > li:first-child > span { + border-bottom-left-radius: 6px; + border-top-left-radius: 6px; +} +.note-editor .pagination-lg > li:last-child > a, +.note-editor .pagination-lg > li:last-child > span { + border-bottom-right-radius: 6px; + border-top-right-radius: 6px; +} +.note-editor .pagination-sm > li > a, +.note-editor .pagination-sm > li > span { + padding: 5px 10px; + font-size: 12px; +} +.note-editor .pagination-sm > li:first-child > a, +.note-editor .pagination-sm > li:first-child > span { + border-bottom-left-radius: 3px; + border-top-left-radius: 3px; +} +.note-editor .pagination-sm > li:last-child > a, +.note-editor .pagination-sm > li:last-child > span { + border-bottom-right-radius: 3px; + border-top-right-radius: 3px; +} +.note-editor .pager { + padding-left: 0; + margin: 20px 0; + list-style: none; + text-align: center; +} +.note-editor .pager:before, +.note-editor .pager:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .pager:after { + clear: both; +} +.note-editor .pager:before, +.note-editor .pager:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .pager:after { + clear: both; +} +.note-editor .pager li { + display: inline; +} +.note-editor .pager li > a, +.note-editor .pager li > span { + display: inline-block; + padding: 5px 14px; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 15px; +} +.note-editor .pager li > a:hover, +.note-editor .pager li > a:focus { + text-decoration: none; + background-color: #eeeeee; +} +.note-editor .pager .next > a, +.note-editor .pager .next > span { + float: right; +} +.note-editor .pager .previous > a, +.note-editor .pager .previous > span { + float: left; +} +.note-editor .pager .disabled > a, +.note-editor .pager .disabled > a:hover, +.note-editor .pager .disabled > a:focus, +.note-editor .pager .disabled > span { + color: #999999; + background-color: #ffffff; + cursor: not-allowed; +} +.note-editor .label { + display: inline; + padding: .2em .6em .3em; + font-size: 75%; + font-weight: bold; + line-height: 1; + color: #ffffff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25em; +} +.note-editor .label[href]:hover, +.note-editor .label[href]:focus { + color: #ffffff; + text-decoration: none; + cursor: pointer; +} +.note-editor .label:empty { + display: none; +} +.note-editor .label-default { + background-color: #999999; +} +.note-editor .label-default[href]:hover, +.note-editor .label-default[href]:focus { + background-color: #808080; +} +.note-editor .label-primary { + background-color: #428bca; +} +.note-editor .label-primary[href]:hover, +.note-editor .label-primary[href]:focus { + background-color: #3071a9; +} +.note-editor .label-success { + background-color: #5cb85c; +} +.note-editor .label-success[href]:hover, +.note-editor .label-success[href]:focus { + background-color: #449d44; +} +.note-editor .label-info { + background-color: #5bc0de; +} +.note-editor .label-info[href]:hover, +.note-editor .label-info[href]:focus { + background-color: #31b0d5; +} +.note-editor .label-warning { + background-color: #f0ad4e; +} +.note-editor .label-warning[href]:hover, +.note-editor .label-warning[href]:focus { + background-color: #ec971f; +} +.note-editor .label-danger { + background-color: #d9534f; +} +.note-editor .label-danger[href]:hover, +.note-editor .label-danger[href]:focus { + background-color: #c9302c; +} +.note-editor .badge { + display: inline-block; + min-width: 10px; + padding: 3px 7px; + font-size: 12px; + font-weight: bold; + color: #ffffff; + line-height: 1; + vertical-align: baseline; + white-space: nowrap; + text-align: center; + background-color: #999999; + border-radius: 10px; +} +.note-editor .badge:empty { + display: none; +} +.note-editor a.badge:hover, +.note-editor a.badge:focus { + color: #ffffff; + text-decoration: none; + cursor: pointer; +} +.note-editor .btn .badge { + position: relative; + top: -1px; +} +.note-editor a.list-group-item.active > .badge, +.note-editor .nav-pills > .active > a > .badge { + color: #428bca; + background-color: #ffffff; +} +.note-editor .nav-pills > li > a > .badge { + margin-left: 3px; +} +.note-editor .jumbotron { + padding: 30px; + margin-bottom: 30px; + font-size: 21px; + font-weight: 200; + line-height: 2.1428571435; + color: inherit; + background-color: #eeeeee; +} +.note-editor .jumbotron h1 { + line-height: 1; + color: inherit; +} +.note-editor .jumbotron p { + line-height: 1.4; +} +.container .note-editor .jumbotron { + border-radius: 6px; +} +@media screen and (min-width: 768px) { + .note-editor .jumbotron { + padding-top: 48px; + padding-bottom: 48px; + } + .container .note-editor .jumbotron { + padding-left: 60px; + padding-right: 60px; + } + .note-editor .jumbotron h1 { + font-size: 63px; + } +} +.note-editor .thumbnail { + padding: 4px; + line-height: 1.428571429; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 4px; + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + display: inline-block; + max-width: 100%; + height: auto; + display: block; + margin-bottom: 20px; +} +.note-editor .thumbnail > img { + display: block; + max-width: 100%; + height: auto; +} +.note-editor a.thumbnail:hover, +.note-editor a.thumbnail:focus, +.note-editor a.thumbnail.active { + border-color: #428bca; +} +.note-editor .thumbnail > img { + margin-left: auto; + margin-right: auto; +} +.note-editor .thumbnail .caption { + padding: 9px; + color: #333333; +} +.note-editor .alert { + padding: 15px; + margin-bottom: 20px; + border: 1px solid transparent; + border-radius: 4px; +} +.note-editor .alert h4 { + margin-top: 0; + color: inherit; +} +.note-editor .alert .alert-link { + font-weight: bold; +} +.note-editor .alert > p, +.note-editor .alert > ul { + margin-bottom: 0; +} +.note-editor .alert > p + p { + margin-top: 5px; +} +.note-editor .alert-dismissable { + padding-right: 35px; +} +.note-editor .alert-dismissable .close { + position: relative; + top: -2px; + right: -21px; + color: inherit; +} +.note-editor .alert-success { + background-color: #dff0d8; + border-color: #d6e9c6; + color: #468847; +} +.note-editor .alert-success hr { + border-top-color: #c9e2b3; +} +.note-editor .alert-success .alert-link { + color: #356635; +} +.note-editor .alert-info { + background-color: #d9edf7; + border-color: #bce8f1; + color: #3a87ad; +} +.note-editor .alert-info hr { + border-top-color: #a6e1ec; +} +.note-editor .alert-info .alert-link { + color: #2d6987; +} +.note-editor .alert-warning { + background-color: #fcf8e3; + border-color: #faebcc; + color: #c09853; +} +.note-editor .alert-warning hr { + border-top-color: #f7e1b5; +} +.note-editor .alert-warning .alert-link { + color: #a47e3c; +} +.note-editor .alert-danger { + background-color: #f2dede; + border-color: #ebccd1; + color: #b94a48; +} +.note-editor .alert-danger hr { + border-top-color: #e4b9c0; +} +.note-editor .alert-danger .alert-link { + color: #953b39; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +@-moz-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +@-o-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +@keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} +.note-editor .progress { + overflow: hidden; + height: 20px; + margin-bottom: 20px; + background-color: #f5f5f5; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); +} +.note-editor .progress-bar { + float: left; + width: 0%; + height: 100%; + font-size: 12px; + line-height: 20px; + color: #ffffff; + text-align: center; + background-color: #428bca; + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-transition: width 0.6s ease; + transition: width 0.6s ease; +} +.note-editor .progress-striped .progress-bar { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-size: 40px 40px; +} +.note-editor .progress.active .progress-bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + -ms-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} +.note-editor .progress-bar-success { + background-color: #5cb85c; +} +.progress-striped .note-editor .progress-bar-success { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.note-editor .progress-bar-info { + background-color: #5bc0de; +} +.progress-striped .note-editor .progress-bar-info { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.note-editor .progress-bar-warning { + background-color: #f0ad4e; +} +.progress-striped .note-editor .progress-bar-warning { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.note-editor .progress-bar-danger { + background-color: #d9534f; +} +.progress-striped .note-editor .progress-bar-danger { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.note-editor .media, +.note-editor .media-body { + overflow: hidden; + zoom: 1; +} +.note-editor .media, +.note-editor .media .media { + margin-top: 15px; +} +.note-editor .media:first-child { + margin-top: 0; +} +.note-editor .media-object { + display: block; +} +.note-editor .media-heading { + margin: 0 0 5px; +} +.note-editor .media > .pull-left { + margin-right: 10px; +} +.note-editor .media > .pull-right { + margin-left: 10px; +} +.note-editor .media-list { + padding-left: 0; + list-style: none; +} +.note-editor .list-group { + margin-bottom: 20px; + padding-left: 0; +} +.note-editor .list-group-item { + position: relative; + display: block; + padding: 10px 15px; + margin-bottom: -1px; + background-color: #ffffff; + border: 1px solid #dddddd; +} +.note-editor .list-group-item:first-child { + border-top-right-radius: 4px; + border-top-left-radius: 4px; +} +.note-editor .list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; +} +.note-editor .list-group-item > .badge { + float: right; +} +.note-editor .list-group-item > .badge + .badge { + margin-right: 5px; +} +.note-editor a.list-group-item { + color: #555555; +} +.note-editor a.list-group-item .list-group-item-heading { + color: #333333; +} +.note-editor a.list-group-item:hover, +.note-editor a.list-group-item:focus { + text-decoration: none; + background-color: #f5f5f5; +} +.note-editor a.list-group-item.active, +.note-editor a.list-group-item.active:hover, +.note-editor a.list-group-item.active:focus { + z-index: 2; + color: #ffffff; + background-color: #428bca; + border-color: #428bca; +} +.note-editor a.list-group-item.active .list-group-item-heading, +.note-editor a.list-group-item.active:hover .list-group-item-heading, +.note-editor a.list-group-item.active:focus .list-group-item-heading { + color: inherit; +} +.note-editor a.list-group-item.active .list-group-item-text, +.note-editor a.list-group-item.active:hover .list-group-item-text, +.note-editor a.list-group-item.active:focus .list-group-item-text { + color: #e1edf7; +} +.note-editor .list-group-item-heading { + margin-top: 0; + margin-bottom: 5px; +} +.note-editor .list-group-item-text { + margin-bottom: 0; + line-height: 1.3; +} +.note-editor .panel { + margin-bottom: 20px; + background-color: #ffffff; + border: 1px solid transparent; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); +} +.note-editor .panel-body { + padding: 15px; +} +.note-editor .panel-body:before, +.note-editor .panel-body:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .panel-body:after { + clear: both; +} +.note-editor .panel-body:before, +.note-editor .panel-body:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.note-editor .panel-body:after { + clear: both; +} +.note-editor .panel > .list-group { + margin-bottom: 0; +} +.note-editor .panel > .list-group .list-group-item { + border-width: 1px 0; +} +.note-editor .panel > .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.note-editor .panel > .list-group .list-group-item:last-child { + border-bottom: 0; +} +.note-editor .panel-heading + .list-group .list-group-item:first-child { + border-top-width: 0; +} +.note-editor .panel > .table, +.note-editor .panel > .table-responsive { + margin-bottom: 0; +} +.note-editor .panel > .panel-body + .table, +.note-editor .panel > .panel-body + .table-responsive { + border-top: 1px solid #dddddd; +} +.note-editor .panel > .table-bordered, +.note-editor .panel > .table-responsive > .table-bordered { + border: 0; +} +.note-editor .panel > .table-bordered > thead > tr > th:first-child, +.note-editor .panel > .table-responsive > .table-bordered > thead > tr > th:first-child, +.note-editor .panel > .table-bordered > tbody > tr > th:first-child, +.note-editor .panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, +.note-editor .panel > .table-bordered > tfoot > tr > th:first-child, +.note-editor .panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, +.note-editor .panel > .table-bordered > thead > tr > td:first-child, +.note-editor .panel > .table-responsive > .table-bordered > thead > tr > td:first-child, +.note-editor .panel > .table-bordered > tbody > tr > td:first-child, +.note-editor .panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, +.note-editor .panel > .table-bordered > tfoot > tr > td:first-child, +.note-editor .panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { + border-left: 0; +} +.note-editor .panel > .table-bordered > thead > tr > th:last-child, +.note-editor .panel > .table-responsive > .table-bordered > thead > tr > th:last-child, +.note-editor .panel > .table-bordered > tbody > tr > th:last-child, +.note-editor .panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, +.note-editor .panel > .table-bordered > tfoot > tr > th:last-child, +.note-editor .panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, +.note-editor .panel > .table-bordered > thead > tr > td:last-child, +.note-editor .panel > .table-responsive > .table-bordered > thead > tr > td:last-child, +.note-editor .panel > .table-bordered > tbody > tr > td:last-child, +.note-editor .panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, +.note-editor .panel > .table-bordered > tfoot > tr > td:last-child, +.note-editor .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { + border-right: 0; +} +.note-editor .panel > .table-bordered > thead > tr:last-child > th, +.note-editor .panel > .table-responsive > .table-bordered > thead > tr:last-child > th, +.note-editor .panel > .table-bordered > tbody > tr:last-child > th, +.note-editor .panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, +.note-editor .panel > .table-bordered > tfoot > tr:last-child > th, +.note-editor .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th, +.note-editor .panel > .table-bordered > thead > tr:last-child > td, +.note-editor .panel > .table-responsive > .table-bordered > thead > tr:last-child > td, +.note-editor .panel > .table-bordered > tbody > tr:last-child > td, +.note-editor .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, +.note-editor .panel > .table-bordered > tfoot > tr:last-child > td, +.note-editor .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td { + border-bottom: 0; +} +.note-editor .panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} +.note-editor .panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: 16px; +} +.note-editor .panel-title > a { + color: inherit; +} +.note-editor .panel-footer { + padding: 10px 15px; + background-color: #f5f5f5; + border-top: 1px solid #dddddd; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} +.note-editor .panel-group .panel { + margin-bottom: 0; + border-radius: 4px; + overflow: hidden; +} +.note-editor .panel-group .panel + .panel { + margin-top: 5px; +} +.note-editor .panel-group .panel-heading { + border-bottom: 0; +} +.note-editor .panel-group .panel-heading + .panel-collapse .panel-body { + border-top: 1px solid #dddddd; +} +.note-editor .panel-group .panel-footer { + border-top: 0; +} +.note-editor .panel-group .panel-footer + .panel-collapse .panel-body { + border-bottom: 1px solid #dddddd; +} +.note-editor .panel-default { + border-color: #dddddd; +} +.note-editor .panel-default > .panel-heading { + color: #333333; + background-color: #f5f5f5; + border-color: #dddddd; +} +.note-editor .panel-default > .panel-heading + .panel-collapse .panel-body { + border-top-color: #dddddd; +} +.note-editor .panel-default > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #dddddd; +} +.note-editor .panel-primary { + border-color: #428bca; +} +.note-editor .panel-primary > .panel-heading { + color: #ffffff; + background-color: #428bca; + border-color: #428bca; +} +.note-editor .panel-primary > .panel-heading + .panel-collapse .panel-body { + border-top-color: #428bca; +} +.note-editor .panel-primary > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #428bca; +} +.note-editor .panel-success { + border-color: #d6e9c6; +} +.note-editor .panel-success > .panel-heading { + color: #468847; + background-color: #dff0d8; + border-color: #d6e9c6; +} +.note-editor .panel-success > .panel-heading + .panel-collapse .panel-body { + border-top-color: #d6e9c6; +} +.note-editor .panel-success > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #d6e9c6; +} +.note-editor .panel-warning { + border-color: #faebcc; +} +.note-editor .panel-warning > .panel-heading { + color: #c09853; + background-color: #fcf8e3; + border-color: #faebcc; +} +.note-editor .panel-warning > .panel-heading + .panel-collapse .panel-body { + border-top-color: #faebcc; +} +.note-editor .panel-warning > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #faebcc; +} +.note-editor .panel-danger { + border-color: #ebccd1; +} +.note-editor .panel-danger > .panel-heading { + color: #b94a48; + background-color: #f2dede; + border-color: #ebccd1; +} +.note-editor .panel-danger > .panel-heading + .panel-collapse .panel-body { + border-top-color: #ebccd1; +} +.note-editor .panel-danger > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #ebccd1; +} +.note-editor .panel-info { + border-color: #bce8f1; +} +.note-editor .panel-info > .panel-heading { + color: #3a87ad; + background-color: #d9edf7; + border-color: #bce8f1; +} +.note-editor .panel-info > .panel-heading + .panel-collapse .panel-body { + border-top-color: #bce8f1; +} +.note-editor .panel-info > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #bce8f1; +} +.note-editor .well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.note-editor .well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.note-editor .well-lg { + padding: 24px; + border-radius: 6px; +} +.note-editor .well-sm { + padding: 9px; + border-radius: 3px; +} +.note-editor .close { + float: right; + font-size: 21px; + font-weight: bold; + line-height: 1; + color: #000000; + text-shadow: 0 1px 0 #ffffff; + opacity: 0.2; + filter: alpha(opacity=20); +} +.note-editor .close:hover, +.note-editor .close:focus { + color: #000000; + text-decoration: none; + cursor: pointer; + opacity: 0.5; + filter: alpha(opacity=50); +} +button.note-editor .close { + padding: 0; + cursor: pointer; + background: transparent; + border: 0; + -webkit-appearance: none; +} +.modal-open { + overflow: hidden; +} +.modal { + display: none; + overflow: auto; + overflow-y: scroll; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; +} +.modal.fade .modal-dialog { + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + transform: translate(0, -25%); + -webkit-transition: -webkit-transform 0.3s ease-out; + -moz-transition: -moz-transform 0.3s ease-out; + -o-transition: -o-transform 0.3s ease-out; + transition: transform 0.3s ease-out; +} +.modal.in .modal-dialog { + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); +} +.modal-dialog { + margin-left: auto; + margin-right: auto; + width: auto; + padding: 10px; + z-index: 1050; +} +.modal-content { + position: relative; + background-color: #ffffff; + border: 1px solid #999999; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + background-clip: padding-box; + outline: none; +} +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1030; + background-color: #000000; +} +.modal-backdrop.fade { + opacity: 0; + filter: alpha(opacity=0); +} +.modal-backdrop.in { + opacity: 0.5; + filter: alpha(opacity=50); +} +.modal-header { + padding: 15px; + border-bottom: 1px solid #e5e5e5; + min-height: 16.428571429px; +} +.modal-header .close { + margin-top: -2px; +} +.modal-title { + margin: 0; + line-height: 1.428571429; +} +.modal-body { + position: relative; + padding: 20px; +} +.modal-footer { + margin-top: 15px; + padding: 19px 20px 20px; + text-align: right; + border-top: 1px solid #e5e5e5; +} +.modal-footer:before, +.modal-footer:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.modal-footer:after { + clear: both; +} +.modal-footer:before, +.modal-footer:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.modal-footer:after { + clear: both; +} +.modal-footer .btn + .btn { + margin-left: 5px; + margin-bottom: 0; +} +.modal-footer .btn-group .btn + .btn { + margin-left: -1px; +} +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} +@media screen and (min-width: 768px) { + .modal-dialog { + width: 600px; + padding-top: 30px; + padding-bottom: 30px; + } + .modal-content { + -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); + } +} +.tooltip { + position: absolute; + z-index: 1030; + display: block; + visibility: visible; + font-size: 12px; + line-height: 1.4; + opacity: 0; + filter: alpha(opacity=0); +} +.tooltip.in { + opacity: 0.9; + filter: alpha(opacity=90); +} +.tooltip.top { + margin-top: -3px; + padding: 5px 0; +} +.tooltip.right { + margin-left: 3px; + padding: 0 5px; +} +.tooltip.bottom { + margin-top: 3px; + padding: 5px 0; +} +.tooltip.left { + margin-left: -3px; + padding: 0 5px; +} +.tooltip-inner { + max-width: 200px; + padding: 3px 8px; + color: #ffffff; + text-align: center; + text-decoration: none; + background-color: #000000; + border-radius: 4px; +} +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.tooltip.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-width: 5px 5px 0; + border-top-color: #000000; +} +.tooltip.top-left .tooltip-arrow { + bottom: 0; + left: 5px; + border-width: 5px 5px 0; + border-top-color: #000000; +} +.tooltip.top-right .tooltip-arrow { + bottom: 0; + right: 5px; + border-width: 5px 5px 0; + border-top-color: #000000; +} +.tooltip.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-width: 5px 5px 5px 0; + border-right-color: #000000; +} +.tooltip.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-width: 5px 0 5px 5px; + border-left-color: #000000; +} +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; +} +.tooltip.bottom-left .tooltip-arrow { + top: 0; + left: 5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; +} +.tooltip.bottom-right .tooltip-arrow { + top: 0; + right: 5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; +} +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; + display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + background-clip: padding-box; + border: 1px solid #cccccc; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; +} +.popover.top { + margin-top: -10px; +} +.popover.right { + margin-left: 10px; +} +.popover.bottom { + margin-top: 10px; +} +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; + font-weight: normal; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + border-radius: 5px 5px 0 0; +} +.popover-content { + padding: 9px 14px; +} +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.popover .arrow { + border-width: 11px; +} +.popover .arrow:after { + border-width: 10px; + content: ""; +} +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + content: " "; + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; +} +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999999; + border-right-color: rgba(0, 0, 0, 0.25); +} +.popover.right .arrow:after { + content: " "; + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; +} +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; +} +.popover.bottom .arrow:after { + content: " "; + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; +} +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999999; + border-left-color: rgba(0, 0, 0, 0.25); +} +.popover.left .arrow:after { + content: " "; + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; +} +.carousel { + position: relative; +} +.carousel-inner { + position: relative; + overflow: hidden; + width: 100%; +} +.carousel-inner > .item { + display: none; + position: relative; + -webkit-transition: 0.6s ease-in-out left; + transition: 0.6s ease-in-out left; +} +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { + display: block; + max-width: 100%; + height: auto; + line-height: 1; +} +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { + display: block; +} +.carousel-inner > .active { + left: 0; +} +.carousel-inner > .next, +.carousel-inner > .prev { + position: absolute; + top: 0; + width: 100%; +} +.carousel-inner > .next { + left: 100%; +} +.carousel-inner > .prev { + left: -100%; +} +.carousel-inner > .next.left, +.carousel-inner > .prev.right { + left: 0; +} +.carousel-inner > .active.left { + left: -100%; +} +.carousel-inner > .active.right { + left: 100%; +} +.carousel-control { + position: absolute; + top: 0; + left: 0; + bottom: 0; + width: 15%; + opacity: 0.5; + filter: alpha(opacity=50); + font-size: 20px; + color: #ffffff; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); +} +.carousel-control.left { + background-image: -webkit-gradient(linear, 0% top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); + background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0%), color-stop(rgba(0, 0, 0, 0.0001) 100%)); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); +} +.carousel-control.right { + left: auto; + right: 0; + background-image: -webkit-gradient(linear, 0% top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); + background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0%), color-stop(rgba(0, 0, 0, 0.5) 100%)); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); +} +.carousel-control:hover, +.carousel-control:focus { + color: #ffffff; + text-decoration: none; + opacity: 0.9; + filter: alpha(opacity=90); +} +.carousel-control .icon-prev, +.carousel-control .icon-next, +.carousel-control .glyphicon-chevron-left, +.carousel-control .glyphicon-chevron-right { + position: absolute; + top: 50%; + z-index: 5; + display: inline-block; +} +.carousel-control .icon-prev, +.carousel-control .glyphicon-chevron-left { + left: 50%; +} +.carousel-control .icon-next, +.carousel-control .glyphicon-chevron-right { + right: 50%; +} +.carousel-control .icon-prev, +.carousel-control .icon-next { + width: 20px; + height: 20px; + margin-top: -10px; + margin-left: -10px; + font-family: serif; +} +.carousel-control .icon-prev:before { + content: '\2039'; +} +.carousel-control .icon-next:before { + content: '\203a'; +} +.carousel-indicators { + position: absolute; + bottom: 10px; + left: 50%; + z-index: 15; + width: 60%; + margin-left: -30%; + padding-left: 0; + list-style: none; + text-align: center; +} +.carousel-indicators li { + display: inline-block; + width: 10px; + height: 10px; + margin: 1px; + text-indent: -999px; + border: 1px solid #ffffff; + border-radius: 10px; + cursor: pointer; +} +.carousel-indicators .active { + margin: 0; + width: 12px; + height: 12px; + background-color: #ffffff; +} +.carousel-caption { + position: absolute; + left: 15%; + right: 15%; + bottom: 20px; + z-index: 10; + padding-top: 20px; + padding-bottom: 20px; + color: #ffffff; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); +} +.carousel-caption .btn { + text-shadow: none; +} +@media screen and (min-width: 768px) { + .carousel-control .glyphicons-chevron-left, + .carousel-control .glyphicons-chevron-right, + .carousel-control .icon-prev, + .carousel-control .icon-next { + width: 30px; + height: 30px; + margin-top: -15px; + margin-left: -15px; + font-size: 30px; + } + .carousel-caption { + left: 20%; + right: 20%; + padding-bottom: 30px; + } + .carousel-indicators { + bottom: 20px; + } +} +.clearfix:before, +.clearfix:after { + content: " "; + /* 1 */ + + display: table; + /* 2 */ + +} +.clearfix:after { + clear: both; +} +.center-block { + display: block; + margin-left: auto; + margin-right: auto; +} +.pull-right { + float: right !important; +} +.pull-left { + float: left !important; +} +.hide { + display: none !important; +} +.show { + display: block !important; +} +.invisible { + visibility: hidden; +} +.text-hide { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} +.hidden { + display: none !important; + visibility: hidden !important; +} +.affix { + position: fixed; +} +@-ms-viewport { + width: device-width; +} +.visible-xs, +tr.visible-xs, +th.visible-xs, +td.visible-xs { + display: none !important; +} +@media (max-width: 767px) { + .visible-xs { + display: block !important; + } + tr.visible-xs { + display: table-row !important; + } + th.visible-xs, + td.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-xs.visible-sm { + display: block !important; + } + tr.visible-xs.visible-sm { + display: table-row !important; + } + th.visible-xs.visible-sm, + td.visible-xs.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-xs.visible-md { + display: block !important; + } + tr.visible-xs.visible-md { + display: table-row !important; + } + th.visible-xs.visible-md, + td.visible-xs.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-xs.visible-lg { + display: block !important; + } + tr.visible-xs.visible-lg { + display: table-row !important; + } + th.visible-xs.visible-lg, + td.visible-xs.visible-lg { + display: table-cell !important; + } +} +.visible-sm, +tr.visible-sm, +th.visible-sm, +td.visible-sm { + display: none !important; +} +@media (max-width: 767px) { + .visible-sm.visible-xs { + display: block !important; + } + tr.visible-sm.visible-xs { + display: table-row !important; + } + th.visible-sm.visible-xs, + td.visible-sm.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-sm { + display: block !important; + } + tr.visible-sm { + display: table-row !important; + } + th.visible-sm, + td.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-sm.visible-md { + display: block !important; + } + tr.visible-sm.visible-md { + display: table-row !important; + } + th.visible-sm.visible-md, + td.visible-sm.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-sm.visible-lg { + display: block !important; + } + tr.visible-sm.visible-lg { + display: table-row !important; + } + th.visible-sm.visible-lg, + td.visible-sm.visible-lg { + display: table-cell !important; + } +} +.visible-md, +tr.visible-md, +th.visible-md, +td.visible-md { + display: none !important; +} +@media (max-width: 767px) { + .visible-md.visible-xs { + display: block !important; + } + tr.visible-md.visible-xs { + display: table-row !important; + } + th.visible-md.visible-xs, + td.visible-md.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-md.visible-sm { + display: block !important; + } + tr.visible-md.visible-sm { + display: table-row !important; + } + th.visible-md.visible-sm, + td.visible-md.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-md { + display: block !important; + } + tr.visible-md { + display: table-row !important; + } + th.visible-md, + td.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-md.visible-lg { + display: block !important; + } + tr.visible-md.visible-lg { + display: table-row !important; + } + th.visible-md.visible-lg, + td.visible-md.visible-lg { + display: table-cell !important; + } +} +.visible-lg, +tr.visible-lg, +th.visible-lg, +td.visible-lg { + display: none !important; +} +@media (max-width: 767px) { + .visible-lg.visible-xs { + display: block !important; + } + tr.visible-lg.visible-xs { + display: table-row !important; + } + th.visible-lg.visible-xs, + td.visible-lg.visible-xs { + display: table-cell !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .visible-lg.visible-sm { + display: block !important; + } + tr.visible-lg.visible-sm { + display: table-row !important; + } + th.visible-lg.visible-sm, + td.visible-lg.visible-sm { + display: table-cell !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .visible-lg.visible-md { + display: block !important; + } + tr.visible-lg.visible-md { + display: table-row !important; + } + th.visible-lg.visible-md, + td.visible-lg.visible-md { + display: table-cell !important; + } +} +@media (min-width: 1200px) { + .visible-lg { + display: block !important; + } + tr.visible-lg { + display: table-row !important; + } + th.visible-lg, + td.visible-lg { + display: table-cell !important; + } +} +.hidden-xs { + display: block !important; +} +tr.hidden-xs { + display: table-row !important; +} +th.hidden-xs, +td.hidden-xs { + display: table-cell !important; +} +@media (max-width: 767px) { + .hidden-xs, + tr.hidden-xs, + th.hidden-xs, + td.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-xs.hidden-sm, + tr.hidden-xs.hidden-sm, + th.hidden-xs.hidden-sm, + td.hidden-xs.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-xs.hidden-md, + tr.hidden-xs.hidden-md, + th.hidden-xs.hidden-md, + td.hidden-xs.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-xs.hidden-lg, + tr.hidden-xs.hidden-lg, + th.hidden-xs.hidden-lg, + td.hidden-xs.hidden-lg { + display: none !important; + } +} +.hidden-sm { + display: block !important; +} +tr.hidden-sm { + display: table-row !important; +} +th.hidden-sm, +td.hidden-sm { + display: table-cell !important; +} +@media (max-width: 767px) { + .hidden-sm.hidden-xs, + tr.hidden-sm.hidden-xs, + th.hidden-sm.hidden-xs, + td.hidden-sm.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-sm, + tr.hidden-sm, + th.hidden-sm, + td.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-sm.hidden-md, + tr.hidden-sm.hidden-md, + th.hidden-sm.hidden-md, + td.hidden-sm.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-sm.hidden-lg, + tr.hidden-sm.hidden-lg, + th.hidden-sm.hidden-lg, + td.hidden-sm.hidden-lg { + display: none !important; + } +} +.hidden-md { + display: block !important; +} +tr.hidden-md { + display: table-row !important; +} +th.hidden-md, +td.hidden-md { + display: table-cell !important; +} +@media (max-width: 767px) { + .hidden-md.hidden-xs, + tr.hidden-md.hidden-xs, + th.hidden-md.hidden-xs, + td.hidden-md.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-md.hidden-sm, + tr.hidden-md.hidden-sm, + th.hidden-md.hidden-sm, + td.hidden-md.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-md, + tr.hidden-md, + th.hidden-md, + td.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-md.hidden-lg, + tr.hidden-md.hidden-lg, + th.hidden-md.hidden-lg, + td.hidden-md.hidden-lg { + display: none !important; + } +} +.hidden-lg { + display: block !important; +} +tr.hidden-lg { + display: table-row !important; +} +th.hidden-lg, +td.hidden-lg { + display: table-cell !important; +} +@media (max-width: 767px) { + .hidden-lg.hidden-xs, + tr.hidden-lg.hidden-xs, + th.hidden-lg.hidden-xs, + td.hidden-lg.hidden-xs { + display: none !important; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .hidden-lg.hidden-sm, + tr.hidden-lg.hidden-sm, + th.hidden-lg.hidden-sm, + td.hidden-lg.hidden-sm { + display: none !important; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .hidden-lg.hidden-md, + tr.hidden-lg.hidden-md, + th.hidden-lg.hidden-md, + td.hidden-lg.hidden-md { + display: none !important; + } +} +@media (min-width: 1200px) { + .hidden-lg, + tr.hidden-lg, + th.hidden-lg, + td.hidden-lg { + display: none !important; + } +} +.visible-print, +tr.visible-print, +th.visible-print, +td.visible-print { + display: none !important; +} +@media print { + .visible-print { + display: block !important; + } + tr.visible-print { + display: table-row !important; + } + th.visible-print, + td.visible-print { + display: table-cell !important; + } + .hidden-print, + tr.hidden-print, + th.hidden-print, + td.hidden-print { + display: none !important; + } +} diff --git a/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote.css b/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote.css new file mode 100644 index 000000000..01cb03315 --- /dev/null +++ b/src/main/webapp/assets/custom-css/swrap-bootstrap/summernote.css @@ -0,0 +1,446 @@ +.note-editor { + height: 300px; +} + +.note-editor .note-dropzone { + position: absolute; + z-index: 1; + display: none; + color: #87cefa; + background-color: white; + border: 2px dashed #87cefa; + opacity: .95; + pointer-event: none +} + +.note-editor .note-dropzone .note-dropzone-message { + display: table-cell; + font-size: 28px; + font-weight: bold; + text-align: center; + vertical-align: middle +} + +.note-editor .note-dropzone.hover { + color: #098ddf; + border: 2px dashed #098ddf +} + +.note-editor.dragover .note-dropzone { + display: table +} + +.note-editor.fullscreen { + position: fixed; + top: 0; + left: 0; + z-index: 1050; + width: 100% +} + +.note-editor.fullscreen .note-editable { + background-color: white +} + +.note-editor.fullscreen .note-resizebar { + display: none +} + +.note-editor.codeview .note-editable { + display: none +} + +.note-editor.codeview .note-codable { + display: block +} + +.note-editor .note-toolbar { + padding-bottom: 5px; + padding-left: 10px; + padding-top: 5px; + margin: 0; + background-color: #f5f5f5; + border-bottom: 1px solid #E7EAEC +} + +.note-editor .note-toolbar > .btn-group { + margin-top: 5px; + margin-right: 5px; + margin-left: 0 +} + +.note-editor .note-toolbar .note-table .dropdown-menu { + min-width: 0; + padding: 5px +} + +.note-editor .note-toolbar .note-table .dropdown-menu .note-dimension-picker { + font-size: 18px +} + +.note-editor .note-toolbar .note-table .dropdown-menu .note-dimension-picker .note-dimension-picker-mousecatcher { + position: absolute !important; + z-index: 3; + width: 10em; + height: 10em; + cursor: pointer +} + +.note-editor .note-toolbar .note-table .dropdown-menu .note-dimension-picker .note-dimension-picker-unhighlighted { + position: relative !important; + z-index: 1; + width: 5em; + height: 5em; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASAgMAAAAroGbEAAAACVBMVEUAAIj4+Pjp6ekKlAqjAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfYAR0BKhmnaJzPAAAAG0lEQVQI12NgAAOtVatWMTCohoaGUY+EmIkEAEruEzK2J7tvAAAAAElFTkSuQmCC') repeat +} + +.note-editor .note-toolbar .note-table .dropdown-menu .note-dimension-picker .note-dimension-picker-highlighted { + position: absolute !important; + z-index: 2; + width: 1em; + height: 1em; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASAgMAAAAroGbEAAAACVBMVEUAAIjd6vvD2f9LKLW+AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfYAR0BKwNDEVT0AAAAG0lEQVQI12NgAAOtVatWMTCohoaGUY+EmIkEAEruEzK2J7tvAAAAAElFTkSuQmCC') repeat +} + +.note-editor .note-toolbar .note-style h1, .note-editor .note-toolbar .note-style h2, .note-editor .note-toolbar .note-style h3, .note-editor .note-toolbar .note-style h4, .note-editor .note-toolbar .note-style h5, .note-editor .note-toolbar .note-style h6, .note-editor .note-toolbar .note-style blockquote { + margin: 0 +} + +.note-editor .note-toolbar .note-color .dropdown-toggle { + width: 20px; + padding-left: 5px +} + +.note-editor .note-toolbar .note-color .dropdown-menu { + min-width: 290px +} + +.note-editor .note-toolbar .note-color .dropdown-menu .btn-group { + margin: 0 +} + +.note-editor .note-toolbar .note-color .dropdown-menu .btn-group:first-child { + margin: 0 5px +} + +.note-editor .note-toolbar .note-color .dropdown-menu .btn-group .note-palette-title { + margin: 2px 7px; + font-size: 12px; + text-align: center; + border-bottom: 1px solid #eee +} + +.note-editor .note-toolbar .note-color .dropdown-menu .btn-group .note-color-reset { + padding: 0 3px; + margin: 5px; + font-size: 12px; + cursor: pointer; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px +} + +.note-editor .note-toolbar .note-color .dropdown-menu .btn-group .note-color-reset:hover { + background: #eee +} + +.note-editor .note-toolbar .note-para .dropdown-menu { + min-width: 216px; + padding: 5px +} + +.note-editor .note-toolbar .note-para .dropdown-menu > div:first-child { + margin-right: 5px +} + +.note-editor .note-statusbar { + background-color: #f5f5f5 +} + +.note-editor .note-statusbar .note-resizebar { + width: 100%; + height: 8px; + cursor: s-resize; + border-top: 1px solid #a9a9a9 +} + +.note-editor .note-statusbar .note-resizebar .note-icon-bar { + width: 20px; + margin: 1px auto; + border-top: 1px solid #a9a9a9 +} + +.note-editor .note-popover .popover { + max-width: none +} + +.note-editor .note-popover .popover .popover-content { + padding: 5px +} + +.note-editor .note-popover .popover .popover-content a { + display: inline-block; + max-width: 200px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + vertical-align: middle +} + +.note-editor .note-popover .popover .popover-content .btn-group + .btn-group { + margin-left: 5px +} + +.note-editor .note-popover .popover .arrow { + left: 20px +} + +.note-editor .note-handle .note-control-selection { + position: absolute; + display: none; + border: 1px solid black +} + +.note-editor .note-handle .note-control-selection > div { + position: absolute +} + +.note-editor .note-handle .note-control-selection .note-control-selection-bg { + width: 100%; + height: 100%; + background-color: black; + -webkit-opacity: .3; + -khtml-opacity: .3; + -moz-opacity: .3; + opacity: .3; + -ms-filter: alpha(opacity=30); + filter: alpha(opacity=30) +} + +.note-editor .note-handle .note-control-selection .note-control-handle { + width: 7px; + height: 7px; + border: 1px solid black +} + +.note-editor .note-handle .note-control-selection .note-control-holder { + width: 7px; + height: 7px; + border: 1px solid black +} + +.note-editor .note-handle .note-control-selection .note-control-sizing { + width: 7px; + height: 7px; + background-color: white; + border: 1px solid black +} + +.note-editor .note-handle .note-control-selection .note-control-nw { + top: -5px; + left: -5px; + border-right: 0; + border-bottom: 0 +} + +.note-editor .note-handle .note-control-selection .note-control-ne { + top: -5px; + right: -5px; + border-bottom: 0; + border-left: none +} + +.note-editor .note-handle .note-control-selection .note-control-sw { + bottom: -5px; + left: -5px; + border-top: 0; + border-right: 0 +} + +.note-editor .note-handle .note-control-selection .note-control-se { + right: -5px; + bottom: -5px; + cursor: se-resize +} + +.note-editor .note-handle .note-control-selection .note-control-selection-info { + right: 0; + bottom: 0; + padding: 5px; + margin: 5px; + font-size: 12px; + color: white; + background-color: black; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-opacity: .7; + -khtml-opacity: .7; + -moz-opacity: .7; + opacity: .7; + -ms-filter: alpha(opacity=70); + filter: alpha(opacity=70) +} + +.note-editor .note-dialog > div { + display: none +} + +.note-editor .note-dialog .note-image-dialog .note-dropzone { + min-height: 100px; + margin-bottom: 10px; + font-size: 30px; + line-height: 4; + color: lightgray; + text-align: center; + border: 4px dashed lightgray +} + +.note-editor .note-dialog .note-help-dialog { + font-size: 12px; + color: #ccc; + background: transparent; + background-color: #222 !important; + border: 0; + -webkit-opacity: .9; + -khtml-opacity: .9; + -moz-opacity: .9; + opacity: .9; + -ms-filter: alpha(opacity=90); + filter: alpha(opacity=90) +} + +.note-editor .note-dialog .note-help-dialog .modal-content { + background: transparent; + border: 1px solid white; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none +} + +.note-editor .note-dialog .note-help-dialog a { + font-size: 12px; + color: white +} + +.note-editor .note-dialog .note-help-dialog .title { + padding-bottom: 5px; + font-size: 14px; + font-weight: bold; + color: white; + border-bottom: white 1px solid +} + +.note-editor .note-dialog .note-help-dialog .modal-close { + font-size: 14px; + color: #dd0; + cursor: pointer +} + +.note-editor .note-dialog .note-help-dialog .note-shortcut-layout { + width: 100% +} + +.note-editor .note-dialog .note-help-dialog .note-shortcut-layout td { + vertical-align: top +} + +.note-editor .note-dialog .note-help-dialog .note-shortcut { + margin-top: 8px +} + +.note-editor .note-dialog .note-help-dialog .note-shortcut th { + font-size: 13px; + color: #dd0; + text-align: left +} + +.note-editor .note-dialog .note-help-dialog .note-shortcut td:first-child { + min-width: 110px; + padding-right: 10px; + font-family: "Courier New"; + color: #dd0; + text-align: right +} + +.note-editor .note-editable { + padding: 20px; + overflow: auto; + outline: 0 +} + +.note-editor .note-editable[contenteditable="false"] { + background-color: #e5e5e5 +} + +.note-editor .note-codable { + display: none; + width: 100%; + padding: 10px; + margin-bottom: 0; + font-family: Menlo, Monaco, monospace, sans-serif; + font-size: 14px; + color: #ccc; + background-color: #222; + border: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + box-shadow: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + resize: none +} + +.note-editor .dropdown-menu { + min-width: 90px +} + +.note-editor .dropdown-menu.right { + right: 0; + left: auto +} + +.note-editor .dropdown-menu.right::before { + right: 9px; + left: auto !important +} + +.note-editor .dropdown-menu.right::after { + right: 10px; + left: auto !important +} + +.note-editor .dropdown-menu li a i { + color: deepskyblue; + visibility: hidden +} + +.note-editor .dropdown-menu li a.checked i { + visibility: visible +} + +.note-editor .note-fontsize-10 { + font-size: 10px +} + +.note-editor .note-color-palette { + line-height: 1 +} + +.note-editor .note-color-palette div .note-color-btn { + width: 17px; + height: 17px; + padding: 0; + margin: 0; + border: 1px solid #fff +} + +.note-editor .note-color-palette div .note-color-btn:hover { + border: 1px solid #000 +} \ No newline at end of file diff --git a/src/main/webapp/assets/custom-js/plugins/slimscroll/jquery.slimscroll.js b/src/main/webapp/assets/custom-js/plugins/slimscroll/jquery.slimscroll.js deleted file mode 100644 index 9c3b4dde2..000000000 --- a/src/main/webapp/assets/custom-js/plugins/slimscroll/jquery.slimscroll.js +++ /dev/null @@ -1,470 +0,0 @@ -/*! Copyright (c) 2011 Piotr Rochala (http://rocha.la) - * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) - * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. - * - * Version: 1.3.6 - * - */ -(function($) { - - $.fn.extend({ - slimScroll: function(options) { - - var defaults = { - - // width in pixels of the visible scroll area - width : 'auto', - - // height in pixels of the visible scroll area - height : '250px', - - // width in pixels of the scrollbar and rail - size : '7px', - - // scrollbar color, accepts any hex/color value - color: '#000', - - // scrollbar position - left/right - position : 'right', - - // distance in pixels between the side edge and the scrollbar - distance : '1px', - - // default scroll position on load - top / bottom / $('selector') - start : 'top', - - // sets scrollbar opacity - opacity : .4, - - // enables always-on mode for the scrollbar - alwaysVisible : false, - - // check if we should hide the scrollbar when user is hovering over - disableFadeOut : false, - - // sets visibility of the rail - railVisible : false, - - // sets rail color - railColor : '#333', - - // sets rail opacity - railOpacity : .2, - - // whether we should use jQuery UI Draggable to enable bar dragging - railDraggable : true, - - // defautlt CSS class of the slimscroll rail - railClass : 'slimScrollRail', - - // defautlt CSS class of the slimscroll bar - barClass : 'slimScrollBar', - - // defautlt CSS class of the slimscroll wrapper - wrapperClass : 'slimScrollDiv', - - // check if mousewheel should scroll the window if we reach top/bottom - allowPageScroll : false, - - // scroll amount applied to each mouse wheel step - wheelStep : 20, - - // scroll amount applied when user is using gestures - touchScrollStep : 200, - - // sets border radius - borderRadius: '7px', - - // sets border radius of the rail - railBorderRadius : '7px' - }; - - var o = $.extend(defaults, options); - - // do it for every element that matches selector - this.each(function(){ - - var isOverPanel, isOverBar, isDragg, queueHide, touchDif, - barHeight, percentScroll, lastScroll, - divS = '
    ', - minBarHeight = 30, - releaseScroll = false; - - // used in event handlers and for better minification - var me = $(this); - - // ensure we are not binding it again - if (me.parent().hasClass(o.wrapperClass)) - { - // start from last bar position - var offset = me.scrollTop(); - - // find bar and rail - bar = me.closest('.' + o.barClass); - rail = me.closest('.' + o.railClass); - - getBarHeight(); - - // check if we should scroll existing instance - if ($.isPlainObject(options)) - { - // Pass height: auto to an existing slimscroll object to force a resize after contents have changed - if ( 'height' in options && options.height == 'auto' ) { - me.parent().css('height', 'auto'); - me.css('height', 'auto'); - var height = me.parent().parent().height(); - me.parent().css('height', height); - me.css('height', height); - } - - if ('scrollTo' in options) - { - // jump to a static point - offset = parseInt(o.scrollTo); - } - else if ('scrollBy' in options) - { - // jump by value pixels - offset += parseInt(o.scrollBy); - } - else if ('destroy' in options) - { - // remove slimscroll elements - bar.remove(); - rail.remove(); - me.unwrap(); - return; - } - - // scroll content by the given offset - scrollContent(offset, false, true); - } - - return; - } - else if ($.isPlainObject(options)) - { - if ('destroy' in options) - { - return; - } - } - - // optionally set height to the parent's height - o.height = (o.height == 'auto') ? me.parent().height() : o.height; - - // wrap content - var wrapper = $(divS) - .addClass(o.wrapperClass) - .css({ - position: 'relative', - overflow: 'hidden', - width: o.width, - height: o.height - }); - - // update style for the div - me.css({ - overflow: 'hidden', - width: o.width, - height: o.height - }); - - // create scrollbar rail - var rail = $(divS) - .addClass(o.railClass) - .css({ - width: o.size, - height: '100%', - position: 'absolute', - top: 0, - display: (o.alwaysVisible && o.railVisible) ? 'block' : 'none', - 'border-radius': o.railBorderRadius, - background: o.railColor, - opacity: o.railOpacity, - zIndex: 90 - }); - - // create scrollbar - var bar = $(divS) - .addClass(o.barClass) - .css({ - background: o.color, - width: o.size, - position: 'absolute', - top: 0, - opacity: o.opacity, - display: o.alwaysVisible ? 'block' : 'none', - 'border-radius' : o.borderRadius, - BorderRadius: o.borderRadius, - MozBorderRadius: o.borderRadius, - WebkitBorderRadius: o.borderRadius, - zIndex: 99 - }); - - // set position - var posCss = (o.position == 'right') ? { right: o.distance } : { left: o.distance }; - rail.css(posCss); - bar.css(posCss); - - // wrap it - me.wrap(wrapper); - - // append to parent div - me.parent().append(bar); - me.parent().append(rail); - - // make it draggable and no longer dependent on the jqueryUI - if (o.railDraggable){ - bar.bind("mousedown", function(e) { - var $doc = $(document); - isDragg = true; - t = parseFloat(bar.css('top')); - pageY = e.pageY; - - $doc.bind("mousemove.slimscroll", function(e){ - currTop = t + e.pageY - pageY; - bar.css('top', currTop); - scrollContent(0, bar.position().top, false);// scroll content - }); - - $doc.bind("mouseup.slimscroll", function(e) { - isDragg = false;hideBar(); - $doc.unbind('.slimscroll'); - }); - return false; - }).bind("selectstart.slimscroll", function(e){ - e.stopPropagation(); - e.preventDefault(); - return false; - }); - } - - // on rail over - rail.hover(function(){ - showBar(); - }, function(){ - hideBar(); - }); - - // on bar over - bar.hover(function(){ - isOverBar = true; - }, function(){ - isOverBar = false; - }); - - // show on parent mouseover - me.hover(function(){ - isOverPanel = true; - showBar(); - hideBar(); - }, function(){ - isOverPanel = false; - hideBar(); - }); - - // support for mobile - me.bind('touchstart', function(e,b){ - if (e.originalEvent.touches.length) - { - // record where touch started - touchDif = e.originalEvent.touches[0].pageY; - } - }); - - me.bind('touchmove', function(e){ - // prevent scrolling the page if necessary - if(!releaseScroll) - { - e.originalEvent.preventDefault(); - } - if (e.originalEvent.touches.length) - { - // see how far user swiped - var diff = (touchDif - e.originalEvent.touches[0].pageY) / o.touchScrollStep; - // scroll content - scrollContent(diff, true); - touchDif = e.originalEvent.touches[0].pageY; - } - }); - - // set up initial height - getBarHeight(); - - // check start position - if (o.start === 'bottom') - { - // scroll content to bottom - bar.css({ top: me.outerHeight() - bar.outerHeight() }); - scrollContent(0, true); - } - else if (o.start !== 'top') - { - // assume jQuery selector - scrollContent($(o.start).position().top, null, true); - - // make sure bar stays hidden - if (!o.alwaysVisible) { bar.hide(); } - } - - // attach scroll events - attachWheel(this); - - function _onWheel(e) - { - // use mouse wheel only when mouse is over - if (!isOverPanel) { return; } - - var e = e || window.event; - - var delta = 0; - if (e.wheelDelta) { delta = -e.wheelDelta/120; } - if (e.detail) { delta = e.detail / 3; } - - var target = e.target || e.srcTarget || e.srcElement; - if ($(target).closest('.' + o.wrapperClass).is(me.parent())) { - // scroll content - scrollContent(delta, true); - } - - // stop window scroll - if (e.preventDefault && !releaseScroll) { e.preventDefault(); } - if (!releaseScroll) { e.returnValue = false; } - } - - function scrollContent(y, isWheel, isJump) - { - releaseScroll = false; - var delta = y; - var maxTop = me.outerHeight() - bar.outerHeight(); - - if (isWheel) - { - // move bar with mouse wheel - delta = parseInt(bar.css('top')) + y * parseInt(o.wheelStep) / 100 * bar.outerHeight(); - - // move bar, make sure it doesn't go out - delta = Math.min(Math.max(delta, 0), maxTop); - - // if scrolling down, make sure a fractional change to the - // scroll position isn't rounded away when the scrollbar's CSS is set - // this flooring of delta would happened automatically when - // bar.css is set below, but we floor here for clarity - delta = (y > 0) ? Math.ceil(delta) : Math.floor(delta); - - // scroll the scrollbar - bar.css({ top: delta + 'px' }); - } - - // calculate actual scroll amount - percentScroll = parseInt(bar.css('top')) / (me.outerHeight() - bar.outerHeight()); - delta = percentScroll * (me[0].scrollHeight - me.outerHeight()); - - if (isJump) - { - delta = y; - var offsetTop = delta / me[0].scrollHeight * me.outerHeight(); - offsetTop = Math.min(Math.max(offsetTop, 0), maxTop); - bar.css({ top: offsetTop + 'px' }); - } - - // scroll content - me.scrollTop(delta); - - // fire scrolling event - me.trigger('slimscrolling', ~~delta); - - // ensure bar is visible - showBar(); - - // trigger hide when scroll is stopped - hideBar(); - } - - function attachWheel(target) - { - if (window.addEventListener) - { - target.addEventListener('DOMMouseScroll', _onWheel, false ); - target.addEventListener('mousewheel', _onWheel, false ); - } - else - { - document.attachEvent("onmousewheel", _onWheel) - } - } - - function getBarHeight() - { - // calculate scrollbar height and make sure it is not too small - barHeight = Math.max((me.outerHeight() / me[0].scrollHeight) * me.outerHeight(), minBarHeight); - bar.css({ height: barHeight + 'px' }); - - // hide scrollbar if content is not long enough - var display = barHeight == me.outerHeight() ? 'none' : 'block'; - bar.css({ display: display }); - } - - function showBar() - { - // recalculate bar height - getBarHeight(); - clearTimeout(queueHide); - - // when bar reached top or bottom - if (percentScroll == ~~percentScroll) - { - //release wheel - releaseScroll = o.allowPageScroll; - - // publish approporiate event - if (lastScroll != percentScroll) - { - var msg = (~~percentScroll == 0) ? 'top' : 'bottom'; - me.trigger('slimscroll', msg); - } - } - else - { - releaseScroll = false; - } - lastScroll = percentScroll; - - // show only when required - if(barHeight >= me.outerHeight()) { - //allow window scroll - releaseScroll = true; - return; - } - bar.stop(true,true).fadeIn('fast'); - if (o.railVisible) { rail.stop(true,true).fadeIn('fast'); } - } - - function hideBar() - { - // only hide when options allow it - if (!o.alwaysVisible) - { - queueHide = setTimeout(function(){ - if (!(o.disableFadeOut && isOverPanel) && !isOverBar && !isDragg) - { - bar.fadeOut('slow'); - rail.fadeOut('slow'); - } - }, 1000); - } - } - - }); - - // maintain chainability - return this; - } - }); - - $.fn.extend({ - slimscroll: $.fn.slimScroll - }); - -})(jQuery); \ No newline at end of file diff --git a/src/main/webapp/assets/custom-js/plugins/slimscroll/jquery.slimscroll.min.js b/src/main/webapp/assets/custom-js/plugins/slimscroll/jquery.slimscroll.min.js deleted file mode 100644 index 7ecb25283..000000000 --- a/src/main/webapp/assets/custom-js/plugins/slimscroll/jquery.slimscroll.min.js +++ /dev/null @@ -1,16 +0,0 @@ -/*! Copyright (c) 2011 Piotr Rochala (http://rocha.la) - * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) - * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. - * - * Version: 1.3.6 - * - */ -(function(e){e.fn.extend({slimScroll:function(g){var a=e.extend({width:"auto",height:"250px",size:"7px",color:"#000",position:"right",distance:"1px",start:"top",opacity:.4,alwaysVisible:!1,disableFadeOut:!1,railVisible:!1,railColor:"#333",railOpacity:.2,railDraggable:!0,railClass:"slimScrollRail",barClass:"slimScrollBar",wrapperClass:"slimScrollDiv",allowPageScroll:!1,wheelStep:20,touchScrollStep:200,borderRadius:"7px",railBorderRadius:"7px"},g);this.each(function(){function v(d){if(r){d=d||window.event; - var c=0;d.wheelDelta&&(c=-d.wheelDelta/120);d.detail&&(c=d.detail/3);e(d.target||d.srcTarget||d.srcElement).closest("."+a.wrapperClass).is(b.parent())&&m(c,!0);d.preventDefault&&!k&&d.preventDefault();k||(d.returnValue=!1)}}function m(d,e,g){k=!1;var f=d,h=b.outerHeight()-c.outerHeight();e&&(f=parseInt(c.css("top"))+d*parseInt(a.wheelStep)/100*c.outerHeight(),f=Math.min(Math.max(f,0),h),f=0=b.outerHeight()?k=!0:(c.stop(!0, - !0).fadeIn("fast"),a.railVisible&&h.stop(!0,!0).fadeIn("fast"))}function p(){a.alwaysVisible||(B=setTimeout(function(){a.disableFadeOut&&r||y||z||(c.fadeOut("slow"),h.fadeOut("slow"))},1E3))}var r,y,z,B,A,u,l,C,k=!1,b=e(this);if(b.parent().hasClass(a.wrapperClass)){var n=b.scrollTop(),c=b.closest("."+a.barClass),h=b.closest("."+a.railClass);x();if(e.isPlainObject(g)){if("height"in g&&"auto"==g.height){b.parent().css("height","auto");b.css("height","auto");var q=b.parent().parent().height();b.parent().css("height", - q);b.css("height",q)}if("scrollTo"in g)n=parseInt(a.scrollTo);else if("scrollBy"in g)n+=parseInt(a.scrollBy);else if("destroy"in g){c.remove();h.remove();b.unwrap();return}m(n,!1,!0)}}else if(!(e.isPlainObject(g)&&"destroy"in g)){a.height="auto"==a.height?b.parent().height():a.height;n=e("
    ").addClass(a.wrapperClass).css({position:"relative",overflow:"hidden",width:a.width,height:a.height});b.css({overflow:"hidden",width:a.width,height:a.height});var h=e("
    ").addClass(a.railClass).css({width:a.size, - height:"100%",position:"absolute",top:0,display:a.alwaysVisible&&a.railVisible?"block":"none","border-radius":a.railBorderRadius,background:a.railColor,opacity:a.railOpacity,zIndex:90}),c=e("
    ").addClass(a.barClass).css({background:a.color,width:a.size,position:"absolute",top:0,opacity:a.opacity,display:a.alwaysVisible?"block":"none","border-radius":a.borderRadius,BorderRadius:a.borderRadius,MozBorderRadius:a.borderRadius,WebkitBorderRadius:a.borderRadius,zIndex:99}),q="right"==a.position? -{right:a.distance}:{left:a.distance};h.css(q);c.css(q);b.wrap(n);b.parent().append(c);b.parent().append(h);a.railDraggable&&c.bind("mousedown",function(a){var b=e(document);z=!0;t=parseFloat(c.css("top"));pageY=a.pageY;b.bind("mousemove.slimscroll",function(a){currTop=t+a.pageY-pageY;c.css("top",currTop);m(0,c.position().top,!1)});b.bind("mouseup.slimscroll",function(a){z=!1;p();b.unbind(".slimscroll")});return!1}).bind("selectstart.slimscroll",function(a){a.stopPropagation();a.preventDefault();return!1}); - h.hover(function(){w()},function(){p()});c.hover(function(){y=!0},function(){y=!1});b.hover(function(){r=!0;w();p()},function(){r=!1;p()});b.bind("touchstart",function(a,b){a.originalEvent.touches.length&&(A=a.originalEvent.touches[0].pageY)});b.bind("touchmove",function(b){k||b.originalEvent.preventDefault();b.originalEvent.touches.length&&(m((A-b.originalEvent.touches[0].pageY)/a.touchScrollStep,!0),A=b.originalEvent.touches[0].pageY)});x();"bottom"===a.start?(c.css({top:b.outerHeight()-c.outerHeight()}), - m(0,!0)):"top"!==a.start&&(m(e(a.start).position().top,null,!0),a.alwaysVisible||c.hide());window.addEventListener?(this.addEventListener("DOMMouseScroll",v,!1),this.addEventListener("mousewheel",v,!1)):document.attachEvent("onmousewheel",v)}});return this}});e.fn.extend({slimscroll:e.fn.slimScroll})})(jQuery); \ No newline at end of file diff --git a/src/main/webapp/assets/custom-js/plugins/summernote/summernote.min.js b/src/main/webapp/assets/custom-js/plugins/summernote/summernote.min.js deleted file mode 100644 index 6290d1c64..000000000 --- a/src/main/webapp/assets/custom-js/plugins/summernote/summernote.min.js +++ /dev/null @@ -1,2 +0,0 @@ -!function(a){"function"==typeof define&&define.amd?define(["jquery","codemirror"],a):a(window.jQuery,window.CodeMirror)}(function(a,b){"function"!=typeof Array.prototype.reduce&&(Array.prototype.reduce=function(a,b){var c,d,e=this.length>>>0,f=!1;for(1c;++c)this.hasOwnProperty(c)&&(f?d=a(d,this[c],c,this):(d=this[c],f=!0));if(!f)throw new TypeError("Reduce of empty array with no initial value");return d});var c={bMac:navigator.appVersion.indexOf("Mac")>-1,bMSIE:navigator.userAgent.indexOf("MSIE")>-1||navigator.userAgent.indexOf("Trident")>-1,bFF:navigator.userAgent.indexOf("Firefox")>-1,jqueryVersion:parseFloat(a.fn.jquery),bCodeMirror:!!b},d=function(){var a=function(a){return function(b){return a===b}},b=function(a,b){return a===b},c=function(){return!0},d=function(){return!1},e=function(a){return function(){return!a.apply(a,arguments)}},f=function(a){return a};return{eq:a,eq2:b,ok:c,fail:d,not:e,self:f}}(),e=function(){var a=function(a){return a[0]},b=function(a){return a[a.length-1]},c=function(a){return a.slice(0,a.length-1)},e=function(a){return a.slice(1)},f=function(a,b){var c=a.indexOf(b);return-1===c?null:a[c+1]},g=function(a,b){var c=a.indexOf(b);return-1===c?null:a[c-1]},h=function(a,b){return b=b||d.self,a.reduce(function(a,c){return a+b(c)},0)},i=function(a){for(var b=[],c=-1,d=a.length;++cc;c++)a[c]&&b.push(a[c]);return b};return{head:a,last:b,initial:c,tail:e,prev:g,next:f,sum:h,from:i,compact:k,clusterBy:j}}(),f=function(){var b=function(b){return b&&a(b).hasClass("note-editable")},g=function(b){return b&&a(b).hasClass("note-control-sizing")},h=function(a){var b=function(b){return function(){return a.find(b)}};return{editor:function(){return a},dropzone:b(".note-dropzone"),toolbar:b(".note-toolbar"),editable:b(".note-editable"),codable:b(".note-codable"),statusbar:b(".note-statusbar"),popover:b(".note-popover"),handle:b(".note-handle"),dialog:b(".note-dialog")}},i=function(a){return function(b){return b&&b.nodeName===a}},j=function(a){return a&&/^DIV|^P|^LI|^H[1-7]/.test(a.nodeName)},k=function(a){return a&&/^UL|^OL/.test(a.nodeName)},l=function(a){return a&&/^TD|^TH/.test(a.nodeName)},m=function(a,c){for(;a;){if(c(a))return a;if(b(a))break;a=a.parentNode}return null},n=function(a,b){b=b||d.fail;var c=[];return m(a,function(a){return c.push(a),b(a)}),c},o=function(b,c){for(var d=n(b),e=c;e;e=e.parentNode)if(a.inArray(e,d)>-1)return e;return null},p=function(a,b){var c=[],d=!1,e=!1;return function f(g){if(g){if(g===a&&(d=!0),d&&!e&&c.push(g),g===b)return void(e=!0);for(var h=0,i=g.childNodes.length;i>h;h++)f(g.childNodes[h])}}(o(a,b)),c},q=function(a,b){b=b||d.fail;for(var c=[];a&&(c.push(a),!b(a));)a=a.previousSibling;return c},r=function(a,b){b=b||d.fail;for(var c=[];a&&(c.push(a),!b(a));)a=a.nextSibling;return c},s=function(a,b){var c=[];return b=b||d.ok,function e(d){a!==d&&b(d)&&c.push(d);for(var f=0,g=d.childNodes.length;g>f;f++)e(d.childNodes[f])}(a),c},t=function(a,b){var c=b.nextSibling,d=b.parentNode;return c?d.insertBefore(a,c):d.appendChild(a),a},u=function(b,c){return a.each(c,function(a,c){b.appendChild(c)}),b},v=i("#text"),w=function(a){return v(a)?a.nodeValue.length:a.childNodes.length},x=function(a){for(var b=0;a=a.previousSibling;)b+=1;return b},y=function(b,c){var f=e.initial(n(c,d.eq(b)));return a.map(f,x).reverse()},z=function(a,b){for(var c=a,d=0,e=b.length;e>d;d++)c=c.childNodes[b[d]];return c},A=function(a,b){if(0===b)return a;if(b>=w(a))return a.nextSibling;if(v(a))return a.splitText(b);var c=a.childNodes[b];return a=t(a.cloneNode(!1),a),u(a,r(c))},B=function(a,b,c){var e=n(b,d.eq(a));return 1===e.length?A(b,c):e.reduce(function(a,d){var e=d.cloneNode(!1);return t(e,d),a===b&&(a=A(a,c)),u(e,r(a)),e})},C=function(a,b){if(a&&a.parentNode){if(a.removeNode)return a.removeNode(b);var c=a.parentNode;if(!b){var d,e,f=[];for(d=0,e=a.childNodes.length;e>d;d++)f.push(a.childNodes[d]);for(d=0,e=f.length;e>d;d++)c.insertBefore(f[d],a)}c.removeChild(a)}},D=function(a){return f.isTextarea(a[0])?a.val():a.html()};return{blank:c.bMSIE?" ":"
    ",emptyPara:"


    ",isEditable:b,isControlSizing:g,buildLayoutInfo:h,isText:v,isPara:j,isList:k,isTable:i("TABLE"),isCell:l,isAnchor:i("A"),isDiv:i("DIV"),isLi:i("LI"),isSpan:i("SPAN"),isB:i("B"),isU:i("U"),isS:i("S"),isI:i("I"),isImg:i("IMG"),isTextarea:i("TEXTAREA"),ancestor:m,listAncestor:n,listNext:r,listPrev:q,listDescendant:s,commonAncestor:o,listBetween:p,insertAfter:t,position:x,makeOffsetPath:y,fromOffsetPath:z,split:B,remove:C,html:D}}(),g={version:"0.5.2",options:{width:null,height:null,focus:!1,tabsize:4,styleWithSpan:!0,disableLinkTarget:!1,disableDragAndDrop:!1,codemirror:null,lang:"en-US",direction:null,toolbar:[["style",["style"]],["font",["bold","italic","underline","clear"]],["fontname",["fontname"]],["color",["color"]],["para",["ul","ol","paragraph"]],["height",["height"]],["table",["table"]],["insert",["link","picture","video"]],["view",["fullscreen","codeview"]],["help",["help"]]],oninit:null,onfocus:null,onblur:null,onenter:null,onkeyup:null,onkeydown:null,onImageUpload:null,onImageUploadError:null,onToolbarClick:null,keyMap:{pc:{"CTRL+Z":"undo","CTRL+Y":"redo",TAB:"tab","SHIFT+TAB":"untab","CTRL+B":"bold","CTRL+I":"italic","CTRL+U":"underline","CTRL+SHIFT+S":"strikethrough","CTRL+BACKSLASH":"removeFormat","CTRL+SHIFT+L":"justifyLeft","CTRL+SHIFT+E":"justifyCenter","CTRL+SHIFT+R":"justifyRight","CTRL+SHIFT+J":"justifyFull","CTRL+SHIFT+NUM7":"insertUnorderedList","CTRL+SHIFT+NUM8":"insertOrderedList","CTRL+LEFTBRACKET":"outdent","CTRL+RIGHTBRACKET":"indent","CTRL+NUM0":"formatPara","CTRL+NUM1":"formatH1","CTRL+NUM2":"formatH2","CTRL+NUM3":"formatH3","CTRL+NUM4":"formatH4","CTRL+NUM5":"formatH5","CTRL+NUM6":"formatH6","CTRL+ENTER":"insertHorizontalRule"},mac:{"CMD+Z":"undo","CMD+SHIFT+Z":"redo",TAB:"tab","SHIFT+TAB":"untab","CMD+B":"bold","CMD+I":"italic","CMD+U":"underline","CMD+SHIFT+S":"strikethrough","CMD+BACKSLASH":"removeFormat","CMD+SHIFT+L":"justifyLeft","CMD+SHIFT+E":"justifyCenter","CMD+SHIFT+R":"justifyRight","CMD+SHIFT+J":"justifyFull","CMD+SHIFT+NUM7":"insertUnorderedList","CMD+SHIFT+NUM8":"insertOrderedList","CMD+LEFTBRACKET":"outdent","CMD+RIGHTBRACKET":"indent","CMD+NUM0":"formatPara","CMD+NUM1":"formatH1","CMD+NUM2":"formatH2","CMD+NUM3":"formatH3","CMD+NUM4":"formatH4","CMD+NUM5":"formatH5","CMD+NUM6":"formatH6","CMD+ENTER":"insertHorizontalRule"}}},lang:{"en-US":{font:{bold:"Bold",italic:"Italic",underline:"Underline",strike:"Strike",clear:"Remove Font Style",height:"Line Height",name:"Font Family",size:"Font Size"},image:{image:"Picture",insert:"Insert Image",resizeFull:"Resize Full",resizeHalf:"Resize Half",resizeQuarter:"Resize Quarter",floatLeft:"Float Left",floatRight:"Float Right",floatNone:"Float None",dragImageHere:"Drag an image here",selectFromFiles:"Select from files",url:"Image URL",remove:"Remove Image"},link:{link:"Link",insert:"Insert Link",unlink:"Unlink",edit:"Edit",textToDisplay:"Text to display",url:"To what URL should this link go?",openInNewWindow:"Open in new window"},video:{video:"Video",videoLink:"Video Link",insert:"Insert Video",url:"Video URL?",providers:"(YouTube, Vimeo, Vine, Instagram, or DailyMotion)"},table:{table:"Table"},hr:{insert:"Insert Horizontal Rule"},style:{style:"Style",normal:"Normal",blockquote:"Quote",pre:"Code",h1:"Header 1",h2:"Header 2",h3:"Header 3",h4:"Header 4",h5:"Header 5",h6:"Header 6"},lists:{unordered:"Unordered list",ordered:"Ordered list"},options:{help:"Help",fullscreen:"Full Screen",codeview:"Code View"},paragraph:{paragraph:"Paragraph",outdent:"Outdent",indent:"Indent",left:"Align left",center:"Align center",right:"Align right",justify:"Justify full"},color:{recent:"Recent Color",more:"More Color",background:"BackColor",foreground:"FontColor",transparent:"Transparent",setTransparent:"Set transparent",reset:"Reset",resetToDefault:"Reset to default"},shortcut:{shortcuts:"Keyboard shortcuts",close:"Close",textFormatting:"Text formatting",action:"Action",paragraphFormatting:"Paragraph formatting",documentStyle:"Document Style"},history:{undo:"Undo",redo:"Redo"}}}},h=function(){var b=function(b){return a.Deferred(function(c){a.extend(new FileReader,{onload:function(a){var b=a.target.result;c.resolve(b)},onerror:function(){c.reject(this)}}).readAsDataURL(b)}).promise()},c=function(b){return a.Deferred(function(c){a("").one("load",function(){c.resolve(a(this))}).one("error abort",function(){c.reject(a(this))}).css({display:"none"}).appendTo(document.body).attr("src",b)}).promise()};return{readFileAsDataURL:b,createImage:c}}(),i={isEdit:function(a){return-1!==[8,9,13,32].indexOf(a)},nameFromCode:{8:"BACKSPACE",9:"TAB",13:"ENTER",32:"SPACE",48:"NUM0",49:"NUM1",50:"NUM2",51:"NUM3",52:"NUM4",53:"NUM5",54:"NUM6",55:"NUM7",56:"NUM8",66:"B",69:"E",73:"I",74:"J",75:"K",76:"L",82:"R",83:"S",85:"U",89:"Y",90:"Z",191:"SLASH",219:"LEFTBRACKET",220:"BACKSLASH",221:"RIGHTBRACKET"}},j=function(){var b=function(b,d){if(c.jqueryVersion<1.9){var e={};return a.each(d,function(a,c){e[c]=b.css(c)}),e}return b.css.call(b,d)};this.stylePara=function(b,c){a.each(b.nodes(f.isPara),function(b,d){a(d).css(c)})},this.current=function(c,d){var e=a(f.isText(c.sc)?c.sc.parentNode:c.sc),g=["font-family","font-size","text-align","list-style-type","line-height"],h=b(e,g)||{};if(h["font-size"]=parseInt(h["font-size"],10),h["font-bold"]=document.queryCommandState("bold")?"bold":"normal",h["font-italic"]=document.queryCommandState("italic")?"italic":"normal",h["font-underline"]=document.queryCommandState("underline")?"underline":"normal",h["font-strikethrough"]=document.queryCommandState("strikeThrough")?"strikethrough":"normal",c.isOnList()){var i=["circle","disc","disc-leading-zero","square"],j=a.inArray(h["list-style-type"],i)>-1;h["list-style"]=j?"unordered":"ordered"}else h["list-style"]="none";var k=f.ancestor(c.sc,f.isPara);if(k&&k.style["line-height"])h["line-height"]=k.style.lineHeight;else{var l=parseInt(h["line-height"],10)/parseInt(h["font-size"],10);h["line-height"]=l.toFixed(1)}return h.image=f.isImg(d)&&d,h.anchor=c.isOnAnchor()&&f.ancestor(c.sc,f.isAnchor),h.aAncestor=f.listAncestor(c.sc,f.isEditable),h}},k=function(){var b=!!document.createRange,c=function(a,b){var c,d,g=a.parentElement(),h=document.body.createTextRange(),i=e.from(g.childNodes);for(c=0;c=0)break;d=i[c]}if(0!==c&&f.isText(i[c-1])){var j=document.body.createTextRange(),k=null;j.moveToElementText(d||g),j.collapse(!d),k=d?d.nextSibling:g.firstChild;var l=a.duplicate();l.setEndPoint("StartToStart",j);for(var m=l.text.replace(/[\r\n]/g,"").length;m>k.nodeValue.length&&k.nextSibling;)m-=k.nodeValue.length,k=k.nextSibling;{k.nodeValue}b&&k.nextSibling&&f.isText(k.nextSibling)&&m===k.nodeValue.length&&(m-=k.nodeValue.length,k=k.nextSibling),g=k,c=m}return{cont:g,offset:c}},g=function(a){var b=function(a,c){var g,h;if(f.isText(a)){var i=f.listPrev(a,d.not(f.isText)),j=e.last(i).previousSibling;g=j||a.parentNode,c+=e.sum(e.tail(i),f.length),h=!j}else{if(g=a.childNodes[c]||a,f.isText(g))return b(g,c);c=0,h=!1}return{cont:g,collapseToStart:h,offset:c}},c=document.body.createTextRange(),g=b(a.cont,a.offset);return c.moveToElementText(g.cont),c.collapse(g.collapseToStart),c.moveStart("character",g.offset),c},h=function(c,h,i,j){this.sc=c,this.so=h,this.ec=i,this.eo=j;var k=function(){if(b){var a=document.createRange();return a.setStart(c,h),a.setEnd(i,j),a}var d=g({cont:c,offset:h});return d.setEndPoint("EndToEnd",g({cont:i,offset:j})),d};this.select=function(){var a=k();if(b){var c=document.getSelection();c.rangeCount>0&&c.removeAllRanges(),c.addRange(a)}else a.select()},this.nodes=function(b){var g=f.listBetween(c,i),h=e.compact(a.map(g,function(a){return f.ancestor(a,b)}));return a.map(e.clusterBy(h,d.eq2),e.head)},this.commonAncestor=function(){return f.commonAncestor(c,i)};var l=function(a){return function(){var b=f.ancestor(c,a);return!!b&&b===f.ancestor(i,a)}};this.isOnEditable=l(f.isEditable),this.isOnList=l(f.isList),this.isOnAnchor=l(f.isAnchor),this.isOnCell=l(f.isCell),this.isCollapsed=function(){return c===i&&h===j},this.insertNode=function(a){var c=k();b?c.insertNode(a):c.pasteHTML(a.outerHTML)},this.toString=function(){var a=k();return b?a.toString():a.text},this.bookmark=function(a){return{s:{path:f.makeOffsetPath(a,c),offset:h},e:{path:f.makeOffsetPath(a,i),offset:j}}}};return{create:function(a,d,e,f){if(0===arguments.length)if(b){var g=document.getSelection();if(0===g.rangeCount)return null;var i=g.getRangeAt(0);a=i.startContainer,d=i.startOffset,e=i.endContainer,f=i.endOffset}else{var j=document.selection.createRange(),k=j.duplicate();k.collapse(!1);var l=j;l.collapse(!0);var m=c(l,!0),n=c(k,!1);a=m.cont,d=m.offset,e=n.cont,f=n.offset}else 2===arguments.length&&(e=a,f=d);return new h(a,d,e,f)},createFromNode:function(a){return this.create(a,0,a,1)},createFromBookmark:function(a,b){var c=f.fromOffsetPath(a,b.s.path),d=b.s.offset,e=f.fromOffsetPath(a,b.e.path),g=b.e.offset;return new h(c,d,e,g)}}}(),l=function(){this.tab=function(a,b){var c=f.ancestor(a.commonAncestor(),f.isCell),d=f.ancestor(c,f.isTable),g=f.listDescendant(d,f.isCell),h=e[b?"prev":"next"](g,c);h&&k.create(h,0).select()},this.createTable=function(b,c){for(var d,e=[],g=0;b>g;g++)e.push(""+f.blank+"");d=e.join("");for(var h,i=[],j=0;c>j;j++)i.push(""+d+"");h=i.join("");var k=''+h+"
    ";return a(k)[0]}},m=function(){var b=new j,d=new l;this.saveRange=function(a){a.data("range",k.create())},this.restoreRange=function(a){var b=a.data("range");b&&b.select()},this.currentStyle=function(a){var c=k.create();return c.isOnEditable()&&b.current(c,a)},this.undo=function(a){a.data("NoteHistory").undo(a)},this.redo=function(a){a.data("NoteHistory").redo(a)};for(var e=this.recordUndo=function(a){a.data("NoteHistory").recordUndo(a)},g=["bold","italic","underline","strikethrough","justifyLeft","justifyCenter","justifyRight","justifyFull","insertOrderedList","insertUnorderedList","indent","outdent","formatBlock","removeFormat","backColor","foreColor","insertHorizontalRule","fontName"],i=0,m=g.length;m>i;i++)this[g[i]]=function(a){return function(b,c){e(b),document.execCommand(a,!1,c)}}(g[i]);var n=function(b,c,d){e(b);var g=new Array(d+1).join(" ");c.insertNode(a(''+g+"")[0]);var h=a("#noteTab").removeAttr("id");c=k.create(h[0],1),c.select(),f.remove(h[0])};this.tab=function(a,b){var c=k.create();c.isCollapsed()&&c.isOnCell()?d.tab(c):n(a,c,b.tabsize)},this.untab=function(){var a=k.create();a.isCollapsed()&&a.isOnCell()&&d.tab(a,!0)},this.insertImage=function(a,b){h.createImage(b).then(function(b){e(a),b.css({display:"",width:Math.min(a.width(),b.width())}),k.create().insertNode(b[0])}).fail(function(){var b=a.data("callbacks");b.onImageUploadError&&b.onImageUploadError()})},this.insertVideo=function(b,c){e(b);var d,f=/^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/,g=c.match(f),h=/\/\/instagram.com\/p\/(.[a-zA-Z0-9]*)/,i=c.match(h),j=/\/\/vine.co\/v\/(.[a-zA-Z0-9]*)/,l=c.match(j),m=/\/\/(player.)?vimeo.com\/([a-z]*\/)*([0-9]{6,11})[?]?.*/,n=c.match(m),o=/.+dailymotion.com\/(video|hub)\/([^_]+)[^#]*(#video=([^_&]+))?/,p=c.match(o);if(g&&11===g[2].length){var q=g[2];d=a("