← Back to branch summary

~jstys-z/helioviewer.org/client5

« back to all changes in this revision

Viewing changes to index.php

  • Committer: Keith Hughitt
  • Date: 2010-02-17 22:00:59 UTC
  • mfrom: (402.1.68 hv)
  • Revision ID: keith.hughitt@nasa.gov-20100217220059-wmdq7kgokj4seryx
Merged with Keith's branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
index.php
18
18
        <!--[if IE]>
19
19
        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
20
20
        <![endif]-->
21
 
        
22
 
        <!-- Twitter Jetpack -->
23
 
        <!-- <link rel="jetpack" href="lib/jetpack/helioviewer-twitter-jetpack.js" name="Helioviewer.org Twitter Jetpack">-->
24
21
 
25
22
        <!-- YUI CSS Reset -->
26
23
        <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/combo?2.8.0/build/reset-fonts/reset-fonts.css"> 
28
25
        <!-- jQuery -->
29
26
        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.0/jquery.min.js" type="text/javascript"></script>
30
27
        <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/jquery-ui.min.js" type="text/javascript"></script>
31
 
        <script src="lib/jquery/jquery-class-support/jquery.class.js" type="text/javascript"></script>
32
 
        <!--<script src="lib/jquery/jquery-qtip-nightly/jquery.qtip.js" type="text/javascript"></script>
33
 
        <script src="lib/jquery/jquery-qtip-nightly/jquery.qtip.tips.js" type="text/javascript"></script>-->
34
 
        <script src="lib/jquery/jquery-qtip-1.0.0-rc3091551/jquery.qtip-1.0.0-rc3.min.js" type="text/javascript"></script>
35
 
        
36
 
        
37
 
        <!-- TODO: move jquery-dynaccordion to /lib/helioviewer with rest of custom code -->
38
 
        <script src="lib/jquery/jquery-dynaccordion/ui.dynaccordion.js" type="text/javascript"></script>
39
 
        <link rel="stylesheet" href="lib/jquery/jquery.ui-1.7.1/css/dot-luv-modified/jquery-ui-1.7.1.custom.css" type="text/css" />    
 
28
        <script src="lib/jquery.class/jquery.class.js" type="text/javascript"></script>
 
29
        <!--<script src="lib/jquery.qtip-nightly/jquery.qtip.js" type="text/javascript"></script>
 
30
        <script src="lib/jquery.qtip-nightly/jquery.qtip.tips.js" type="text/javascript"></script>-->
 
31
        <script src="lib/jquery.qtip-1.0.0-rc3091551/jquery.qtip-1.0.0-rc3.min.js" type="text/javascript"></script>
 
32
        
 
33
        <!-- TODO: move jquery.dynaccordion to /src with rest of custom code -->
 
34
        <script src="lib/jquery.dynaccordion/ui.dynaccordion.js" type="text/javascript"></script>
 
35
        
 
36
        <link rel="stylesheet" href="lib/jquery.ui-1.7.1/css/dot-luv-modified/jquery-ui-1.7.1.custom.css" type="text/css" />    
40
37
 
41
38
        <!-- Mousewheel support -->
42
 
        <script src="lib/jquery/jquery.mousewheel.3.0.2/jquery.mousewheel.min.js" type="text/javascript"></script>
 
39
        <script src="lib/jquery.mousewheel.3.0.2/jquery.mousewheel.min.js" type="text/javascript"></script>
43
40
 
44
41
        <!-- jGrowl -->
45
 
        <script src="lib/jquery/jGrowl/jquery.jgrowl_minimized.js" type="text/javascript"></script>
46
 
        <link rel="stylesheet" href="lib/jquery/jGrowl/jquery.jgrowl.css" type="text/css" />    
 
42
        <script src="lib/jquery.jgrowl/jquery.jgrowl_minimized.js" type="text/javascript"></script>
 
43
        <link rel="stylesheet" href="lib/jquery.jgrowl/jquery.jgrowl.css" type="text/css" />    
47
44
 
48
45
        <!-- imgAreaSelect jQuery plugin -->
49
 
        <script src="lib/jquery/imgareaselect-0.8/jquery.imgareaselect-0.8.js" type="text/javascript"></script>
 
