diff --git a/app/templates/add.html b/app/templates/add.html index fff2646e..d58b0791 100644 --- a/app/templates/add.html +++ b/app/templates/add.html @@ -70,7 +70,7 @@ {{ input('listen-port', name='port', type="number", title="Port for bind listen", placeholder="8080", size='5', required='required') }}
IP for bind listener, if empty will be assigned on all IPs. - Start typing IP, or press down.
If you are using VRRP, leave the IP field blank. If you assign an IP, the slave server will not start + Start typing IP, or press the "down" button.
If you are using VRRP, leave the IP field blank. If you assign an IP, the slave server will not start
@@ -162,7 +162,7 @@ {{ checkbox('antibot', title='Antibot Protection', desc='Antibot', value='1') }} @@ -201,7 +201,7 @@ Start typing options: {{ input('options') }} - or press down. Read more about options + or press the "down" button. Read more about options
Start typing saved options: @@ -245,8 +245,10 @@ - Advanced: - Show Advanced settings + + + + @@ -301,7 +303,7 @@
IP for bind listener, if empty will be assigned on all IPs. - Start typing IP, or press down.
If you are using VRRP, leave the IP field blank. If you assign an IP, the slave server will not start + Start typing IP, or press the "down" button.
If you are using VRRP, leave the IP field blank. If you assign an IP, the slave server will not start
@@ -316,7 +318,7 @@ @@ -374,7 +376,7 @@ {{ checkbox('antibot1', title='Antibot Protection', desc='Antibot', value='1') }} @@ -394,7 +396,7 @@ Start typing options: {{ input('options1') }} - or press down. Read more about options + or press the "down" button:. Read more about options
Start typing saved options: @@ -408,14 +410,16 @@ Default backend -
Start typing backend, or press down
+
Start typing backend, or press the "down" button
{{ input('backends', name='backends', placeholder="some_backend", size='30') }}

Note: If you want to use a default backend, you must create a new backend first.

