Changeset 10945

Show
Ignore:
Timestamp:
11/09/11 02:59:40 (19 months ago)
Author:
edent
Message:

add map tabs for web

Location:
ossiedev/branches/jsnyder/trunk/tools/cornetApps
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/branches/jsnyder/trunk/tools/cornetApps/settings.py

    r10944 r10945  
    5252# trailing slash. 
    5353# Examples: "http://media.lawrence.com/media/", "http://example.com/media/" 
    54 MEDIA_URL = '' 
    55  
    56 # Base URL for website to reference anchors 
    57 URL_ROOT = 'http://cornet.wireless.vt.edu/~webdemo/django/' 
     54MEDIA_URL = 'http://localhost:8000/' 
    5855 
    5956# Absolute path to the directory static files should be collected to. 
    … …  
    140137) 
    141138 
    142 LOGIN_URL = '/login/' 
    143  
    144139# A sample logging configuration. The only tangible logging 
    145140# performed by this configuration is to send an email to 

  • ossiedev/branches/jsnyder/trunk/tools/cornetApps/settingsWeb.py

    r10938 r10945  
    4747# Absolute filesystem path to the directory that will hold user-uploaded files. 
    4848# Example: "/home/media/media.lawrence.com/media/" 
    49 MEDIA_ROOT = '' 
     49MEDIA_ROOT = '/home/webdemo/cornetApps/' 
    5050 
    5151# URL that handles the media served from MEDIA_ROOT. Make sure to use a 
    5252# trailing slash. 
     53# Base URL for website to reference anchors 
    5354# Examples: "http://media.lawrence.com/media/", "http://example.com/media/" 
    54 MEDIA_URL = '' 
    55  
    56 # Base URL for website to reference anchors 
    57 URL_ROOT = 'http://cornet.wireless.vt.edu/~webdemo/django/' 
     55MEDIA_URL = 'http://cornet.wireless.vt.edu/~webdemo/django/' 
    5856 
    5957# Absolute path to the directory static files should be collected to. 

  • ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/ossie.html

    r10944 r10945  
    1010  <div id="left_top"> 
    1111   <p>Waveforms 
    12                 <a href="/"><img src="{{STATIC_URL}}pics/home.png" title="Home"/></a>  
    13                 <a href="#" id="load"><img src="{{STATIC_URL}}pics/refresh.png" title="Refresh Node Directory"/></a> 
    14                 <a href="/logout/"><img src="{{STATIC_URL}}pics/logout.png" title="Logout"/></a></p> 
     12                <a href="{{MEDIA_URL}}"><img src="{{STATIC_URL}}pics/home.png" title="Home"/></a>  
     13                <a href="{{MEDIA_URL}}logout/"><img src="{{STATIC_URL}}pics/logout.png" title="Logout"/></a></p> 
    1514        <br/> 
    1615        <div id="directory">    </div>{#end menu div#} 
    … …  
    2524        <ul class="tabs"> 
    2625                <li class="current"><a href="../grid/">Grid View</a></li> 
    27                 <li><a href="../map/1/">Floor 1</a></li> 
    28                 <li><a href="../map/2/">Floor 2</a></li> 
    29                 <li><a href="../map/3/">Floor 3</a></li> 
    30                 <li><a href="../map/4/">Floor 4</a></li> 
     26                <li><a href="{{MEDIA_URL}}map/1/">Floor 1</a></li> 
     27                <li><a href="{{MEDIA_URL}}map/2/">Floor 2</a></li> 
     28                <li><a href="{{MEDIA_URL}}map/3/">Floor 3</a></li> 
     29                <li><a href="{{MEDIA_URL}}map/4/">Floor 4</a></li> 
    3130        <li id="task manager"><a href="../tasks/">Task Manager</a></li>         
    3231    </ul>