Skip to content
This repository was archived by the owner on Jul 25, 2019. It is now read-only.

Commit 6c4ea4a

Browse files
author
cwalker
committed
New website design. CSS files are in css/ and the new service/ url also implemented. Note that the site runs from one header file, header.inc
Additionally, include/local.inc is loaded automaticly using php's auto_prepend_file directive.
1 parent 36d2a60 commit 6c4ea4a

28 files changed

+1180
-307
lines changed

alliance/about.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div id="main">
1515

1616
<h1 class="first">About the Globus Alliance</h1>
17-
17+
<p>
1818
The Globus Alliance conducts research and development to develop the technology,
1919
standards, and systems that form the Grid: a computing architecture that
2020
enables distributed collaboration for business, science, engineering, and

alliance/index.php

+9-24
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,8 @@
22

33
$title = "Globus: The Globus Alliance";
44
$section = "section-2";
5-
include_once( "../include/local.inc" );
6-
include_once( $SITE_PATHS["SERV_INC"].'header.inc' );
75
?>
8-
<!--
9-
<div id="left">
10-
<?php include($SITE_PATHS["SERV_INC"].'alliance.inc'); ?>
11-
</div>
12-
-->
13-
146
<div id="home">
15-
167
<h1 class="first">The Globus Alliance</h1>
178
<p>The Globus Alliance is an international collaboration that conducts
189
research and development to create fundamental Grid technologies.
@@ -23,9 +14,7 @@
2314

2415
<hr>
2516

26-
<table width="100%" class="news">
27-
<tr>
28-
<td width="33%">
17+
<div class="subhome_cell">
2918
<h4>People and Organizations</h4>
3019
<ul>
3120
<li><a href="team/">The Globus Team</a></li>
@@ -36,8 +25,8 @@
3625
<li><a href="employment/">Job Opportunities</a></li>
3726
<li><a href="logos/">Using Our Logos</a></li>
3827
</ul>
39-
</td>
40-
<td width="33%">
28+
</div>
29+
<div class="subhome_cell">
4130
<h4>Publications</h4>
4231
<ul>
4332
<li><a href="publications/papers.php">Research Papers</a></li>
@@ -48,20 +37,16 @@
4837
<li><a href="<?=$SITE_PATHS["WEB_TOOLKIT"]."docs/"; ?>">Globus
4938
Toolkit Documentation</a></li>
5039
</ul>
51-
</td>
52-
<td width="33%">
53-
<h4>News and Events</h4>
40+
</div>
41+
<div class="subhome_cell">
42+
<h4>Globus News</h4>
5443
<ul>
55-
<li><a href="<?=$SITE_PATHS["WEB_ROOT"]."news.html"; ?>">News Archive</a></li>
56-
<li><a href="events/">Meetings and Events</a></li>
44+
<li><a href="news.html">News Archive</a></li>
5745
<li><a href="impact/">Impact of Our Work</a></li>
5846
<li><a href="news/kit.php">Press Kit</a></li>
59-
<li><a href="news/">Older News Archive</a></li>
6047
</ul>
61-
</td>
62-
</tr>
63-
</table>
64-
48+
</div>
49+
<br class="clear" clear="all" />
6550
</div>
6651

6752
<?php include($SITE_PATHS["SERV_INC"].'footer.inc'); ?>

alliance/news/rd100.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
include_once( "../../include/local.inc" );
66
include_once( $SITE_PATHS["SERV_INC"].'header.inc' );
77
?>
8-
<div id="left">
9-
<?php include($SITE_PATHS["SERV_INC"].'alliance.inc'); ?>
10-
</div>
118

12-
<div id="main">
9+
<div id="main" style="margin-top: 110px;">
1310
<!-- content STARTS here -->
1411

1512

css/common.css

