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] 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@OHUJF6o#Jyr883yyy0Cc-ateUv=tGrs8BBm3Yr*A)JTwpF)kW+UJ_Xps}dIw
zg}5P6)IZQP(M^%iF3_476Kfk2!MMPn@dBoudH`#|e_+B)-Z}5{&dhhd?|?z>%uL3w
zMk8d2%N3197Lfr(p5tbs{^Pa0XDDaAJbLmNtxZR}tCMcIiO=W5<ME)_zL9M0BDLuS
zot>Se)IG%Qc9T?i3*!kLHQ$SNL&xcKq7(*DMP9FDXLOVXdEYK;9*@x8*2cTgXVi1T
zwjU@pA5leyqW2694RO7>8P)oQP$)!ye?PvyH>l1i!C(+I&x85GTg;`u(5zp%)7pyP
z?<e_M1l1+$os?d;rI-B`O6?%pDIG3`F<t#hM@I)qIS(*azQpBnF)%QI)}-^ix0jUS
zL2AxFrJ(8_-QC?pqY=D4J($X3X!YMwq^hDoK+aY20j1H8v7!aFG)g!eMro1WBK6WI
z%nf~*PK!S_io@X`)&4p$?`bzZf&XCw`;!v8Tw@@Aea+!`FmvhJxtkWG6v39X(%G=R
zs&XH*4wdBA9#Cd%o^w!LQ850g*=V!pEZeg<{@=Rvit6gssmtTMXjOH2`O3m=amJLT
zW#sMti|k6Cf22Nv;xhM6K{oD~!aI+aP2uc$)(w+`x~)qrlbPa$e=rt<`=gLC3~6$*
aD+U<ONN6M*Mr5b@<q1WkMuf*Smi-2?&#Mjq

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<5(|0R}M0U}j(t1F|%L7$l?s#Ec9QKoSUma_HdypajxH1Bmm9RxV8+^`r*s
r@jZD&B8bUEDh4VePd%ybCsqAmiZ2F+|NjyA05F4qFiZ@_$0Y^;K}h09

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<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYJy!T<mN8HOAF_3gXp*Y_W!
zzJK~G_4m(TR$~44`}+^}wFwzJJ4KX!wDU^;?-Y>xKULfO<>@(#TK@k1OE8?CoH`rS
z%)tMDsZaQcODor=Us|yyePwv!>1HOO|9AHu494b;Z+D(}z1euA=GBUQO?P^itX`$+
z{QpwLgsmVx2tQk}ZQ5EL&;Lha%dUgPRvl>ia^+swpYJ~fVdnk*^i}HP$?K7CcAm^$
zuHp3mKwQb`_xsOB!tkE3oU<!*-TuGZdo~Ux_W8mcf1nw{UvE6}dcEdg@5{xzCV=o3
ztFX^|ywcvn_#patV$Hp^S|0zOFW5f$)$+Z4pD*1F0P5vOvS0Dj$?HiV_Z>^Bxx7Zx
z?f<id+k0SsxY@a2$tqQ+|5qAj>;{Xi+}HGW$Ek`R&)?d?%z)9icI=63W)S$lv!Z_X
zt7|vSU*EiAu)n^2I!NroiZ!J$b-3uifBrD<D5+l1#wGE$iBaHxBa^`YW*|LD&FJN)
z=P%`P=|dO)^7^gZ(~DPv9s%R@)y><^Kfis0`xjm9(B?A$(=`HruxDWS48#Z6f%JR^
Vh6W)0fSG~eCy@O^9-$7V2LQ^e?CSsk

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.43.0