Skip to content

Commit

Permalink
Merge branch 'raddick_alerts_usethis' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dmedv committed Nov 6, 2015
2 parents 3c61270 + 722c51c commit 6bcee31
Show file tree
Hide file tree
Showing 27 changed files with 303 additions and 11 deletions.
14 changes: 14 additions & 0 deletions SkyServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
<HintPath>lib\CSharpFITS_v1.1.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
Expand Down Expand Up @@ -79,6 +83,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="alerts.css" />
<Content Include="Default.aspx" />
<Content Include="en\astro\about_astronomy.swf" />
<Content Include="en\astro\AstroHome.aspx" />
Expand Down Expand Up @@ -447,8 +452,14 @@
<Content Include="en\images\new_tools_2.jpg" />
<Content Include="en\images\new_window.png" />
<Content Include="en\images\new_window_black.png" />
<Content Include="en\images\new_window_cyan.png" />
<Content Include="en\images\offsite.png" />
<Content Include="en\images\offsite_black.png" />
<Content Include="en\images\loginportal.png" />
<Content Include="en\images\sciserverlogo.png" />
<Content Include="en\images\sciserver_icon_bkgd_blk_150px.png" />
<Content Include="en\images\sciserver_logo_inverted.png" />
<Content Include="en\images\sciserver_logo_usermsg.png" />
<Content Include="en\images\sdss-background.jpg" />
<Content Include="en\images\sdss-globe.gif" />
<Content Include="en\images\sdss-main-banner.gif" />
Expand Down Expand Up @@ -2088,6 +2099,8 @@
<Content Include="images\logo_nsf.jpg" />
<Content Include="images\logo_sloan.jpg" />
<Content Include="images\pdf_icon.gif" />
<Content Include="images\sciserver_icon_bkgd_blue_64px.png" />
<Content Include="images\sciserver_icon_bkgd_blue_73px.png" />
<Content Include="images\swf_icon.jpg" />
<Content Include="images\tick.GIF" />
<Content Include="images\tick.jpg" />
Expand Down Expand Up @@ -6425,6 +6438,7 @@
<None Include="en\tools\STARTBall\images\crosshairsLayers.psd" />
<None Include="en\tools\STARTBall\STARTBall.dcr" />
<Content Include="packages.config" />
<None Include="ViewPage1.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="en\tools\chart\ChartBase.Master" />
Expand Down
163 changes: 163 additions & 0 deletions alerts.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
body > div#public > div.migrationAlert {
width:648px;
padding:10px;
margin-top:10px;
margin-bottom:10px;
background-color:chocolate;
color:aliceblue;
-moz-border-radius:5px;
-webkit-border-radius:5px;
border-radius:5px;
line-height:1.1em;
font-size:10pt;
font-family:Verdana, Helvetica, sans-serif;
}
body > div#public > div.migrationAlert p {
color:seashell;
}
body > div#public > div.migrationAlert a{
font-size:10pt;
font-weight:bold;
font-family:inherit;
color:aqua;
}
body > div.migrationNotice {
width:160px;
position:absolute;
top:105px;
left:200px;
width:648px;
padding:0px;
color:white;
line-height:1.1em;
}
body > div.migrationNotice p.to-top{
text-align:right;
}
body > div.migrationNotice p.to-top a:after{
content:" ↑";
font-size:1.5em;
}
body > div.migrationNotice a{
font-size:0.9em;
font-weight:bold;
font-family:inherit;
}
body > div.migrationNotice span.new-label {
font-size:.5em;
text-transform:uppercase;
vertical-align:text-top;
background-color:goldenrod;
color:#333333;
padding:3px;
border-radius:2px;
font-weight:bold;
}
body > div.migrationNotice div.figure .figure-caption {
font-weight:bold;
margin-bottom:0;
}
body > div.migrationNotice div.figure img {
max-width:100%;
height:auto;
}
body > div.migrationNotice div.figure {
text-align:center;
//background-color:#252525;
padding:20px 10px;
margin:10px auto;
}
body > div.migrationMenu{
width:160px;
position:absolute;
top:105px;
left:25px;
FONT-FAMILY: Verdana, Palladio, Helvetica,sans-serif;
}
body > div.migrationMenu h2{
background-color:#666666;
font-size:12pt;
text-align:left;
text-indent:2px;
font-weight:bold;
color:#cde5ad;
}
body > div.migrationMenu ul {
font-size: 9pt;
list-style: none;
margin-left: 0;
padding-left: 25px;
text-indent:-20px;
line-height: 20px;
}
body > div.migrationMenu ul>li>a {
font-weight: normal;
FONT-FAMILY: Verdana, Palladio, Helvetica,sans-serif;
}

