From b6dc3827437f1717ac4c09304ad0c9fc2ea22f7d Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 16 Dec 2014 17:30:42 +0100
Subject: [PATCH 1/1] how to do ssh for windows users added :D + portalwise
 fevicon added

---
 portal/static/img/fed4fire_favicon.ico        | Bin 0 -> 1406 bytes
 portal/static/img/myslice_favicon.ico         | Bin 0 -> 894 bytes
 portal/static/img/onelab_favicon.ico          | Bin 0 -> 1150 bytes
 .../fed4fire_slice-tab-experiment.html        |  10 +++-
 portal/templates/onelab/onelab_base.html      |  49 ------------------
 portal/templates/slice-tab-experiment.html    |  12 ++++-
 6 files changed, 19 insertions(+), 52 deletions(-)
 create mode 100644 portal/static/img/fed4fire_favicon.ico
 create mode 100644 portal/static/img/myslice_favicon.ico
 create mode 100644 portal/static/img/onelab_favicon.ico
 delete mode 100644 portal/templates/onelab/onelab_base.html

diff --git a/portal/static/img/fed4fire_favicon.ico b/portal/static/img/fed4fire_favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c2d91a005e5daa075f431c62c4dd9172d370621e
GIT binary patch
literal 1406
zcmeH{-AmI^7{@<9b?$f0H0{ma)9g(%n`zC~GJCO7d$Czs5Cs*9c@fctbY}&5F<T{F
zD5Z2Gl+`~VgSwfC+l93tf@~v5r3=HN7me*K=31M7Lf{7;&hz=6bKr0;9?;Op%w(EI
z17rbtKqSfmH1z1E7G0)E=w<#3^b2mDJbQ}lP{{j=^qkvxJRV#w7kcS;k}W-?Hoc;|
zyPK4{$Mp5}kz~Gu;j}^&xRJLM4u=EX>_eD+xZQ5#d4=Af5S<EnDoAHX2Os=j5Em7)
z^e4J~3}GKbEBeUz_&7IPTM?G8`2Bu{hKBGAzC$=d3=a<@@?DrNzsF?#jkJ8@UVA%U
zub1Q-L4;Ew&nWb}3Q_$Ay>=9NR>743#_PZ6>gpmX_YsE5*EpR{Mn*=EO^TNT1Eds>
zV!!m9!m0=K_VyAA1#$QHW3+{l^*_*UVT3J=&*wvwd_r&ZVyI|CSVIH?0rWP7Y*UD<
zpD{HIVmzl1C#Ps`ZYH(*ZNi7oGRuF!p``dDH)s@WwjYZHb60L$xNS*F5$s5_&WBx9
zl?R!3v?Q<gus&z|f+J#0;q+0Hp|m=8)&AwNdz;cLYHHS}u8#S#bv0#WYt7{`$CxEE
z^7s8y_9ibrULV)UC_6Ai*}8j%?>S+c;n|BUTM~o1ohu@PFi!E(zkN6i52qkw0@8}$
Zng$aY@tVwr$#PIF(F(Reusm9k><_Wes}2AF

literal 0
HcmV?d00001

diff --git a/portal/static/img/myslice_favicon.ico b/portal/static/img/myslice_favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..08b8cd4b75bfceee65f40bc267a531cad73e4385
GIT binary patch
literal 894
zcmZQzU}Ruq5D;JhgA8T{1~CQ(1`P%V29S^f0|Nsig9Jp98A2h0|AP`p6Ad8FCt5k3
s)RPL1@5v()K};r6@$o%ms;4y=O!39Q@E-{uU|;}am>7%?qOpkq06|FNM*si-

literal 0
HcmV?d00001

