Update dpaste settings

Marco
1 parent f9159f05
Showing 3 changed files with 5 additions and 3 deletions Show diff stats
src/colab/custom_settings.py
src/colab/urls.py
src/templates/dpaste/snippet_details.html
@@ -313,7 +313,7 @@ DPASTE_EXPIRE_CHOICES = (
     ('never', _(u'Never')),
 )
 DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]
-DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab'
+DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis'
 DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
 try:
@@ -26,6 +26,8 @@ urlpatterns = patterns(&#39;&#39;,
     url(r'^signup/', include('accounts.urls')),  # (same here) TODO: move to nginx
     url(r'^account/', include('accounts.urls')),
+    url(r'', include('django_browserid.urls')),
+
     url(r'^planet/', include('feedzilla.urls')),
     url(r'paste/', include('dpaste.urls.dpaste')),
@@ -74,8 +74,8 @@
         <span class="glyphicon glyphicon-share"></span>
         </i> {% trans "Gist" %}
     </a>
-    <a href="/pastebin" class="btn btn-primary">
-        New snippet 
+    <a href="/paste" class="btn btn-primary">
+        New snippet
         <span class="glyphicon glyphicon-arrow-right"></span>
     </a>
 </div>
	@@ -313,7 +313,7 @@ DPASTE_EXPIRE_CHOICES = (		@@ -313,7 +313,7 @@ DPASTE_EXPIRE_CHOICES = (
313	('never', _(u'Never')),	313	('never', _(u'Never')),
314	)	314	)
315	DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]	315	DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]
316	-DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab'	316	+DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis'
317	DPASTE_DEFAULT_GIST_NAME = 'colab_paste'	317	DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
318		318
319	try:	319	try:
	@@ -26,6 +26,8 @@ urlpatterns = patterns('',		@@ -26,6 +26,8 @@ urlpatterns = patterns('',
26	url(r'^signup/', include('accounts.urls')), # (same here) TODO: move to nginx	26	url(r'^signup/', include('accounts.urls')), # (same here) TODO: move to nginx
27	url(r'^account/', include('accounts.urls')),	27	url(r'^account/', include('accounts.urls')),
28		28
		29	+ url(r'', include('django_browserid.urls')),
		30	+
29	url(r'^planet/', include('feedzilla.urls')),	31	url(r'^planet/', include('feedzilla.urls')),
30		32
31	url(r'paste/', include('dpaste.urls.dpaste')),	33	url(r'paste/', include('dpaste.urls.dpaste')),