Changeset 6181

Timestamp:

Aug 12, 2008, 8:01:34 PM (17 years ago)

Author:

RIck van der Zwet

Message:

Converted the _ to -

Files:

• exodus/urls.py (modified) (2 diffs)
• exodus/views.py (modified) (5 diffs)
• exodus/wllogic.py (modified) (1 diff)
• templates/404.html (modified) (1 diff)
• templates/500.html (modified) (1 diff)
• templates/admin/base-site.html (moved) (moved from templates/admin/base_site.html ) (1 prop)
• templates/exodus-template.html (moved) (moved from templates/exodus_template.html ) (2 diffs, 1 prop)
• templates/exodus/addinterlink.html (modified) (1 diff)
• templates/exodus/addlocation.html (modified) (1 diff)
• templates/exodus/addnic.html (modified) (1 diff)
• templates/exodus/addnode.html (modified) (1 diff)
• templates/exodus/addomni.html (modified) (1 diff)
• templates/exodus/head.html (modified) (2 diffs)
• templates/exodus/index-old.html (deleted)
• templates/exodus/index.html (modified) (1 diff)
• templates/exodus/node-detail.html (moved) (moved from templates/exodus/node_detail.html ) (1 diff, 1 prop)
• templates/exodus/rc-local.txt (moved) (moved from templates/exodus/rc_local.txt ) (1 prop)
• templates/exodus/rc-node-local.txt (moved) (moved from templates/exodus/rc_node_local.txt ) (1 prop)

exodus/urls.py

@@ -2 +2 @@
 
 from django.conf.urls.defaults import *
