Change username nav item (#311)

* Changed user nav item's text from "My User" to user's full name; moved item to beginning of navbar.

Author: NogaOs

devops/dev_bootstrap.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+python_exec=python
+pip_exec=pip
+
 set -x
 
 SCRIPT_FILE_PATH=$(readlink -f "${0}")
@@ -12,18 +15,6 @@ CONFIG_FILE_PATH="${LMSWEB_FOLDER}/config.py"
 CONFIG_EXAMPLE_FILE_PATH="${LMSWEB_FOLDER}/config.py.example"
 DB_BOOTSTRAP_FILE_PATH="${LMSAPP_FOLDER}/lmsdb/bootstrap.py"
 
-if (command -v pip); then
-  pip_exec=pip
-else
-  pip_exec=pip3
-fi
-
-if (command -v python); then
-  python_exec=python
-else
-  python_exec=python3
-fi
-
 if ! (test -f "${CONFIG_FILE_PATH}"); then
   echo "Creating config from template"
   cp "${CONFIG_EXAMPLE_FILE_PATH}" "${CONFIG_FILE_PATH}"

lms/templates/navbar.html

@@ -9,13 +9,19 @@
     </a>
     <div class="collapse navbar-collapse" id="navbarNavDropdown">
       <ul class="navbar-nav">
+        <li class="nav-item">
+          <a href="/user/{{ current_user.id }}" class="nav-link">
+            <i class="fa fa-user" aria-hidden="true"></i>
+            {{ current_user.fullname | e }}
+          </a>
+        </li>
         <li class="nav-item dropdown">
           <a id="notifications-icon" href="#" class="nav-link" aria-expanded="false" aria-haspopup="true" aria-label="Notifications" role="button" data-toggle="dropdown">
             <i class="fa fa-bell" aria-hidden="true"></i>
             {{ _('הודעות') }}
             <span id="notification-count" class="badge bg-secondary">0</span>
           </a>
-          <div id="notifications-list" aria-labelledby="navbarDropdown" class="dropdown-menu 
+          <div id="notifications-list" aria-labelledby="navbarDropdown" class="dropdown-menu
           {%- if direction == 'rtl' %}
           dropdown-menu-right
           {%- else %}
@@ -59,14 +65,8 @@
           </a>
         </li>
         {% endif -%}
-        <li class="nav-item">
-          <a href="/user/{{ current_user.id }}" class="nav-link">
-            <i class="fa fa-user" aria-hidden="true"></i>
-            {{ _('המשתמש שלי') }}
-          </a>
-        </li>
       </ul>
-      <ul class="navbar-nav 
+      <ul class="navbar-nav
       {%- if direction == 'rtl' %}
       mr-auto
       {%- else %}