diff options
| author | Aleš Smodiš <aless@guru.si> | 2015-10-04 19:45:55 +0200 |
|---|---|---|
| committer | Aleš Smodiš <aless@guru.si> | 2015-10-04 19:45:55 +0200 |
| commit | 5877ffd8aaffdf3e416dbb36e766736b866e5963 (patch) | |
| tree | d770d19c36b25039728079e6a0c3b0c7cfa26776 /index.html | |
| parent | c3bbf004fc6c9278f954b0b6c69e2a256351a7d0 (diff) | |
| parent | 6377d405a668b4523041fb6cbb881e752b833eb0 (diff) | |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -43,12 +43,12 @@ </ul> <ul class="nav navbar-nav navbar-right"> <p class="navbar-text" id="signed-in-title"></p> - <li class="dropdown lang-selection"> + <!--<li class="dropdown lang-selection"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true"> <span class="lang-choice"></span> </a> <ul class="dropdown-menu"></ul> - </li> + </li>--> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true"> <span class="glyphicon glyphicon glyphicon-user"></span> @@ -60,20 +60,20 @@ <li><a href="#" data-toggle="modal" data-target="#modalChangePassword" data-tkey="change_pass">Change password</a></li> </ul> </li> - <li class="dropdown"> + <li class="dropdown" id="settings_dropdown_menu"> <a href="" class="dropdown-toggle" data-toggle="dropdown" id="settingsTrigger" title="Settings, options..." aria-expanded="true"><span class="glyphicon glyphicon glyphicon-wrench" aria-hidden="true"></span></a> <div class="dropdown-menu" style="background-color: #fff"> <form class="form col-sm-12"> <div class="form-group"> <span class="small" data-tkey="language">Language</span> <a class="text-muted" data-container="body" data-toggle="popover" data-trigger="hover" data-placement="left" data-html="true" data-content="<span class='small'>Select the UI language.</span>" data-original-title="" title=""><i class="glyphicon glyphicon-question-sign"></i></a><br> - <select class="form-control"> + <select class="form-control" id="gui_lang_select"> <option value="sl">Slovensko</option> <option value="en">English</option> - <option value="d">Dolgooooooooooooooooooooooooooooooooooooooooooooooo</option> + <!--<option value="d">Dolgooooooooooooooooooooooooooooooooooooooooooooooo</option>--> </select> </div> - <div class="form-group"> + <!--<div class="form-group"> <span class="small" data-tkey="language"> Language </span> @@ -95,11 +95,11 @@ </label> </div> </div> - </div> + </div>--> <div class="form-group"> <div class="text-right"> - <button type="button" class="btn btn-default" data-target="settingsDropdown" data-toggle="dropdown">Close</button> - <button type="button" class="btn btn-primary" data-target="settingsDropdown" data-toggle="dropdown">Save</button> + <button type="button" class="btn btn-default" data-target="settingsDropdown" data-toggle="dropdown" id="settings_cancel_btn">Close</button> + <button type="button" class="btn btn-primary" data-target="settingsDropdown" data-toggle="dropdown" id="settings_save_btn">Save</button> </div> </div> </form> @@ -492,5 +492,6 @@ <script src="js/codeq/profile.js"></script> <script src="js/codeq/language.js"></script> <script src="js/codeq/problem.js"></script> + <script src="js/codeq/settings.js"></script> </body> </html> |