From 72bf9b1e9f01d0b7d50c3ee1d03b2bc542f9684a Mon Sep 17 00:00:00 2001 From: deflax Date: Fri, 23 Mar 2018 00:15:50 +0200 Subject: [PATCH] various panel changes --- app/models.py | 4 ++-- app/panel/forms.py | 6 +++--- .../panel/icons8-administrative-tools-100.png | Bin 0 -> 5503 bytes .../images/panel/icons8-processor-40.png | Bin 0 -> 568 bytes app/templates/nav.html | 9 +++++---- app/templates/panel/deploy.html | 18 +++++++++++------- app/templates/panel/vdc_pool.html | 6 ++---- 7 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 app/static/images/panel/icons8-administrative-tools-100.png create mode 100644 app/static/images/panel/icons8-processor-40.png diff --git a/app/models.py b/app/models.py index 8f6746b..5dae440 100644 --- a/app/models.py +++ b/app/models.py @@ -22,7 +22,7 @@ import onetimepass class Permission: DEPLOY = 0x01 - ADMINISTER = 0x80 + ADMINISTER = 0xff class Role(db.Model): __tablename__ = 'roles' @@ -36,7 +36,7 @@ class Role(db.Model): def insert_roles(): roles = { 'User': (Permission.DEPLOY, True), - 'Administrator': (0xff, False) + 'Administrator': (Permission.ADMINISTER, False) } for r in roles: role = Role.query.filter_by(name=r).first() diff --git a/app/panel/forms.py b/app/panel/forms.py index bb2ce7a..ee4d8b0 100644 --- a/app/panel/forms.py +++ b/app/panel/forms.py @@ -13,10 +13,10 @@ class OrderForm(FlaskForm): vmtype = SelectField('Type:', choices=vmtype_choices, coerce=int) cpu = DecimalRangeField('Processor Cores', default=2) - memory = DecimalRangeField('Memory', default=512) - storage = DecimalRangeField('Storage', default=10) + memory = DecimalRangeField('Memory', default=2048) + storage = DecimalRangeField('Storage', default=20) - alias = StringField('Machine Alias:', [validators.Regexp(message='ex.: myservice1.com, myservice2.local', regex='^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,3})$'), validators.Length(6,64)]) + alias = StringField('Name:', [validators.Regexp(message='ex.: myservice1.com, myservice2.local', regex='^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,3})$'), validators.Length(6,64)]) submit = SubmitField('DEPLOY') diff --git a/app/static/images/panel/icons8-administrative-tools-100.png b/app/static/images/panel/icons8-administrative-tools-100.png new file mode 100644 index 0000000000000000000000000000000000000000..7c9d285fcc36dc6664ebf89976198895d806b3e4 GIT binary patch literal 5503 zcmV-_6@coAP)1o55=Dv)1Um`=qLD<$ z;SRSu`D4*YUfaDxv-Noo@8RxdXJ_}jGryVN{ALzD;S)Z=H)5a*V1$*M3%`dVlMNlD ziMoB8=KrLRiWGK+j37&Xb|}H_io6Y23?8bw?CnX1pIO?_7v%~!%0L$&SZuDyMHm+Y zz+&sLKOFAz^cB{DEM(8rBP*3(MF%+5RpJwrl} z-u7ceQf$!2jqFJ~WbDY05JU(b0k8-`h5>5Z(b%lP zceEm`7E(Ix2`Tg!-5jA&P05qTw z*d;B>j{WQBm4vU<;bG7SvM#^K)*RXVIZev12*G0RE8Fbx89Y37l&QRro-60nm8$!{ zmcS7y`1PHHh&N7sZBB=&%)`up3$kMS*=V7*eFOM5kkR|M0TX218*f;eZjAhU5HA2} zUEjwzY)r~dW@1(n2{DmyS|H!vN30T22*lUP?Y{DmZnLH%j-BOFV*Y`X(|6;!s zq!;}vNPfOlPS^|ABX|k00mMYwm@_e*DLE-vl!58=sZw(BMlBx}-=d|xyT-VIA1r8} z|Kt38q4if;3<=WN%sj72rLe>0eD84n()Ped>8#j(EJdiw?|`LUC!RVwmAomVum$10 z?GM}?Do4-X_y4ov&JSa5J7xp~2xGvaymgFCbjIcWvD?*zems|15j?aBg4fa?= zf~?qF_*Eg~FFQZB3OK029!0We@1_N%zK&bI?br-OQ+5HF00}XXESruwF6q*;0n6o(2>9g7c2PiVkJ`l>=ei?5-~%-GCCi!-o!X; zWTzz%Wsl&)OO;(;|8(ER1>XzioIzdMnk~nts)&yPOIB(EPc9nY{aa(Ji}IRAN~#*T zS=)$5eekigSQH+cKbD;I;C*{SK%yNI9J(OkpxpzF?NIO1Yf`XWtGLU)lh?goo7JK) zDkYwr^aL_fjX6dqqVmaNp^#1I08J78EOm>dWCB+?3zF_07m zcbrh)uGgYKj2StM2&=+7C$8dAHKHOT$WBWjJ1w5f)OhR>-fv^x)KQexHiE?B5n>DQ zSfFzStRXA6eDD}(?||O^e`y_wx9?>NW0b|U7&E&?)LE8y=QT{JqY9t5!Enh&p)nl`AYBiS+v_7 z-;ju0fH@N~`a}$e6><{>P7Hu(8{{NFR3DTf(q?7$1l>g^5xKH0@f-fq`xIow_G2js z`2*0$4Kv0V?;Qmq-VRyudN+2UiBKRj4&v;A(;8*wn6z%coP-xwY(JLbE3MC4AvEO` zARb`R^vtmPm*VY^9;+Mi!GaKw5v!LioG6N5(e%u&kMTlPUiO*R+m|c1otTB>%K#~f z(d4ElhP8n4cKyN!krv$u^amx}H6=Gav3J15msf8-KGRz|uYzc38c+{VSKrF%s}D@> zn8sm+^uV320Yv~AG5R1hTzq`Bin{vNu8;K|i}#U`S3wSJ$U9>}E(K~O@c!9yKDu1# zEvX@_3XF^!T+Ng(gn*H;;jwQgFIDp1+48Qgb&Uo2=z$G+XS}8LdAfHuE-4j?*A~Y87+qCdnpksqR z&8J=|Oto5N0g@>I<3oZRK{ei^ewHBPq^K zW^!~;7;@DF7w{Ovp@P z`P^K;7q18yGYl+Yx<9w>w(+NPHJmN0r^V?#awpai!L;l|mQ76~eV8LG=T$YhTJPUW ztVzj%lQ+0je!J_dV$_IF?R$Ps(A`wSw`s-pV=1UgfqYmHgHR(P%tD-O_J*Ffj&he(h5wSZ$ zs^tJ3!jjq6-tl-{gY&c3s#~%>n#S?VbzH4(=IblRg3TT-~a7vVCU}PPabYH!dT#A}cxe>F=-3I_f2P32+2h z|Kok-i%V;oU%z^*X+&LPJKNvB$oi)yk)CK?l&A>(n%q8S9y5|+ICWY7UwG8Q58q#z`QE>OY4XU2 z#wNY32tk|M!>fC*(B|@lRHkS@*OZ#j)0LD$bIiSZ>Mf<4&p}N#}94n`; zNpB-&j~@1im)4H?jL|%PxOVJQGe-~K1yI}A&YQ>0jib7V@pDblj-LA=q`s!bD5eAv zFbC-EEb~ez^9wg`xAMVNJ>p|*dR*1ZpB=Z>Y+kmtV?Hw`HMR!e#FaWK?gY_)^+BK} zIHjw_5SR+pH!R5Ne|^^uj0Q+a^gXz+D#iv=_fv4T8Y#h|2r`qSo;IHop6V;R?DWRzxmQ-<%9-Z3nQke>9e|NYsI zh!C8JrL`@zb{gN5c*jojIo(T2yki&WW16zs)RPWK`Z-Lbh{{x385ySCmTvO>YI2QReQiGG-9vPVYs$-`aKcIQZsAc&Gxd20BY;~53brmSc;!9EQUUbP3tv@}O_E4# z7Dbjt|eQ;r&y%xoOem$?=hUV^7#c z%%Cy|)wp}ZSD@VfGgXw|Ht$*=Xo8A5S+V_t98J{@&?(0B(P=@80ea}nFh^)}B=@5T zK~8E6IjQ%yhwoi99C)JpyGD=m8BM6d72nE_M4;eK+ttzp6obBiw8X zZR&R*scLBFoBw^DR|`scwV;%5{m*$?+Kr16aHPI(Gr4^yN+IA+3Xx9 zWe0vIq?Gz<*E>$#OB`Sf>A5s8s(eR>i}vF1Wm4M`Y3y8OSIZj4Mby4CoB4S8o) zY(F-)Ype0Q%}(ApSj3DmY0R5E!qAJp`hqtK?~P~s!^tXIT`J#RmGeMA-T9kMy!htj z?x2g_WDa+*sUSdhJlcU)D`H3WkxYD&>??8UO z(DrRwuvJmCNeK1=w6wcSJwr%D=l`&11bUIs_w(xTb?g^9#D z%x~Qh(EZ*o2qE{vYwLb`{Hk z#iK}ywegDsB@cudU8(jy7@m<8NB-IgM20a~V8Hix+wt9n&b^x!ZjWn^%Mpmbk&+{H zHtP*7?R<2(k~a?*bK+v?TMP!`@tLXo!?Nt4rfDXRjOE3r#)nl57)0+=?;N+h2E69& zwRx3wP5n}iCuXG)8DZgH_T2Efbb4B59RIv_JdOYx@0elG2-2H^O>=JmTY;@Bwia#^ zQm(J9Z>7Vd644J`&bj~O>p~5hRUE91VBL^27SWI)zSY0$L!>& zKCc;F3<*IxyTV8*sk&`=rSXtrNC?u~j#Tus9qDg|gdn}`NPmq-28tme2;6H&+<(Ra z!h>>P=nW}3f?%U2C9m%KXrPPJXAGGd(%X*wIWtJY1%hM6=EAQEWT1uC%MdJsp%eXn zw!De+o$mJ`B}g!=+I%8k3jS%J%VCxw(`5an@c+B2%C&nXfy4j+002ovPDHLkV1lQE Bzv=)0 literal 0 HcmV?d00001 diff --git a/app/static/images/panel/icons8-processor-40.png b/app/static/images/panel/icons8-processor-40.png new file mode 100644 index 0000000000000000000000000000000000000000..edc8b03b1ee2747100c5eec823481e3ec3bb3f31 GIT binary patch literal 568 zcmV-80>}M{P)4kjRQp3+zr9I|%o7?yKB!K`>DP~bAW&>^05*Q_OFObat!HIP!z)wG=lMX{fLa;X_ z*>Sa$t&a8?)Bp~CmfP7_OC?u=R|mju_tMt=^Em)>TnoXMbV3sc0Osm4q?9SD&j7}c zlBl4Lph1d$Vw30+n?#q`Bta0HWEMP|B&?F(vq>^0LxT6qbX|dNu{@ikVJk=l-%9>jVoha| z+KWQ%#h-2I7Hc6*LZ(;<-f4Av!7KXVz4HM>@D|la{+m&73O9F87t(Q(!Ak2R1aC8m zf~UdxvZb0`M>V^S`c1vxZEno{RX6tn$vrp Deploy Application +
  • Deploy
    • + {% endif %} - -
  • Live Chat
    • @@ -49,10 +48,12 @@
    • diff --git a/app/templates/panel/deploy.html b/app/templates/panel/deploy.html index 917ac77..3cf81e2 100644 --- a/app/templates/panel/deploy.html +++ b/app/templates/panel/deploy.html @@ -1,11 +1,15 @@ {% extends "base.html" %} -{% block title %}Deploy New Instance{% endblock %} +{% block title %}Deploy a server{% endblock %} {% block scripts %} {{ super() }}