-from conf.exodus.models import *
+from exodus.models import *
 
 node_dict  = {
@@ -16 +16 @@
 
         # config urls
-        (r'^(?P<object_id>\d+)/dhcp.conf/$', 'conf.exodus.views.conf_dhcp_conf'),
-        (r'^(?P<object_id>\d+)/named.conf/$', 'conf.exodus.views.conf_named_conf'),
-        (r'^(?P<object_id>\d+)/rc.node.local/$', 'conf.exodus.views.conf_rc_node_local'),
-        (r'^(?P<object_id>\d+)/resolv.conf/$', 'conf.exodus.views.conf_resolv_conf'),
+        (r'^(?P<object_id>\d+)/dhcp.conf/$', 'exodus.views.conf_dhcp_conf'),
+        (r'^(?P<object_id>\d+)/named.conf/$', 'exodus.views.conf_named_conf'),
+        (r'^(?P<object_id>\d+)/rc.node.local/$', 'exodus.views.conf_rc_node_local'),
+        (r'^(?P<object_id>\d+)/resolv.conf/$', 'exodus.views.conf_resolv_conf'),
 
 
         # add urls
-        (r'^addlocation/$', 'conf.exodus.views.addlocation'),
-        (r'^addnode/$', 'conf.exodus.views.addnode'),
-        (r'^addnic/$', 'conf.exodus.views.addnic'),
-        (r'^addinterlink/$', 'conf.exodus.views.addinterlink'),
-        (r'^addomni/$', 'conf.exodus.views.addomni'),
+        (r'^addlocation/$', 'exodus.views.addlocation'),
+        (r'^addnode/$', 'exodus.views.addnode'),
+        (r'^addnic/$', 'exodus.views.addnic'),
+        (r'^addinterlink/$', 'exodus.views.addinterlink'),
+        (r'^addomni/$', 'exodus.views.addomni'),
 
         (r'^static/(.*)$', 'django.views.static.serve', {'document_root': 

exodus/views.py

@@ -8 +8 @@
 from socket import gethostname 
 
-from conf.exodus.models import NIC, Node, Location, Link, LinkPool
-from conf.exodus.wllogic import freemasterip, newssidname
+from exodus.models import NIC, Node, Location, Link, LinkPool
+from exodus.wllogic import freemasterip, newssidname
 
 def addlocation(request):
@@ -173 +173 @@
                 nic.wifimode = 1
                 nic.wifidesc = 'managed mode'
-    t = loader.get_template('exodus/rc_local.txt')
+    t = loader.get_template('rc-local.txt')
     c = Context({'object': object, 
         })
@@ -185 +185 @@
         object.host = gethostname()
 
-        t = loader.get_template('exodus/rc_node_local.txt')
+        t = loader.get_template('rc-node-local.txt')
         c = Context({'object': object,
             })
@@ -198 +198 @@
         object.host = gethostname()
 
-        t = loader.get_template('exodus/rc_node_local.txt')
+        t = loader.get_template('exodus/rc-node-local.txt')
         c = Context({'object': object, })
 
@@ -223 +223 @@
 
         print "boek"
-        t = loader.get_template('exodus/rc_node_local.txt')
+        t = loader.get_template('rc-node-local.txt')
         c = Context({'object': object, 
                 })

exodus/wllogic.py

@@ -1 +1 @@
 # (c) Roland van Laar
 
-from conf.exodus.models import Node, Network
+from exodus.models import Node, Network
 
 def newssidname(node,desc):

templates/404.html

@@ -1 @@
-{% extends "admin/base_site.html" %}
+{% extends "admin/base-site.html" %}
 {% load i18n %}
 

templates/500.html

@@ -1 @@
-{% extends "admin/base_site.html" %}
+{% extends "admin/base-site.html" %}
 {% load i18n %}
 

templates/exodus-template.html

@@ -1 +1 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
+<HEAD>
 <TITLE>
 WirelessLeiden Exodus
 </TITLE>
-<link rel="stylesheet" href="/exodus/static/exodus.css" title="Default" type="text/css" />
-
+<link rel="stylesheet" href="/exodus/static/exodus.css" title="Default" type="text/css"> 
+</HEAD>
 <BODY>
 <TABLE border="0" cellspacing="0" cellpadding="0">
   <TR>
     <td class="menu" valign="top">
-          <A name="top"><img width="130" height="82" alt="logo" src="/static/logo.png" border=0/></A></br>
-          <img width="130" height="97" alt="foto" src="/exodus/static/foto.jpg"/><br/>
-          &nbsp;&nbsp;<A class="menu" href="/exodus">Exodus</a></br/>
-          &nbsp;&nbsp;<A class="menu" href="/exodus/nodelist">Node List</a><br/>
-          &nbsp;&nbsp;<A class="menu" href="/exodus/addlocation">Add Location</a></br>
-          &nbsp;&nbsp;<A class="menu" href="/exodus/addnode">Add Node</a></br>
-          &nbsp;&nbsp;<A class="menu" href="/exodus/addnic">Add NIC</a></br>
-          &nbsp;&nbsp;<A class="menu" href="/exodus/addinterlink">Add Interlink</a></br>
-          &nbsp;&nbsp;<A class="menu" href="/exodus/addomni">Add Omni</a></br>
+          <A name="top"><img width="130" height="82" alt="logo" src="/exodus/static/logo.png" border=0></A><br>
+          <img width="130" height="97" alt="foto" src="/exodus/static/foto.jpg"/><br>
+          &nbsp;&nbsp;<A class="menu" href="/exodus">Exodus</a><br>
+          &nbsp;&nbsp;<A class="menu" href="/exodus/nodelist">Node List</a><br>
+          &nbsp;&nbsp;<A class="menu" href="/exodus/addlocation">Add Location</a><br>
+          &nbsp;&nbsp;<A class="menu" href="/exodus/addnode">Add Node</a><br>
+          &nbsp;&nbsp;<A class="menu" href="/exodus/addnic">Add NIC</a><br>
+          &nbsp;&nbsp;<A class="menu" href="/exodus/addinterlink">Add Interlink</a><br>
+          &nbsp;&nbsp;<A class="menu" href="/exodus/addomni">Add Omni</a><br>
         </td>
         <td valign="top" class="right">
@@ -44 +45 @@
                 <td class="mainl">&nbsp;</td>
                 <td class="main"> 
-                  <br/>
+                  <br>
                   {% block content %}    {% endblock %}
                 </td>

templates/exodus/addinterlink.html

@@ -1 @@
-{% extends "exodus_template.html" %}
+{% extends "exodus-template.html" %}
 
 {% block content %}

templates/exodus/addlocation.html

@@ -1 @@
-{% extends "exodus_template.html" %}
+{% extends "exodus-template.html" %}
 
 {% block content %}

templates/exodus/addnic.html

@@ -1 @@
-{% extends "exodus_template.html" %}
+{% extends "exodus-template.html" %}
 
 {% block content %}

templates/exodus/addnode.html

@@ -1 @@
-{% extends "exodus_template.html" %}
+{% extends "exodus-template.html" %}
 
 {% block content %}

templates/exodus/addomni.html

@@ -1 @@
-{% extends "exodus_template.html" %}
+{% extends "exodus-template.html" %}
 
 {% block content %}

templates/exodus/head.html

@@ -9 +9 @@
   <TR>
     <td class="menu" valign="top">
-          <A name="top"><img width="130" height="82" alt="logo" src="logo.png" border=0/></A></br>
-          <img width="130" height="97" alt="foto" src="foto.jpg"/><br/>
-          &nbsp;&nbsp;<A class="menu" href="http://localhost:8080/exodus/">Exodus</a></br/>
+          <A name="top"><img width="130" height="82" alt="logo" src="logo.png" border=0></A><br>
+          <img width="130" height="97" alt="foto" src="foto.jpg"><br>
+          &nbsp;&nbsp;<A class="menu" href="/exodus">Exodus</a><br>
         </td>
         <td valign="top" class="right">
@@ -37 +37 @@
                 <td class="mainl">&nbsp;</td>
                 <td class="main" background="background.png"> 
-                  <br/>
+                  <br>

templates/exodus/index.html

@@ -1 @@
-{% extends "exodus_template.html" %}
+{% extends "exodus-template.html" %}
 
 {% block content %}

templates/exodus/node-detail.html

@@ -1 @@
-{% extends "exodus_template.html" %}
+{% extends "exodus-template.html" %}
 
 {% block content %}