+116
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
@charset "UTF-8";
2+
/* CSS Document */
3+
4+
hr
5+
{
6+
display: none;
7+
}
8+
9+
10+
#outer_wrapper {
11+
width: 996px;
12+
margin-left: auto;
13+
margin-right: auto;
14+
padding: 0;
15+
}
16+
17+
#wrapper {
18+
margin: 0;
19+
padding: 0
20+
}
21+
22+
#container {
23+
width: 100%;
24+
}
25+
26+
#content {
27+
}
28+
29+
#content a
30+
{
31+
color:#516d9d;
32+
}
33+
34+
#content_left
35+
{
36+
float: left;
37+
width: 450px;
38+
margin-bottom: 35px;
39+
}
40+
41+
#content_right
42+
{
43+
width: 430px;
44+
margin-left: 40px;
45+
float: left
46+
}
47+
48+
h1
49+
{
50+
font-size: 24px;
51+
font-family: 'Lucida Sans Unicode','Lucida Grande',sans-serif;
52+
color: #002441;
53+
font-weight:normal;
54+
}
55+
56+
h2
57+
{
58+
font-size: 18px;
59+
font-family: 'Lucida Sans Unicode','Lucida Grande',sans-serif;
60+
color:#fb8201;
61+
font-weight:normal;
62+
margin-top: .8em;
63+
}
64+
65+
h2 a
66+
{
67+
text-decoration: underline;
68+
color:#fb8201;
69+
}
70+
71+
#content p, #home p, #content li, #home li
72+
{
73+
font-size: 12px;
74+
font-family:Verdana, Arial, Helvetica, sans-serif;
75+
line-height: 1.8em;
76+
color: #444444;
77+
}
78+
79+
#content_left h2
80+
{
81+
margin-top: 1.2em;
82+
}
83+
84+
.image_caption
85+
{
86+
font-size: 9px;
87+
font-family:Verdana, Arial, Helvetica, sans-serif;
88+
padding-bottom: 50px;
89+
padding-left: 40px;
90+
}
91+
92+
#footer p
93+
{
94+
font-size: 11px;
95+
font-family:Verdana, Arial, Helvetica, sans-serif;
96+
line-height: 1.8em;
97+
color: #444444;
98+
}
99+
100+
#breadcrumbs
101+
{
102+
position: absolute;
103+
top: 180px;
104+
width: 996px;
105+
106+
}
107+
108+
#breadcrumbs a
109+
{
110+
color:#747a85;
111+
text-decoration: underline;
112+
font-size: 10px;
113+
margin-top:10px;
114+
}
115+
116+

css/home.css

+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
@charset "UTF-8";
2+
/* CSS Document */
3+
4+
#splash
5+
{
6+
height: 242px;
7+
overflow: hidden;
8+
background: #649bd3 url('../img/header/splash_bg.jpg') no-repeat;
9+
margin-left:0px;
10+
}
11+
12+
#headline
13+
{
14+
width: 996px;
15+
height: 242px;
16+
margin-left: auto;
17+
margin-right:auto;
18+
margin-top: 0px;
19+
}
20+
21+
#headline p
22+
{
23+
font-family: Verdana, Arial, Helvetica, sans-serif;
24+
font-size: 24px;
25+
color: white;
26+
width: 400px;
27+
margin-top: 70px;
28+
float: left;
29+
}
30+
#headline a
31+
{
32+
color: #efca49;
33+
text-decoration: none;
34+
}
35+
36+
#news
37+
{
38+
39+
width: 440px;
40+
height: 222px;
41+
margin-left: 480px;
42+
background: url('../img/header/headline_news_bg.png');
43+
padding: 10px;
44+
}
45+
46+
#news h2
47+
{
48+
font-family: 'Lucida Sans Unicode','Lucida Grande',sans-serif;
49+
font-size:24px;
50+
color: #efca49;
51+
font-weight: normal;
52+
padding-bottom: 0px;
53+
padding-top: 0px;
54+
margin-top: 0px;
55+
}
56+
57+
#news .newsdate
58+
{
59+
color:#dddddd;
60+
font-family:Verdana, Arial, Helvetica, sans-serif;
61+
font-size: 11px;
62+
font-weight: normal;
63+
display: block;
64+
}
65+
66+
#news strong
67+
{
68+
color: #fff;
69+
font-family:Verdana, Arial, Helvetica, sans-serif;
70+
font-size: 12px;
71+
font-weight: bold;
72+
}
73+
74+
#news a:link
75+
{
76+
color: #efca49;
77+
font-size: 11px;
78+
margin-bottom: 0px;
79+
display:block;
80+
font-family:Verdana, Arial, Helvetica, sans-serif;
81+
text-decoration: none;
82+
}
83+
84+
#news a:hover
85+
{
86+
color: #efca49;
87+
font-size: 11px;
88+
margin-bottom: 0px;
89+
display:block;
90+
font-family:Verdana, Arial, Helvetica, sans-serif;
91+
text-decoration: underline;
92+
}
93+
#news a:visited
94+
{
95+
color: #efca49;
96+
font-size: 11px;
97+
margin-bottom: 0px;
98+
display:block;
99+
font-family:Verdana, Arial, Helvetica, sans-serif;
100+
text-decoration: underline;
101+
}
102+
103+
#outer_wrapper
104+
{
105+
margin-top: 15px;
106+
padding-bottom: 35px;
107+
}
108+
109+
.more
110+
{
111+
display: block;
112+
}
113+
114+
#content_right h2
115+
{
116+
font-size: 24px;
117+
margin: 0 0 10px 0;
118+
}
119+
120+
#content_right p
121+
{
122+
font-size: 12px;
123+
margin-bottom: 15px;
124+
}

0 commit comments

Comments
 (0)