#headerAlert {
padding-left:0px;
padding-right:10px;
width: 200px;
height: 73px;
background-color:#fc6f03;
border-radius:5px;
z-index:500;
/* background-image: url('en/images/imageright2.png');*/
}

#headerAlert > .imgwithlink {
float:right;
}

#headerAlert > p
{
margin-top:5px;
margin-left:10px;
font-size:large;
}

#headerAlert > p > a
{
color:#00ffff;
}

/*
Header alerts get formatted differently in the tools pages (e.g. Finding Chart) than in other pages.
This is probably an inefficient way of doing that.
-Jordan 10/5/2015
*/

#headerAlertTools
{
background-color:#003366;
}

#headerAlertTools > .imgwithlink {
float:left;
}

#headerAlertTools > h2
{
margin-top:5px;
padding-top:11px;
margin-left:10px;
font-size:small;
color:white;
height:100%;
vertical-align:central;
}

#headerAlertTools > p
{
margin-top:15px;
margin-left:10px;
font-size:smaller;
clear:both;
}

#headerAlertTools > p > a
{
color:cyan;
padding-right:10px;
}
30 changes: 28 additions & 2 deletions en/Home.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,24 @@
<div id="logos">
<div style="position:absolute;left:<%= logoleftpos%>px;top:108px;z-index:5;">
<table width="80" border="0" cellpadding="0" cellspacing="5">
<tr><td align="middle" class="smallbodytext">SDSS-III is <br>supported by</td></tr>
<tr><td align="middle" class="smallbodytext">SDSS is <br>supported by</td></tr>
<tr><td align="middle"><a href="http://www.sloan.org"><img src="../images/logo_sloan.jpg" width="48" height="48" border="0"></a></td></tr>
<tr><td align="middle"><a href="http://www.nsf.gov"><img src="../images/logo_nsf.jpg" width="48" height="48" border="0"></a></td></tr>
<tr><td align="middle"><a href="http://www.energy.gov"><img src="../images/logo_energy.jpg" width="48" height="48" border="0"></a></td></tr>
<tr><td>&nbsp;</td></tr>
<tr><td align="middle" class="smallbodytext">Powered by</td></tr>
<tr>
<td align="middle">
<a href="<%=globals.SciServerLink%>">
<img src="../images/sciserver_icon_bkgd_blue_64px.png" alt="SciServer logo" /><br />
<span class="smallbodytext">SciServer</span>
</a>
</td>
</tr>
<tr><td align="middle"><a href="http://research.microsoft.com/"><img src="../images/logo_ms.jpg" width="64" height="21" border="0"></a></td></tr>
</table>
</div>
<div style="position:absolute;left:<%= logoleftpos%>px;top:363px;z-index:5;">
<div style="position:absolute;left:<%= logoleftpos%>px;top:450px;z-index:5;">
<table width="80" border="0" cellpadding="0" cellspacing="0">
<tr><td><hr class="hrule"></td></tr>
<tr><td>
Expand All @@ -37,6 +45,24 @@
</div>

<div id="public">

<div class="migrationAlert">

<p>Within the next few weeks, we will roll out a new collaborative science framework called
<a href="<%=globals.SciServerLink%>" target="_blank">SciServer&nbsp;<img src="images/new_window_cyan.png" alt=" (new window)" /></a>.
SciServer will integrate the current SkyServer and CasJobs systems, as well as add several new features. The main feature is
a Single Sign-On system across all SciServer applications. SkyServer will still support anonymous
access, but if you log in with your new SciServer account, you can save queries and results to
your MyDB personal database in CasJobs. You can also seamlessly access other SciServer services.</p>

<p>For more information
on all upcoming new features, please see our
<a href="<%=globals.SciServerLink%>building-blocks/updates/" target="_blank">New Features
<img src="images/new_window_cyan.png" alt=" (new window)" /></a> section on the SciServer website.</p>