diff --git a/portal/static/img/onelab_favicon.ico b/portal/static/img/onelab_favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a2754aa13a71b702c90487b89fb53945cc5d98fb
GIT binary patch
literal 1150
zcmZQzU}Ruq5D;KsU}R8W$Y5b$5My9q&|qL-5MW?nP+)+Fg8>VKLI(f;{~vbv*SGJY
zU*CU_`u^#&)ZagUS&8-I@9#g@*Cu4_>=aS@(atOVzf(Z&|5R=Bm#60}YWe&3FTrqn
za_VeQGXwwsr9R;&F0EXferd&;^p)X>r<<9C{@>kuFc_OVzTJ7^^=9LdnpZ3KHQni5
zvU-)O^Z!c~6Sji*ApC5>wrOj1JpUhwExQgDTXmr6%awa!f4=_|gqipI(^sjFC$C4o
z*?BU1xrWpK192s%-|s&k3B!BBa?Y;Mb^HHr@7Xw**yjs({QrFaDg5=uBd^zM4)(rW
zylVmoZ?OvdyvHl;EsPJMk0;jLTdU>q|M`OLlV2_0+xPj>-GD#efAS;QulVWY^(2t{
zjwRJxUZd&u|JlOrJupAq>|C&9m8#SKD-APtgT+?vYkIrmRK<_yZ|z`a!01~$_QW+a
z2>jn!Q9t|DwVURzZ{9K3U*A3*Bz9rNno^iLT=d^Rf0%caR4-`blK9)iDDc0LN#K7o
zqrm@3YDO<VJ%1^WOCP%Um)CFQo?g5X^yt*tpjS6<JOBLl4enobwL_cF!0;alf3Rm@
k_-xO>aDbhG;q!b3h6Z*9h6l_H3_s^HF#M25RSVJw0LrWE>i_@%

literal 0
HcmV?d00001

diff --git a/portal/templates/fed4fire/fed4fire_slice-tab-experiment.html b/portal/templates/fed4fire/fed4fire_slice-tab-experiment.html
index b32a115c..0ca237fd 100644
--- a/portal/templates/fed4fire/fed4fire_slice-tab-experiment.html
+++ b/portal/templates/fed4fire/fed4fire_slice-tab-experiment.html
@@ -14,11 +14,17 @@
 		$ ssh {{ple_slicename}}@{{resource}}<br>
 	{%endfor%}
 	</p>
+	 <h4>Windows users</h4>
+	 <p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
+
 	{%else%}
 		<p><b>NOTE:</b> You did not reserve any PLE resources yet. Once reserved, you will get the actual SSH command. A specimen command is given below:</p>
 		<p class="command">
     		$ ssh {{ple_slicename}}@planetlab-resource.hostname.com<br>
 		</p>
+		 <h4>Windows users</h4>
+		 <p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
+
 	{%endif%}
 	<p><strong>NOTE:</strong> Your original slicename <b>{{slicename}}</b> has been converted to PlanetLab specific format <b>{{ple_slicename}}</b> in order to do SSH.</p>
 	<p>Please note that the first '.' is replaced by number 8 and the rest of the dot/s are replaced by underscore/s.</p>
@@ -36,7 +42,9 @@
 	<p class="command">
 	$ ssh {{slicename}}@nitlab.inf.uth.gr
 	</p>
-	
+	<h4>Windows users</h4>
+	<p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
+
 	<p>
 	<!-- In order to connect to NITOS server he has to upload his public key on the server. 
 	For now we do it this way: http://nitlab.inf.uth.gr/NITlab/index.php/your-ssh-keys. 
diff --git a/portal/templates/onelab/onelab_base.html b/portal/templates/onelab/onelab_base.html
deleted file mode 100644
index fdab3522..00000000
--- a/portal/templates/onelab/onelab_base.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{# This is required by insert_above #}{% insert_handler %}<!DOCTYPE html>
-<html lang="en"><head>
-<title>OneLab - {{ section }}</title>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="shortcut icon" href="/static/img/myslice-icon.png">
-{# This is where insert_str will end up #}{% media_container prelude %}
-{% include 'messages-transient-header.html' %}
-<script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
-<script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
-<script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>
-<script src="{{ STATIC_URL }}js/myslice.js"></script>
-<script src="{{ STATIC_URL }}js/myslice-ui.js"></script>
-<style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>
-{{ header_prelude }}
-{% block head %} {% endblock head %}
-{# let's add these ones no matter what #}
-{% insert_str prelude "js/jquery.min.js" %}
-{% insert_str prelude "js/angular/angular.min.js" %}
-{% insert_str prelude "js/jquery.html5storage.min.js" %}
-{% insert_str prelude "js/messages-runtime.js" %}
-{% insert_str prelude "js/class.js" %}
-{% insert_str prelude "js/plugin-helper.js" %}
-{% insert_str prelude "js/mustache.js" %}
-{% insert_str prelude "js/hashtable.js" %}
-{% insert_str prelude "js/plugin.js" %}
-{% insert_str prelude "js/manifold.js" %}
-{% insert_str prelude "css/manifold.css" %}
-{% insert_str prelude "css/plugin.css" %}
-{% insert_str prelude "js/bootstrap.js" %}
-{% insert_str prelude "css/bootstrap.css" %}
-{% insert_str prelude "js/bootstrap-datepicker.js" %}
-{% insert_str prelude "css/datepicker.css" %}
-{% insert_str prelude "js/bootstrap-slider.js" %}
-{% insert_str prelude "css/slider.css" %}
-{% insert_str prelude "css/topmenu.css" %}
-{% insert_str prelude "js/logout.js" %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
-</head>
-<body ng-app="ManifoldApp">
-{% block container %}
-  	{% block topmenu %}
-  	{% include theme|add:"__widget-topmenu.html" %}
-  	{% endblock topmenu %}
-	{% include 'messages-transient.html' %}
-	{% block base_content %}
-	{% endblock %}
-{% endblock container %}
-</body>
-</html>
diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html
index 9dca1d1b..29b7bafa 100644
--- a/portal/templates/slice-tab-experiment.html
+++ b/portal/templates/slice-tab-experiment.html
@@ -14,12 +14,16 @@
 		$ ssh {{ple_slicename}}@{{resource}}<br>
 	{%endfor%}
 	</p>
+	 <h4>Windows users</h4>
+	 <p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
 	{%else%}
 		<p><b>NOTE:</b> You did not reserve any PLE resources yet. Once reserved, you will get the actual SSH command. A specimen command is given below:</p>
 		<p class="command">
     		$ ssh {{ple_slicename}}@planetlab-resource.hostname.com<br>
 		</p>
 	{%endif%}
+	<h4>Windows users</h4>
+	<p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
 	<p><strong>NOTE:</strong> Your original slicename <b>{{slicename}}</b> has been converted to PlanetLab specific format <b>{{ple_slicename}}</b> in order to do SSH.</p>
 	<p>Please note that the first '.' is replaced by number 8 and the rest of the dot/s are replaced by underscore/s.</p>
 	<p>
@@ -35,7 +39,9 @@
 	<p class="command">
 		ssh {{username}}@fit3-dev.inrialpes.fr
 	</p>
-	
+	<h4>Windows users</h4>
+	<p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
+
 	<h3>NITOS</h3>
 	
 	<p>
@@ -45,7 +51,9 @@
 	<p class="command">
 	$ ssh {{slicename}}@nitlab.inf.uth.gr
 	</p>
-	
+	 <h4>Windows users</h4>
+	 <p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
+
 	<p>
 	<!-- In order to connect to NITOS server he has to upload his public key on the server. 
 	For now we do it this way: http://nitlab.inf.uth.gr/NITlab/index.php/your-ssh-keys. 
-- 
2.45.2