Committing a few changes for live test

This commit is contained in:
Rick Falkvinge
2012-11-09 07:36:56 +00:00
parent 2c2a58456a
commit 9a790c4ca0
3 changed files with 70 additions and 48 deletions
+47 -34
View File
@@ -194,58 +194,48 @@
<li><a href="#step-1">
<label class="stepNumber">1</label>
<span class="stepDesc">
Step 1<br />
<small>Step 1 description</small>
</span>
Security Check<br />
<small>Are you the admin of this server?</small>
</span>
</a></li>
<li><a href="#step-2">
<label class="stepNumber">2</label>
<span class="stepDesc">
Step 2<br />
<small>Step 2 description having some more text</small>
Database<br />
<small>Supply database credentials and connect</small>
</span>
</a></li>
<li><a href="#step-3">
<label class="stepNumber">3</label>
<span class="stepDesc">
Step 3<br />
<small>Step 3 description</small>
User Data<br />
<small>Let's create the first user</small>
</span>
</a></li>
<li><a href="#step-4">
<label class="stepNumber">4</label>
<span class="stepDesc">
Step 4<br />
<small>Step 4 description</small>
Complete<br />
<small>All done. Let's login!</small>
</span>
</a></li>
</ul>
<div id="step-1">
<h2 class="StepTitle">Step 1 Content</h2>
<ul type="disk">
<li>List 1</li>
<li>List 2</li>
</ul>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
<h2>Welcome to Activizr</h2>
<p>Congratulations! Since you're reading this, you have successfully installed the Activizr packages and set up an Apache virtual server using mod_mono with Mono&nbsp;2.</p>
<p>However, before we proceed, we need to make sure that you are indeed the sysadmin of this server, and not a remote bot who just discovered an unfinished Activizr installation. To do that, answer these simple questions:</p>
<div class="entrylabels" style="width:250px">
What is this server's /etc/hostname?<br />
What is this server's internal IP?<br />
What is your favorite color?
</div>
<div class="entryfields">
<asp:TextBox CssClass="textinput" ID="TextServerName" runat="server" />&nbsp;<br />
<asp:TextBox CssClass="textinput" ID="TextServerAddress" runat="server" />&nbsp;<br />
<asp:DropDownList runat="server" ID="DropFavoriteColor" runat="server" />&nbsp;<br />
</div>
</div>
<div id="step-2">
<h2 class="StepTitle">Step 2 Content</h2>
@@ -322,6 +312,29 @@
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
</div>
<div id="step-5">
<h2 class="StepTitle">Step 4 Content</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
</div>
</div>
+6
View File
@@ -25,6 +25,8 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
this.MainMenu.Style[HtmlTextWriterStyle.Top] = "7px";
this.MainMenu.Style[HtmlTextWriterStyle.Left] = "20px";
this.DropFavoriteColor.Style[HtmlTextWriterStyle.Width] = "155px";
this.LanguageSelector.LanguageChanged += new EventHandler(LanguageSelector_LanguageChanged);
Localize();
@@ -114,6 +116,10 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page
this.LabelSidebarTodoHeader.Text = Resources.Global.Sidebar_Todo;
this.LabelSidebarTodoConnectDatabase.Text = Resources.Pages.Init.Init_SidebarTodo_CompleteSetup;
this.DropFavoriteColor.Items.Clear();
this.DropFavoriteColor.Items.Add(" -- Select one --");
this.DropFavoriteColor.Items.Add("Blue!");
this.DropFavoriteColor.Items.Add("No, wait, yellow!");
SetupMenuItems();
+17 -14
View File
@@ -28,22 +28,24 @@
}
.swMain .stepContainer div.content {
display:block;
position: absolute;
float:left;
margin: 0;
padding:5px;
padding:5px;
padding-left: 15px;
text-align:left;
overflow:auto;
z-index:88;
clear:both;
display:block;
height: 300px;
/*position: absolute;
border-radius: 5px;
width:470px;
border: 1px solid #CCC;
font: normal 12px Ubuntu, sans-serif;
color:#5A5655;
background-color:#F8F8F8;
height:300px;
text-align:left;
overflow:auto;
z-index:88;
border-radius: 5px;
width:470px;
clear:both;
height:300px;*/
}
.swMain div.actionBar {
@@ -132,10 +134,11 @@
font: bold 15px Ubuntu, sans-serif;
}
.swMain ul.anchor li a .stepDesc small{
font: normal 10px Ubuntu, sans-serif;
font: normal 11px Ubuntu, sans-serif;
line-height: 12px;
}
.swMain ul.anchor li a.selected{
color:#F8F8F8;
color:#7F5500;
background: #EA8511; /* EA8511 */
border: 1px solid #EA8511;
cursor:text;
@@ -145,7 +148,7 @@
background: -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFC145', endColorstr='#F0AB22'); /* MSIE */
background: -moz-linear-gradient(top, #FFC145, #F0AB22); /* Mozilla */
background: -webkit-gradient(linear, left top, left bottom, from(#FFC145), to(#F0AB22)); /* Chrome, Safari */
text-shadow: #C78B15 0px 0px 3px, #C78B15 0px 0px 3px;
text-shadow: #FFEDC8 0px 0px 3px, #FFEDC8 0px 0px 3px;
border-color: #C78B15;
position: relative;
@@ -153,7 +156,7 @@
left: -1px;
}
.swMain ul.anchor li a.selected:hover {
color:#F8F8F8;
/* color:#F8F8F8; */
/* background: #EA8511; */
}