46
        <script src="lib/jquery.imgareaselect-0.8/jquery.imgareaselect-0.8.js" type="text/javascript"></script>
50
47
 
51
48
        <!-- CookieJar -->
52
49
        <script type="text/javascript" src="lib/Cookiejar/jquery.json.js"></script>
60
57
        <!--<script src="http://static.simile.mit.edu/timeline/api-2.2.0/timeline-api.js" type="text/javascript"></script>-->
61
58
        
62
59
        <!-- Pixastic -->
63
 
        <!-- jQuery("img.tile[src!=images/transparent_512.gif]"); -->
 
60
        <!-- $("img.tile[src!=resources/images/transparent_512.gif]"); -->
64
61
        <!--<script src="lib/pixastic/pixastic.custom.js" type="text/javascript"></script>-->
65
62
 
66
63
        <!-- ShadowBox -->
81
78
        <?php
82
79
            // JavaScript
83
80
            if ($config["compress_js"]) {
84
 
                $compressed = "lib/helioviewer/build/helioviewer-all-min.js";
 
81
                $compressed = "build/helioviewer.min.js";
85
82
                if (!file_exists($compressed)) {
86
83
                   $error = "<div style='position: absolute; width: 100%; text-align: center; top: 50%; font-size: 14px;'>
87
 
                             <img src='images/logos/about.png' alt='helioviewer logo'></img><br>
 
84
                             <img src='resources/images/logos/about.png' alt='helioviewer logo'></img><br>
88
85
                             <b>Configuration:</b> Unable to find compressed JavaScript files.
89
86
                             If you haven't already, use Apache Ant with the included build.xml file to generate compressed files.</div></body></html>";
90
87
                   die($error);
98
95
                            "MovieBuilder.js", "ScreenshotBuilder.js", "TileLayer.js", "TileLayerAccordion.js", "Time.js", "TimeControls.js", "TooltipHelper.js", "TreeSelect.js", 
99
96
                            "UserSettings.js", "Viewport.js", "ViewportHandlers.js", "ZoomControls.js");
100
97
                foreach($js as $file)
101
 
                    printf("<script src=\"lib/helioviewer/%s\" type=\"text/javascript\"></script>\n\t", $file);
 
98
                    printf("<script src=\"src/%s\" type=\"text/javascript\"></script>\n\t", $file);
102
99
            }
103
100
            
104
101
            // CSS
105
102
            if ($config["compress_css"]) {
106
 
                echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles/helioviewer-all.css\" />\n\t";
 
103
                echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"build/css/helioviewer.css\" />\n\t";
107
104
            }
108
105
            else {
109
106
                $css = array("main.css", "accordions.css", "dialogs.css", "events.css", "sliders.css", "timenav.css", "tooltips.css", "viewport.css");
110
107
                foreach($css as $file)
111
 
                    printf("<link rel=\"stylesheet\" type=\"text/css\" href=\"styles/%s\" />\n\t", $file);
 
108
                    printf("<link rel=\"stylesheet\" type=\"text/css\" href=\"resources/css/%s\" />\n\t", $file);
112
109
            }
113
110
        ?>
114
111
 
115
112
        <!-- Theme Modifications -->
116
 
        <link rel="stylesheet" type="text/css" href="styles/dot-luv.css">
 
113
        <link rel="stylesheet" type="text/css" href="resources/css/dot-luv.css">
117
114
        
118
115
        <!--[if IE]>
119
 
            <link href="styles/main-ie.css" rel="stylesheet" type="text/css" />
 
116
            <link href="resources/css/main-ie.css" rel="stylesheet" type="text/css" />
120
117
        <![endif]-->
121
118
        
122
119
        <script type="text/javascript">
167
164
            <!-- Left Column -->
168
165
            <div id="left-col">
169
166
                <div id="left-col-header">
170
 
                    <img src="images/logos/simple.png" id="helioviewer-logo-main" alt="Helioviewer.org Logo" style="margin-top:24px; margin-left: 9px;">
 
167
                    <img src="resources/images/logos/simple.png" id="helioviewer-logo-main" alt="Helioviewer.org Logo" style="margin-top:24px; margin-left: 9px;">
171
168
                </div>
172
169
                <br><br>
173
170
                <div class="section-header" style="margin-left:5px; margin-top: 15px;">Observation</div>