From 8b5fe2c109ccbf4c786d3b46d9787dfa961f18b0 Mon Sep 17 00:00:00 2001 From: Mohamed El-Kalioby Date: Tue, 15 Jan 2019 19:36:45 +0300 Subject: [PATCH] Some Fixes --- webapp/autoDeploy/autodeploy/views.py | 10 +++---- webapp/autoDeploy/static/img/logo.png | Bin 0 -> 9740 bytes webapp/autoDeploy/templates/base.html | 36 +++++++++++++++++++++++ webapp/autoDeploy/templates/deploy2.html | 2 +- 4 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 webapp/autoDeploy/static/img/logo.png diff --git a/webapp/autoDeploy/autodeploy/views.py b/webapp/autoDeploy/autodeploy/views.py index 70e9560..38ab833 100644 --- a/webapp/autoDeploy/autodeploy/views.py +++ b/webapp/autoDeploy/autodeploy/views.py @@ -122,8 +122,8 @@ def clone(request): server = Server.objects.get(name=form.cleaned_data["server"]) token=csrf(request).get("csrf_token") data="{scm: '%s', ip: '%s', port: '%s', project_name: '%s',csrfmiddlewaretoken: '%s' }" % (project.repo_type,server.ip,server.port,project.name,token) - return render_to_response("base.html", {"ajax":True, "data": data, "dataType":"html", - "title":"Cloning "+ project.name, "function":"clone"}, context_instance=RequestContext(request)) + return render_to_response("base.html", {"project":project,"ajax":True, "data": data, "dataType":"html", + "title":"Cloning "q+ project.name, "function":"clone"}, context_instance=RequestContext(request)) @login_required(redirect_field_name="redirect") @csrf_protect @@ -166,7 +166,7 @@ def listTags(request, server): table_to_report = RequestConfig(request, paginate={"per_page": 15}).configure(table) if table_to_report: return create_report_http_response(table_to_report, request) - return render_to_response("deploy2.html", {"count":len(res),"mode":"tags","tags":table}, context_instance=RequestContext(request)) + return render_to_response("deploy2.html", {"project":project,"count":len(res),"mode":"tags","tags":table}, context_instance=RequestContext(request)) @login_required(redirect_field_name="redirect") def deploy3(request): @@ -179,7 +179,7 @@ def deploy3(request): project=Project.objects.get(name=request.session["deploy_project"]) server=Server.objects.get(name=request.session["deploy_server"]) - return render_to_response("base.html", {"ajax": True,"data":data,"dataType":"html","function":"deploy","title":"Deploying %s on %s"%(project.name,server.name)}, context_instance=RequestContext(request)) + return render_to_response("base.html", {"project":project,"ajax": True,"data":data,"dataType":"html","function":"deploy","title":"Deploying %s on %s"%(project.name,server.name)}, context_instance=RequestContext(request)) @login_required(redirect_field_name="redirect") def edit_ssh_key(request, sshKey): @@ -317,7 +317,7 @@ def listCommits(request,filter=None): table_to_report = RequestConfig(request, paginate={"per_page": 15}).configure(table) if table_to_report: return create_report_http_response(table_to_report, request) - return render_to_response("deploy2.html", {"mode":"commits","commits": table,"branchs":branches,"current_branch":filter}, context_instance=RequestContext(request)) + return render_to_response("deploy2.html", {"project":project,"mode":"commits","commits": table,"branchs":branches,"current_branch":filter}, context_instance=RequestContext(request)) @login_required(redirect_field_name="redirect") diff --git a/webapp/autoDeploy/static/img/logo.png b/webapp/autoDeploy/static/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a9d2197fcc27603a01172a919e72623c909ce304 GIT binary patch literal 9740 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 z zAeaj5Kk}aJZ`Oj-#v8~ca7G|dACjqjTHTt=6wz-bMi^m^7yJL1Z2!;Mcf1UXx-Z1~ zg!!juYP}-d185bMc1Wg7#wc}uH&4&Xva;ad6quLzuFVjUNPnoUWuss}y>Sp98=INa zS5a2x_Paj~^ZC>1O#_(4E7Si4s3TR4p@R1h4h=WQ{r5WwgMZ|0D`ZSW;Qqq1?GGkz z8=A@g>)ye96ztr7 zf<$~k9se0`hQpL$9g0*s(0DALn)7s1QTMDUAef8Gs$TYuYfz)_KBIy%4D(J*Q~^W) zIHqix^h80rVY}R$u^XYGMD_?{_cZ7u;3Ev>kl$jA}WqL6t$W`LHPLiSXyTNaZ$&Hh{U9% zgR9^?Ua<%?4;~?g`N{>LH4#YUR{{p$eh(k7!rc;d`~O(d_Q|IwZiKz-Pmkbw7eYf- L=lTa_i{SqTOG~J1 literal 0 HcmV?d00001 diff --git a/webapp/autoDeploy/templates/base.html b/webapp/autoDeploy/templates/base.html index ed23b17..a832c2e 100644 --- a/webapp/autoDeploy/templates/base.html +++ b/webapp/autoDeploy/templates/base.html @@ -14,16 +14,52 @@ + + + {% block head %} {% endblock %} {% if ajax %}