Merge branch 'dev' into 840-Course-Career-Path

open-learning-exchange · Jan 15, 2018 · e94449c · e94449c
2 parents c454d57 + 88bd396
commit e94449c
Show file tree

Hide file tree

Showing 155 changed files with 47,521 additions and 29,494 deletions.
diff --git a/app/CHANGELOG.html b/app/CHANGELOG.html
@@ -1,4 +1,161 @@
 <html><body><pre>
+
+ Bell Apps 0.13.21
+ --------------------
+ - [#1051] Fixed language test
+ - [#1046] Disable sending mail to non nation members
+ - [#1051] fix test (#1052)
+
+ Bell Apps 0.13.20
+ --------------------
+ - [#1010] Bell logo updated (#1038)
+ - [#1016] fix auto publication issue with remote nation on slow network (#1039)
+ - [#829] test for feedback and login fixed (#1032)
+ - [#952] Show Members of a Course on a Nation (#969)
+ - [#1034] Margin set for BeLL-App (#1035)
+ - [#1008] Download button fixed in course review (#1030)
+ - [#326] Publicattion sync text (#1025)
+
+
+ Bell Apps 0.13.19
+ --------------------
+ - [#961] community display in chrome fixed (connects #961) (#1027)
+ - [#1022] mock data for course (connects #1022) (#1023)
+ - [#1028] travis test for delete report fixed (#1029)
+ - [#870] fix download survey button (#1024)
+ - [#829] normalize codecept test names (connects #829) (#1014)
+ - [#991] fix selection of resources in courses (connects #991) (#992) 
+
+ Bell Apps 0.13.18
+ --------------------
+ - [#1018] Fixed nation feedback not clicked (#1020)
+ - [#1016] Nation publication old data conflict fixed (#1019)
+
+ Bell Apps 0.13.17
+ --------------------
+ - [#996] Removing strike button from wysiwyg redactor (#1005)
+ - [#997] Fixed auto publication (#1012)
+ - [#1006] Nation publication design fix (#1011)
+ - [#1007] Feedback markdown fix (#1013)
+
+ Bell Apps 0.13.16
+ --------------------
+ - New translations (#1004)
+ - [#995] Save answer for take test (#1001)
+ - [#995] Set autopublication button (#1002)
+ - [#984] Fixed for publication resource (#985)
+
+ Bell Apps 0.13.15
+ --------------------
+ - [933] Auto/pendng community (#994)
+
+ Bell Apps 0.13.14
+ --------------------
+ - [#981] Review and credit for members (#990)
+ - [#988] Auto publication (#989)
+
+ Bell Apps 0.13.13
+ --------------------
+ - [#980] Auto publication (#982)
+ - Fix for zip uploads (#949)
+
+ Bell Apps 0.13.12
+ --------------------
+ - New translations (#978)
+ - moved dummy test (#977)
+ - [#966] Validation Added (#972)
+ - [#970] Multiple choice qtn edit checked value (#973)
+ - [#968] CSV files changes (#974)
+ - [#975] Course step sorting (#976)
+ - [#964] Multiple choice input field in same colume (#967)
+
+ Bell Apps 0.13.11
+ --------------------
+ - isNationAlive: changed in getRequestatus function
+
+ Bell Apps 0.13.10
+ --------------------
+ - [#955] Completed leftover markdown (#956)
+ - [#957] New ui for course info section
+ - [#959] Memberimage overlapping and heading fixed
+
+ Bell Apps 0.13.9
+ --------------------
+ - [#931] adresources dialog modified (#934)
+ - [#936] Take test buttons fixed(#937)
+ - [#939] add publication inputfield style
+ - [#938]-site feedback
+ - Sync course answers with nation
+
+ Bell Apps 0.13.8
+ --------------------
+ - renamed tests
+
+ Bell Apps 0.13.7
+ --------------------
+ - [#839] Completed adding Markdown Editor (#940)
+ - [#944] Course Codeceptjs test (#946)
+
+ Bell Apps 0.13.6
+ --------------------
+ - [#913] Course margin footer (#917)
+ - [#922] Margin set (#923)
+ - [#920] Undefined button (#921)
+ - [#650] Course statistic (#889)
+ - [#930] Add resource to course (#928)
+ - [#902] Edit step in parent page (#916)
+
+ Bell Apps 0.13.5
+ --------------------
+ - [#901] Layout Fixed (#905)
+ - [#893] Correct answer icons (#906)
+ - [#900] Broken link fixed (#908)
+ - [#904] Backbutton changed (#907)
+
+ Bell Apps 0.13.4
+ --------------------
+ - [#893] Course correct answers
+ - [#888] bootstrap table format (#898)
+ - [#895] community config style (#897)
+
+ Bell Apps 0.13.3
+ --------------------
+ - [#828] Pull courses to Nation (#887)
+ - [#879] Dasbord problem (#883)
+ - [#834] Region filter added (#843)
+ - [#881] Nation:Accept btn adjusted (#890)
+ - [#886] Link fixed (#891)
+
+ Bell Apps 0.13.2
+ --------------------
+ - [#870] Survey question csv (#878)
+ - [#863] Download summaries csv (#875)
+ - [#862] Popup function (#882)
+
+ Bell Apps 0.13.1
+ --------------------
+ - [#864]: Optimizing my course (#868)
+ - [#863] stepquestionIds null fixed (#865)
+ - [#861] Adjustment of Text area (#866)
+ - [#857] Nation:Set configuration layout (#867)
+ - [#859] Default margin (#869)
+ - [#828] Pull nations (#873)
+ - [#871] Language changed (#872)
+
+ Bell Apps 0.13.0
+ --------------------
+ - [#845] style changed for set configuration (#851)
+ - [#830] Instruction removed (#838)
+ - [#844] Test layout (#849)
+ - [#846] Set Default Margin (#850)
+ - [#847] CSV for course progress (#852)
+ - [#736] Removed CORS (#854)
+
+ Bell Apps 0.12.113
+ --------------------
+ - [#736] Auto Accepted Community (#808)
+ - [#831] Changed My Tutor to My Team (#835)
+ - [#822] CodeceptTest TrendActivity Report (#824)
 
  Bell Apps 0.12.112
  --------------------

diff --git a/app/MyApp/app/App.js b/app/MyApp/app/App.js
@@ -107,16 +107,22 @@ $(function() {
                 model: mymodels
             })
             na.render()
+            $("#site-feedback").remove()
             App.$el.children('.body').append(na.el)
+            App.Router.markdownEditor("description","feedback","50")
+            $('#site-feedback').css({
+                height: '325px'
+            })
         },
         renderRequest: function(kind) {
             var view = new App.Views.RequestView()
             view.type = kind
             view.render()
             App.$el.children('.body').append(view.el);
+            App.Router.markdownEditor("description","request","130")
            // $('.body').removeClass('addResource');
             $('#site-request').animate({
-                height: '302px'
+                height: '335px'
             })
             document.getElementById('site-request').style.visibility = 'visible';
 

diff --git a/app/MyApp/app/Home-Urdu.css b/app/MyApp/app/Home-Urdu.css
@@ -1,6 +1,9 @@
 /*This stylesheet is supposed to applied on page for RTL languages like Arabic, Urdu etc*/
 .body {
     direction: rtl;
+    margin-bottom: 30px;
+    margin-right: 20px;
+    margin-left:20px;
 }
 #dashboard {
     height: 600px;
@@ -124,7 +127,6 @@ select#onDashboardLanguage {
     margin-top: -3.5%;
 }*/
 /*.changeWelComeButtonAsia{
-
     float: right;
     margin-right: 25%;
 }
@@ -178,10 +180,8 @@ td.stu-nav-option-empty {
 ul#itemsinnavbar.nav{
     direction: rtl;
     display: inline-flex;
-
     position: absolute;
 }
-
 .header-table {
     width: 100%;
     font-size: 20px;
@@ -962,7 +962,7 @@ body{
     border-radius: 0px 0px 20px 20px;
     color: #FFFFFF;
     height: 0px;
-    margin-left: 20%;
+    margin-right: 20%;
     position: absolute;
     top: -1%;
     width: 60%;
@@ -974,7 +974,7 @@ body{
     height:100%;
 }
 #f-formButton{
-    margin-left: 10%;
+    margin-left: 5%;
     width: 80%;
 }
 
@@ -1135,13 +1135,11 @@ textarea[name="comment"]
 /*.bbf-form .field-endDate
 {
     margin-left: 259px;
-
 }
 */
 /*.bbf-form .field-endTime
 {
     margin-left: 259px;
-
 }*/
 #library-top-buttons{
     margin-top: 20px;
@@ -1214,4 +1212,45 @@ a.forgot-password-form-button{
 a.forgot-password-form-button:hover{
     cursor: pointer;
     color: #3498db;
+}
+form > fieldset > ul > li.bbf-field.field-selectLanguage {
+    list-style-type: none;
+}
+#accept div input[name=accept]{
+    margin-top: -45px;
+}
+.redactor_color_none {
+    display: none !important;
+}
+.redactor_textbox{
+    float:none !important;
+}
+.redactor_textbox .bbf-editor{
+    width:95%;
+}
+.redactor_textbox .redactor_box{
+    width:100%;
+    margin-bottom: 10px; 
+}
+.redactor_textbox textarea{
+    padding:1%;
+    width:98%;
+}
+#exit_Pressed{
+    float:left;
+}
+.answersection{
+    margin-bottom: 25px;
+}
+#addIndividualResource{
+    width:110px;
+}
+.DropDownOptn{
+    float: left;
+    margin-left: 20px;
+    position: relative;
+}
+.table-feedback{
+    margin-left:20px;
+    margin-right:20px
 }