</div>


<table border="0" cellpadding="0" cellspacing="2" width="668">
<tr><td colspan=5 class="midbodytext" style="color=#ffff00"><b>
<!-- motd.inc" -->
Expand Down
18 changes: 13 additions & 5 deletions en/HomeMaster.master
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="HomeMaster.master.cs" Inherits="SkyServer.HomeMaster" %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head runat="server">

<link href="../skyserver.css" rel="stylesheet" type="text/css" />
<link href="../alerts.css" rel="stylesheet" type="text/css" />
<link href="../FavIcon.ICO" rel="SHORTCUT ICON" />

<asp:ContentPlaceHolder id="csscanister" runat="server"></asp:ContentPlaceHolder> <!-- a place to hold page-specific css files -->

<title>SDSS SkyServer <%= globals.Release %></title>

Expand All @@ -21,7 +23,6 @@
</head>

<body background="<%= imgpath %>new_home_bktile.jpg" style="margin-left:25px;margin-top:0px;margin-right:25px;margin-bottom:0px;">

<div id="div_title">
<table cellpadding="0" cellspacing="0" border="0" width="200px" style="height:73px">
<tr>
Expand All @@ -40,13 +41,20 @@
</table>
</td>
<td >
<img alt="" src="<%= imgpath %>imageright2.png" />

<!-- <img alt="" src="<%= imgpath %>imageright2.png" />-->

<div id="headerAlert">
<a href="<%=globals.SciServerLink%>updates/" class="imgwithlink" target="_blank">
<img src="<%= imgpath %>sciserver_logo_usermsg.png" alt="logo" width="190" />
</a>
<p><a href="<%=globals.SciServerLink%>updates/" target="_blank">Coming soon!<img src="<%=imgpath%>new_window_cyan.png" alt=" (new window)" style="max-width:95%;margin:2%" /></a></p>
</div>
</td>

</tr>
</table>
</div>

<div id="div_nav">
<table border="1" cellpadding="0" cellspacing="0" width="100%" style="height:25px;border-collapse:collapse;">
<tr bgcolor="#313131" style="height:23px">
Expand All @@ -64,7 +72,7 @@
</tr>
</table>
</div>

<asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server"></asp:ContentPlaceHolder>

<script language="JavaScript" type="text/javascript" src="<%= url %>wz_tooltip.js"></script>
Expand Down
9 changes: 9 additions & 0 deletions en/HomeMaster.master.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions en/astro/universe/Universe.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ of change. The expanding universe, a new idea based on modern physics, laid
to rest the paradoxes that troubled astronomers from ancient times until the
early 20th Century.</p>

<!--
<a name="properties"></a>
<h1>Properties of the Expanding Universe</h1>
<p>
Expand All @@ -123,9 +124,12 @@ then at an infinite distance away from the Earth, it will come to a stop (this
is the flat universe). And lastly, if the ship is launched with more than enough energy
to escape, it will always have some speed, even when it is an infinite distance
away (the open universe).
-->

<a name="fate"></a>
<h1>The Fate of the Universe</h1>

<IMG align=right src="images/evol_model.jpg">
<p>
For the last eighty years, astronomers have been making increasingly
accurate measurements of two important cosmological parameters: H<sub>o</sub>&nbsp;- the rate at which
Expand Down
Binary file added en/images/loginportal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/new_window_cyan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/sciserver_icon_bkgd_blk_150px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/sciserver_icon_bkgd_blue_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/sciserver_icon_bkgd_blue_73px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/sciserver_logo_inverted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/sciserver_logo_usermsg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/sciserverlogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/turbulence_usecase_3_300px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added en/images/turbulence_usecase_3b_300px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions en/tools/ToolsMaster.master
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<%@ Master Language="C#" MasterPageFile="..\HomeMaster.master" AutoEventWireup="true" CodeBehind="ToolsMaster.master.cs" Inherits="SkyServer.Tools.ToolsMaster" %>


<asp:Content ID="thecssfile" ContentPlaceHolderID="csscanister" runat="server">
</asp:Content>

<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
Expand Down
Loading

0 comments on commit 6bcee31

Please sign in to comment.