From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 9 Sep 2013 09:27:22 +0000 (+0200)
Subject: Fix: conflict config.py
X-Git-Tag: myslice-0.2-2~1^2~4
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=ee60f435987235b078b8b4693a3f916e1fdb83a8;hp=1aea42c3668602aacfe22bc762ee939672129f53

Fix: conflict config.py
---

diff --git a/myslice/config.py b/myslice/config.py
index f6285b25..e6c2d25b 100644
--- a/myslice/config.py
+++ b/myslice/config.py
@@ -11,7 +11,7 @@ class Config:
 #    manifold_url = "http://manifold.pl.sophia.inria.fr:7080/"
 # the OpenLab-wide backend as managed by UPMC
 #    manifold_url = "http://dev.myslice.info:7080/" # development version
-     manifold_url = "http://test.myslice.info:7080/" #stable manifol
+     manifold_url = "http://test.myslice.info:7080/" #stable version
     # exporting these details to js
     @staticmethod
     def manifold_js_export ():
diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 4f332e4a..85faad8d 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -54,10 +54,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
             #recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr']
             if cc_myself:
                 recipients.append(email)
-            msg = render_to_string('slice_request_email.txt', form.cleaned_data)
+            msg = render_to_string('slice-request-email.txt', form.cleaned_data)
             send_mail("Onelab New Slice request form submitted", msg, email, recipients)
 
-            return render(request,'slicereq_recvd.html') # Redirect after POST
+            return render(request,'slice-request-ack-view.html') # Redirect after POST
         else:
             return self._display (request, form)
 
@@ -65,7 +65,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
         return self._display (request, SliceRequestForm(initial=self.authority_hrn_initial(request)))
 
     def _display (self, request, form):
-        return render(request, 'slice_request.html', {
+        return render(request, 'slice-request-view.html', {
                 'form': form,
                 'topmenu_items': topmenu_items('Request a slice', request),
                 'username': the_user (request) 
diff --git a/portal/templates/slicereq_recvd.html b/portal/templates/slice-request-ack-view.html
similarity index 100%
rename from portal/templates/slicereq_recvd.html
rename to portal/templates/slice-request-ack-view.html
diff --git a/portal/templates/slice_request_email.txt b/portal/templates/slice-request-email.txt
similarity index 100%
rename from portal/templates/slice_request_email.txt
rename to portal/templates/slice-request-email.txt
diff --git a/portal/templates/slice_request.html b/portal/templates/slice-request-view.html
similarity index 100%
rename from portal/templates/slice_request.html
rename to portal/templates/slice-request-view.html
diff --git a/portal/util.py b/portal/util.py
index df3606cb..918f16c6 100644
--- a/portal/util.py
+++ b/portal/util.py
@@ -169,7 +169,7 @@ def slice_request(request):
             slice_name = form.cleaned_data['slice_name']
     else:
         form = SliceRequestForm()
-    return render(request, 'slice_request.html', locals())
+    return render(request, 'slice-request-view.html', locals())
 
 def slice_validate(request):
     pass