From 28edb315ce60a1ad95b7a608301a67ee8ba3e9d6 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Mon, 1 Oct 2018 18:41:45 +0530 Subject: Minor UI changes and selenium test fixes --- yaksh/live_server_tests/selenium_test.py | 15 ++++++--- yaksh/static/yaksh/css/yakshcustom.css | 51 ------------------------------- yaksh/templates/manage.html | 11 ++++--- yaksh/templates/user.html | 11 ++++--- yaksh/templates/yaksh/course_modules.html | 17 +++++++++-- yaksh/templates/yaksh/quizzes_user.html | 2 +- 6 files changed, 38 insertions(+), 69 deletions(-) diff --git a/yaksh/live_server_tests/selenium_test.py b/yaksh/live_server_tests/selenium_test.py index 5bf1988..41a0fad 100644 --- a/yaksh/live_server_tests/selenium_test.py +++ b/yaksh/live_server_tests/selenium_test.py @@ -27,6 +27,8 @@ class SeleniumTestError(Exception): class SeleniumTest(): def __init__(self, url, quiz_name, module_name, course_name): self.driver = webdriver.Firefox() + self.driver.set_window_position(0, 0) + self.driver.set_window_size(1024, 768) self.quiz_name = quiz_name self.module_name = module_name self.course_name = course_name @@ -124,8 +126,8 @@ class SeleniumTest(): def open_quiz(self): # open module link self.driver.find_elements_by_partial_link_text( - self.course_name)[0].click() - self.driver.find_element_by_link_text(self.module_name).click() + 'START')[0].click() + self.driver.find_element_by_link_text('Start').click() # open quiz link self.driver.find_element_by_link_text(self.quiz_name).click() @@ -157,12 +159,15 @@ class SeleniumTest(): quit_link_elem.click() def logout(self): - logout_link_elem = WebDriverWait(self.driver, 5).until( - EC.presence_of_element_located((By.ID, "logout")) + logout_link_menu = WebDriverWait(self.driver, 10).until( + EC.presence_of_element_located((By.ID, "user_dropdown")) + ) + logout_link_menu.click() + logout_link_elem = WebDriverWait(self.driver, 10).until( + EC.presence_of_element_located((By.ID, "user_logout")) ) logout_link_elem.click() - def user_gen(url, ids): return [(url, 'User%d' % x, 'User%d' % x) for x in ids] diff --git a/yaksh/static/yaksh/css/yakshcustom.css b/yaksh/static/yaksh/css/yakshcustom.css index 3b888cf..86403ac 100644 --- a/yaksh/static/yaksh/css/yakshcustom.css +++ b/yaksh/static/yaksh/css/yakshcustom.css @@ -72,57 +72,6 @@ width: 100%; } -/*---------------------*/ - -/*Buttons - -.btn-success, .badge-success{ - background-color: #35beb1; - border-color: #35beb1; - color: black; -} - -.btn-primary, .badge-primary{ - background-color: #4ce8d9; - border-color: #4ce8d9; - color: black; -} - -.btn-success:hover, .open>.dropdown-toggle.btn-success, .btn-primary:hover, .open>.dropdown-toggle.btn-primary { - background-color: #156b62; - color: white; - border-color: #156b62; -} - -.btn-warning, .badge-warning { - background-color: #f7bd38; - border-color: #f7bd38; - color: black; -} - -.btn-warning:hover, .open>.dropdown-toggle.btn-warning { - background-color: #c6921b; - color: white; - border-color: #c6921b; -} - -.btn-danger, .badge-danger{ - background-color: #f03c69; - border-color: #f03c69; - color: black; -} - -.btn-danger:hover, .open>.dropdown-toggle.btn-danger, .btn-danger:hover, .open>.dropdown-toggle.btn-danger { - background-color: #b7123b; - color: white; - border-color: #b7123b; -} - - - -/*---------------------*/ - - /* Sidebar */ diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index 3ba2817..fbd4c64 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -18,19 +18,20 @@
  • Grade User
  • Regrade
  • - {{user.get_full_name|title}} + {{user.get_full_name|title}}
    My Profile
    - Change Password -
    - Logout -
    {% if user.profile.is_moderator %} Switch To Student +
    {% endif %} + Change Password +
    + Logout +
    diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html index 91b48ed..db65195 100644 --- a/yaksh/templates/user.html +++ b/yaksh/templates/user.html @@ -15,19 +15,20 @@ diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html index e839e8b..9d936d6 100644 --- a/yaksh/templates/yaksh/course_modules.html +++ b/yaksh/templates/yaksh/course_modules.html @@ -49,7 +49,7 @@
    -{% if learning_modules %} +{% if modules %}
    Overall Course Progress @@ -68,7 +68,7 @@
    - {% for module in learning_modules %} + {% for module, percent in modules %}
    @@ -176,6 +176,19 @@ ------ {% endif %} + +
    + {% if percent <= 50 %} +
    + {% elif percent <= 75 %} +
    + {% else %} +
    + {% endif %} + {{percent}}% Completed +
    +
    + {% endfor %} diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html index 95fa08a..548eef4 100644 --- a/yaksh/templates/yaksh/quizzes_user.html +++ b/yaksh/templates/yaksh/quizzes_user.html @@ -100,7 +100,7 @@ {% if user in course.requests.all %} Request Pending {% elif user in course.rejected.all %}Request Rejected - {% elif user in course.students.all %}START + {% elif user in course.students.all %}START {% else %} {% if course.active %} {% if course.is_active_enrollment %} -- cgit