- Advanced: - Show Advanced settings + + + + @@ -565,7 +569,7 @@ Start typing options: {{ input('options2') }} - or press down. Read more about options + or press the "down" button. Read more about options
Start typing saved options: @@ -609,8 +613,10 @@ - Advanced: - Show Advanced settings + + + + diff --git a/app/templates/admin.html b/app/templates/admin.html index 566d0bfe..b9d53012 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -352,23 +352,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/app/templates/ajax/stick_table.html b/app/templates/ajax/stick_table.html index ee41e7bf..c102f92d 100644 --- a/app/templates/ajax/stick_table.html +++ b/app/templates/ajax/stick_table.html @@ -5,7 +5,6 @@ $(document).ready(function() { $('#{{tables_head.0.strip()}}').on( 'page.dt', function () { $.getScript("/inc/fontawesome.min.js"); } ) .DataTable( { - "order": [[ 4, "desc" ]], "pageLength": 25, "columnDefs": [ { @@ -39,6 +38,7 @@ + {% if table[0] != '' %} {% for t in table %} {% if t != '' %} {% if loop.index == 1 %} @@ -46,16 +46,10 @@ {% set headers = headers.split(' ') %} - + + + - - {% if headers|length > 5 %} @@ -88,8 +82,7 @@ {{headers.11.split('=')[0].split('(')[0]}} {% endif %} - + @@ -145,9 +138,10 @@ - {% else %} - Table is empty {% endif %} {% endfor %} + {% else %} + Table is empty + {% endif %}
- IP - IPUseExp - Use - - Exp - {{headers.4.split('=')[0].split('(')[0]}} -
\ No newline at end of file diff --git a/app/templates/ajax/stick_tables.html b/app/templates/ajax/stick_tables.html index 9bf5c879..3d562c0e 100644 --- a/app/templates/ajax/stick_tables.html +++ b/app/templates/ajax/stick_tables.html @@ -6,7 +6,6 @@ $(document).ready(function() { $('#{{t.0.0.strip()}}').on( 'page.dt', function () { $.getScript("/inc/fontawesome.min.js"); } ) .DataTable( { - "order": [[ 4, "desc" ]], "pageLength": 10, "columnDefs": [ { @@ -45,15 +44,9 @@ {% set headers = headers.split(' ') %} - - IP - - - Use - - - Exp - + IP + Use + Exp {{headers.4.split('=')[0].split('(')[0]}} @@ -87,7 +80,7 @@ {{headers.11.split('=')[0].split('(')[0]}} {% endif %} - + diff --git a/app/templates/base.html b/app/templates/base.html index 157b508a..f724bf96 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -5,6 +5,9 @@ + {% if title == 'Login page' %} + + {% endif %} diff --git a/app/templates/include/admin_add_server.html b/app/templates/include/admin_add_server.html index 97601783..cc3dadd9 100644 --- a/app/templates/include/admin_add_server.html +++ b/app/templates/include/admin_add_server.html @@ -10,20 +10,20 @@ IP * - {{ input('new-ip', size='14') }} + {{ input('new-ip') }} Port * - {{ input('new-port', value='22', size='3') }} + {{ input('new-port', value='22', type='number') }} Enable {{ checkbox('enable', checked='checked') }} - Virt + Virt {{ checkbox('typeip') }} diff --git a/app/templates/include/admin_add_user.html b/app/templates/include/admin_add_user.html index 89db8496..894b919c 100644 --- a/app/templates/include/admin_add_user.html +++ b/app/templates/include/admin_add_user.html @@ -27,5 +27,5 @@ Email * - {{ input('new-email') }} + {{ input('new-email', type='email') }} \ No newline at end of file diff --git a/app/templates/include/admin_servers.html b/app/templates/include/admin_servers.html index dd53a5eb..270613f1 100644 --- a/app/templates/include/admin_servers.html +++ b/app/templates/include/admin_servers.html @@ -21,8 +21,8 @@ Slave for - Credentials - + Credentials + Description @@ -41,7 +41,7 @@ {% set id = 'port-' + server.0|string() %} - {{ input(id, value=server.10, size='2') }} + {{ input(id, value=server.10, type='number', style='width: 50px;') }} {% if page != "servers.py" %} diff --git a/app/templates/include/admin_users.html b/app/templates/include/admin_users.html index 6e307d5f..b6cdbd80 100644 --- a/app/templates/include/admin_users.html +++ b/app/templates/include/admin_users.html @@ -7,7 +7,7 @@ Password Active Email - Role + Role {% if page != "servers.py" %} Group {% endif %} @@ -46,7 +46,7 @@ {% if user.6 == 1%} {{ input(email_id, value=user.2, readonly='readonly') }} {% else %} - {{ input(email_id, value=user.2) }} + {{ input(email_id, value=user.2, type='email') }} {% endif %} diff --git a/app/templates/servers.html b/app/templates/servers.html index a4e6ba8f..6ed3ef4d 100644 --- a/app/templates/servers.html +++ b/app/templates/servers.html @@ -224,26 +224,5 @@ {% endfor %} }); - + {% endblock %} diff --git a/inc/add.js b/inc/add.js index bb28f601..716bdb21 100644 --- a/inc/add.js +++ b/inc/add.js @@ -902,9 +902,15 @@ $( function() { $('#add-userlist-group').click(function() { $('#userlist-groups').append(add_userlist_group_var); }); - $('.advance-show').click(function() { - $('.advance-show').fadeOut(); + $('.advance-show-button').click(function() { $('.advance').fadeIn(); + $('.advance-show-button').css('display', 'none'); + $('.advance-hide-button').css('display', 'block'); + }); + $('.advance-hide-button').click(function() { + $('.advance').fadeOut(); + $('.advance-show-button').css('display', 'block'); + $('.advance-hide-button').css('display', 'none'); }); $('#ssl_offloading').click(function() { if($('#optionsInput').val().indexOf('ssl_fc ') == '-1') { diff --git a/inc/awesome.css b/inc/awesome.css index 5a28f41b..976d1ce2 100644 --- a/inc/awesome.css +++ b/inc/awesome.css @@ -259,3 +259,18 @@ font-family: "Font Awesome 5 Solid"; content: "\f068"; } +.row-down::after { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f078"; +} +.row-up::after { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f077"; +} +.row-down .fa-chevron-down, .row-up .fa-chevron-up { + margin-bottom: -1px; + padding-left: 5px; +} + diff --git a/inc/runtimeapi.js b/inc/runtimeapi.js index 257039fb..df7f131a 100644 --- a/inc/runtimeapi.js +++ b/inc/runtimeapi.js @@ -181,7 +181,7 @@ $( function() { type: "POST", success: function( data ) { data = data.replace(/\s+/g,' '); - if (data.indexOf('error: ') != '-1') { + if (data.indexOf('error: ') != '-1' || data.indexOf('Invalid ') != '-1') { toastr.error(data); } else { toastr.success(data); @@ -249,7 +249,6 @@ $( function() { } else { var value = data.split(','); $('#list_select').find('option').remove(); - //$('#list_select').append($("").attr("value","All").text("All")); for (let i = 0; i < data.split(',').length; i++) { if (value[i] != '') { @@ -388,8 +387,6 @@ function addNewIp() { allFields.removeClass( "ui-state-error" ); valid = valid && checkLength( $('#list_add_ip_new_ip'), "IP", 1 ); var ip = $('#list_add_ip_new_ip').val(); - console.log($('#list_add_ip_new_ip').val()); - console.log($('#list_add_ip').data("list-id")) if(valid) { $.ajax({ url: "options.py", diff --git a/inc/servers.css b/inc/servers.css new file mode 100644 index 00000000..201c155f --- /dev/null +++ b/inc/servers.css @@ -0,0 +1,34 @@ +.ui-selectmenu-button.ui-button { + width: 10em; +} +.first-collumn { + width: 10%; +} +.container { + margin-right: 0; +} +@media screen and (-webkit-min-device-pixel-ratio:0) and (min-resolution:.001dpcm) { + .ui-checkboxradio-label { + padding-bottom: 0.6em !important; + padding-top: 0.6em !important; + } + .ui-checkboxradio-checked { + padding-bottom: 0.6em !important; + padding-top: 0.7em !important; + } +} +@-moz-document url-prefix() { + .ui-checkboxradio-label { + padding-bottom: 0.4em !important; + padding-top: 0.4em !important; + } + .ui-checkboxradio-checked { + padding-bottom: 0.4em !important; + padding-top: 0.5em !important; + } +} +.group_error { + display: none; + clear: both; + height: 60px; +} \ No newline at end of file diff --git a/inc/style.css b/inc/style.css index 1a8c8892..f360d322 100644 --- a/inc/style.css +++ b/inc/style.css @@ -313,12 +313,9 @@ pre { .advance { display: none; } -.advance-show { +.advance-show, .advance-hide { font-size: 13px !important; } -.advance-show a{ - color: #23527c !important; -} .addButton { padding-top: 15px; padding-left: 15px; @@ -381,7 +378,7 @@ pre { padding-left: 10px; } .cred-field { - min-width: 214px; + min-width: 225px; } .overviewTr { margin: 0; @@ -615,15 +612,15 @@ ul{ .ui-selectmenu-open, .ui-selectmenu-menu { z-index: 1010 !important; } +.ui-corner-all { + border-radius: 0 !important; +} #tabs.ui-widget.ui-widget-content { border-bottom: none !important; } .need-field { color: red; } -.ui-corner-all { - border-radius: 0 !important; -} a:active, a:hover { outline: 0; }