[116825] branches/gsoc11-statistics/stats-server

8 Feb 2014

Revision: 116825
          https://trac.macports.org/changeset/116825
Author:   cal@macports.org
Date:     2014-02-07 17:57:57 -0800 (Fri, 07 Feb 2014)
Log Message:
-----------
macports stat: use macports colors and css

Modified Paths:
--------------
    branches/gsoc11-statistics/stats-server/app/views/categories/index.html.erb
    branches/gsoc11-statistics/stats-server/app/views/home/index.html.erb
    branches/gsoc11-statistics/stats-server/app/views/installed_ports/index.html.erb
    branches/gsoc11-statistics/stats-server/app/views/layouts/application.html.erb
    branches/gsoc11-statistics/stats-server/app/views/os_statistics/index.html.erb
    branches/gsoc11-statistics/stats-server/app/views/partials/_chart_draw.html.erb
    branches/gsoc11-statistics/stats-server/app/views/partials/_port_search.html.erb
    branches/gsoc11-statistics/stats-server/app/views/ports/index.html.erb
    branches/gsoc11-statistics/stats-server/app/views/ports/show.html.erb
    branches/gsoc11-statistics/stats-server/public/stylesheets/scaffold.css

Modified: branches/gsoc11-statistics/stats-server/app/views/categories/index.html.erb
===================================================================

--- branches/gsoc11-statistics/stats-server/app/views/categories/index.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/categories/index.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -1,19 +1,14 @@
-<div id="content">
+<%= render :partial => '/partials/port_search' %>
 
-  <%= render :partial => '/partials/port_search' %>
-
-  <h3>Port Categories</h3>
-
-  <div id="categories">
-
-  <% unless @categories.empty? %>
-    <ul>
-      <% @categories.each do |category| %>
-        <li><%= link_to category.name, category_ports_path(category.id) %></li>
-      <% end %>
-    </ul>
-  <% else %>
-    <p>No Categories found.</p>
-  <% end %>
-  </div>
-</div>
\ No newline at end of file
+<h2>Port Categories</h2>
+<div id="categories">
+	<% unless @categories.empty? %>
+		<ul>
+			<% @categories.each do |category| %>
+				<li><%= link_to category.name, category_ports_path(category.id) %></li>
+			<% end %>
+		</ul>
+	<% else %>
+		<p>No categories found.</p>
+	<% end %>
+</div>

Modified: branches/gsoc11-statistics/stats-server/app/views/home/index.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/home/index.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/home/index.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -1,25 +1,11 @@
-<% controller.set_chart_title :participating_users, 'Number of Participating Users' %>
-<% controller.set_chart_type  :participating_users, "LineChart" %>
-<h1>MacPorts Statistics</h1>
-
-<ul>
-	<li> <%= link_to "User System Information", os_statistics_path %> </li>
-	<li> <%= link_to "User Installed Ports", installed_ports_path %> </li>
-</ul>
-
-Total number of participating users: <%= User.count %> <br />
-Number of users last month (<%= @last_month %>): <%= @users_last_month %> <br />
-
-
 <%= render :partial => '/partials/port_search' %>
-<%= link_to "Browse By Category", categories_path %> </li>
 
-<br />
+<div id="metastatistics">
+	<h2>Participating Users</h2>
 
-<%# Draw charts - no tables %>
-<%= render :partial => '/partials/chart_draw', 
-    :locals => {:charts => [:participating_users], :drawtables => false} 
-%>
-
-
-
+	<p>Our statistics know about <strong><%= User.count %></strong> users in total. Last month (<%= @last_month %>), <strong><%= @users_last_month %></strong> users have submitted statistics.</p>
+	
+	<% controller.set_chart_title :participating_users, 'Participating Users' %>
+	<% controller.set_chart_type  :participating_users, "LineChart" %>
+	<%= render :partial => '/partials/chart_draw', :locals => {:charts => [:participating_users], :drawtables => false, :headers => false} %>
+</div>

Modified: branches/gsoc11-statistics/stats-server/app/views/installed_ports/index.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/installed_ports/index.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/installed_ports/index.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -1,33 +1,22 @@
-<% controller.set_chart_title :top25, 'Most popular ports this month' %>
-<% controller.set_chart_type  :top25, "BarChart" %>
+<h2>Port Statistics</h2>
+<p>The statistics server currently knows about <%= Port.count %> ports. On average, each participating user has <strong><%= @average_ports %></strong> of them installed.</p>
 
-<h1>Port Statistics</h1>
-
-Participating users: <%= User.count %> <br />
-Number of ports: <%= Port.count %> <br />
-Average number of ports installed per user: <%= @average_ports %><br />
-
-<br />
+<% unless @popular_port_month.nil? && @popular_port_year.nil? %>
+<h3>Popular Ports</h3>
+<% end %>
 <%# Most popular port this month %>
 <% unless @popular_port_month.nil? %>
-  <% port = @popular_port_month %>
-  Most popular port this month (<%= @month %>) is <%= link_to port.name, category_port_path(port.category, port) %>
-  with <%= @popular_port_month_count %> installs. <br />
+	<% port = @popular_port_month %>
+	<p>Most popular port this month (<%= @month %>) is <strong><%= link_to port.name, category_port_path(port.category, port) %></strong> with <strong><%= @popular_port_month_count %></strong> installs.</p>
 <% end %>
 
 <%# Most popular port this year %>
 <% unless @popular_port_year.nil? %>
-  <% port = @popular_port_year %>
-  Most popular port this year (<%= @year %>) is <%= link_to port.name, category_port_path(port.category, port) %>
-  with <%= @popular_port_year_count %> installs. <br />
+	<% port = @popular_port_year %>
+	<p>Most popular port this year (<%= @year %>) is <strong><%= link_to port.name, category_port_path(port.category, port) %></strong> with <strong><%= @popular_port_year_count %></strong> installs.</p>
 <% end %>
 
-<br />
-
 <%# Draw chart  %>
-<%= render :partial => '/partials/chart_draw', 
-    :locals => {:charts => [:top25],
-                :chart_width => 1000,
-                :chart_height => 1000} 
-%>
-
+<% controller.set_chart_title :top25, '25 top ports this month' %>
+<% controller.set_chart_type  :top25, "BarChart" %>
+<%= render :partial => '/partials/chart_draw', :locals => {:charts => [:top25], :chart_height => 850, :headers => true} %>

Modified: branches/gsoc11-statistics/stats-server/app/views/layouts/application.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/layouts/application.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/layouts/application.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -9,6 +9,40 @@
 		<%= render_visualizations %>
 	</head>
 	<body>
-		<%= yield %>
+		<h1>
+			<a href="//www.macports.org/" title="The MacPorts Project" class="title">
+				<span class="accessibility">The MacPorts Project</span>
+			</a>
+			<a href="/" title="MacPorts Project Statistics" class="subtitle">Statistics</a>
+		</h1>
+		<p class="accessibility">
+			<a href="#content">Skip to Content</a>
+		</p>
+		<div id="header">
+		</div>
+		<div id="navigation">
+			<dl>
+				<dt>Statistics</dt>
+				<dd>
+					<ul>
+						<li><%= link_to "Home", root_path %></li>
+						<li><%= link_to "System", os_statistics_path %></li>
+						<li><%= link_to "Installed Ports", installed_ports_path %></li>
+					</ul>
+				</dd>
+				<dt>Browse Ports</dt>
+				<dd>
+					<ul>
+						<li><%= link_to "By Category", categories_path %></li>
+						<li><%= link_to "Complete List", ports_path %></li>
+					</ul>
+				</dd>
+			</dl>
+		</div>
+		<div id="content">
+			<%= yield %>
+		</div>
+		<div id="footer">
+		</div>
 	</body>
 </html>

Modified: branches/gsoc11-statistics/stats-server/app/views/os_statistics/index.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/os_statistics/index.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/os_statistics/index.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -9,11 +9,9 @@
 
 <%# All these charts are pie charts - set :type to PieChart %>
 <% @charts.each do |chart_name, chartdata| %>
-  <% controller.set_chart_type chart_name, "PieChart" %>
+	<% controller.set_chart_type chart_name, "PieChart" %>
 <% end %>
 
-<br />
-
 <%# Order the charts %>
 <% ordered_charts = [:macports_version, 
                      :osx_version, 
@@ -23,16 +21,13 @@
                      :gcc_version,
                      :xcode_version] %>
 
-<h1> Operating System Statistics </h1>
-
+<h2>System Statistics</h2>
 <%# Generate links %>
-<ul>
-<% ordered_charts.each do |chart|  %>
-<li> <%= link_to controller.chart_title(chart), :anchor => chart %> </li>
-<% end %>
-</ul>
+	<ul>
+		<% ordered_charts.each do |chart|  %>
+			<li><%= link_to controller.chart_title(chart), :anchor => chart %></li>
+		<% end %>
+	</ul>
 
-<br />
-
 <%# Draw charts %>
-<%= render :partial => '/partials/chart_draw', :locals => {:charts => ordered_charts} %>
+<%= render :partial => '/partials/chart_draw', :locals => {:charts => ordered_charts, :headers => true} %>

Modified: branches/gsoc11-statistics/stats-server/app/views/partials/_chart_draw.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/partials/_chart_draw.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/partials/_chart_draw.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -1,6 +1,7 @@
 <%# Set Defaults %>
 <% drawtables_default = true %>
-<% chart_width_default = 600 %>
+<% headers_default = true %>
+<% chart_width_default = 700 %>
 <% chart_height_default = 400 %>
 
 <%# Check if locals have been passed to this partial %>
@@ -8,67 +9,65 @@
 
 <%# Avoid nil objects  %>
 <% if (defined? charts).nil? %>  
-  <% charts = Hash.new %>
+	<% charts = Hash.new %>
 <% end %>
 
 <%# Draw tables as well as visualizations? %>
 <% if (defined? drawtables).nil? %>
-  <% drawtables = drawtables_default %>
+	<% drawtables = drawtables_default %>
 <% end %>
 
+<%# Write headers? %>
+<% if (defined? headers).nil? %>
+	<% headers = headers_default %>
+<% end %>
+
 <%# Get chart width %>
 <% if (defined? chart_width).nil? %>
-  <% chart_width = chart_width_default %>
+	<% chart_width = chart_width_default %>
 <% end %>
 
 <%# Get chart height %>
 <% if (defined? chart_height).nil? %>
-  <% chart_height = chart_height_default %>
+	<% chart_height = chart_height_default %>
 <% end %>
 
 <%# Set visualization options %>
-<% vis_options = {:width => chart_width, 
-                  :height => chart_height, 
-                  :html => {:class => "graph_chart"}} 
-%>
-
+<% vis_options = {:width => chart_width, :height => chart_height, :backgroundColor => '#ededed', :fontName => 'Helvetica', :html => {:class => "graph_chart"}} %>
 <%# Set table options %>
-<% tbl_options = {:width => 600, 
-                  :html => {:class => "graph_chart"}} 
-%>
+<% tbl_options = {:width => 700, :html => {:class => "graph_chart"}} %>
 
-
 <%# Draw charts %>
 <% charts.each do |chart| %>
-  <% title = controller.chart_title chart %>
-  <% type = controller.chart_type chart %>
+	<% title = controller.chart_title chart %>
+	<% type = controller.chart_type chart %>
 
-  <%# Set titles %>
-  <!-- Chart title: <%= title %> -->
-  <% local_vis_options = vis_options.merge({ :title => title }) %>
-  <% local_tbl_options = tbl_options.merge({ :title => title }) %>
+	<%# Set titles %>
+	<!-- Chart title: <%= title %> -->
+	<% local_vis_options = vis_options.merge({ :title => title }) %>
+	<% local_tbl_options = tbl_options.merge({ :title => title }) %>
 
-  <%# Anchor %>
-  <a name=<%= chart %>> </a>
-  <%# Title %>
-  <h2> <%= title %> </h2>
- 
+	<%# Anchor %>
+	<a name=<%= chart %>> </a>
+	<%# Title %>
+	<% if headers %>
+		<h3><%= title %></h3>
+	<% end %>
 
-  <% if not controller.dataset_empty? chart %>
-    <%# Draw visualization %>
-    <% visualization chart.to_s, type, local_vis_options do |viz| %>
-      <% controller.populate_chart chart, viz %>
-    <% end %>
-    
-    <% if drawtables %>
-      <%# Draw table %>
-      <% table = chart.to_s + "_table" %>
-      <% visualization table, "Table", local_tbl_options do |viz| %>
-        <% controller.populate_chart chart, viz %>
-        <% end %>
-    <% end %>
-    
-  <% else %>
-    No data to display
-  <% end %>  
+	<% if not controller.dataset_empty? chart %>
+		<%# Draw visualization %>
+		<% visualization chart.to_s, type, local_vis_options do |viz| %>
+			<% controller.populate_chart chart, viz %>
+		<% end %>
+
+		<% if drawtables %>
+			<%# Draw table %>
+			<% table = chart.to_s + "_table" %>
+			<% visualization table, "Table", local_tbl_options do |viz| %>
+				<% controller.populate_chart chart, viz %>
+			<% end %>
+		<% end %>
+	<% else %>
+		<p class="no-data">No data to display.</p>
+	<% end %>  
 <% end %>

Modified: branches/gsoc11-statistics/stats-server/app/views/partials/_port_search.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/partials/_port_search.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/partials/_port_search.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -1,16 +1,11 @@
-<h2 class="hdr">MacPorts Portfiles</h2> 
-
-
-
-<br />
-
-<p>
-  <%= form_tag(search_generate_path, {:method => :get}) do %>
-    <%= select_tag :criteria, options_for_select({"Software Title" => "name", "Category" => "categories", "Maintainer" => "maintainers", "variant" => "variants", "Platform" => "platforms"}) %>
-    <%= text_field_tag :val, "", {:size => 40} %>
-    <%= submit_tag "Search" %>
-  <% end %>
-</p>
-
-<p>Or view the complete <%= link_to "ports list (#{Port.count} ports)", ports_path %>.</p> 
-<br />
\ No newline at end of file
+<div class="port-search">
+	<h2>Search for Port Statistics</h2> 
+	<p>
+		<%= form_tag(search_generate_path, {:method => :get}) do %>
+			<%= select_tag :criteria, options_for_select({"Software Title" => "name", "Category" => "categories", "Maintainer" => "maintainers", "variant" => "variants", "Platform" => "platforms"}) %>
+			<%= text_field_tag :val, "", {:size => 40} %>
+			<%= submit_tag "Search" %>
+		<% end %>
+	</p>
+	<p>Or view the complete <%= link_to "port list (#{Port.count} ports)", ports_path %>. You can also <%= link_to "browse by category", categories_path %>.</p> 
+</div>

Modified: branches/gsoc11-statistics/stats-server/app/views/ports/index.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/ports/index.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/ports/index.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -1,47 +1,33 @@
-<div id="content">
-  <%= render :partial => '/partials/port_search' %>
+<%= render :partial => '/partials/port_search' %>
 
-  <h3>Query Results</h3>
-
+<h2>Query Results</h2>
 <% unless @ports.empty? %>
-  <p>
-    <%= ((@page.to_i - 1) * 50) + 1 %> - <%= @page.to_i * 50 %> of <%= Port.count %> Portfiles Selected
-  </p>
-  <p>
-    <%= will_paginate @ports %>
-  </p>
+	<p><strong><%= ((@page.to_i - 1) * 50) + 1 %></strong> - <strong><%= @page.to_i * 50 %></strong> of <%= Port.count %> Portfiles selected</p>
+	<p><%= will_paginate @ports %></p>
 
-  <% @ports.each do |port| %>
-    <dl>
-      <dt><b><%= link_to port.name, category_port_path(port.category, port) %></b> <%= port.version %></dt>
-      <dd>
-        <% unless port.description.nil? %>
-          <%= port.description %><br />
-        <% end %>
-
-        <% unless port.maintainers.nil? %>
-          <i>Maintained by:</i> <b><span class="email"><%= port.maintainers %></span></b><br>
-        <% end %>
-
-        <% unless port.categories.nil? %>
-          <i>Categories:</i> <%= print_search_links(port, "categories") %><br />
-        <% end %>
-
-        <% unless port.platforms.nil? %>
-          <i>Platforms:</i> <%= print_search_links(port, "platforms") %><br />
-        <% end %>
-
-        <% unless port.variants.nil? %>
-          <i>Variants:</i> <%= print_search_links(port, "variants") %>
-        <% end %>
-      </dd>
-    </dl>
-  <% end %>
+	<% @ports.each do |port| %>
+		<dl>
+			<dt><strong><%= link_to port.name, category_port_path(port.category, port) %></strong> <%= port.version %></dt>
+			<dd>
+				<% unless port.description.nil? %>
+					<p><%= port.description %></p>
+				<% end %>
+				<% unless port.maintainers.nil? %>
+					<i>Maintained by:</i> <span class="email"><%= port.maintainers %></span><br />
+				<% end %>
+				<% unless port.categories.nil? %>
+					<i>Categories:</i> <%= print_search_links(port, "categories") %><br />
+				<% end %>
+				<% unless port.platforms.nil? %>
+					<i>Platforms:</i> <%= print_search_links(port, "platforms") %><br />
+				<% end %>
+				<% unless port.variants.nil? %>
+					<i>Variants:</i> <%= print_search_links(port, "variants") %>
+				<% end %>
+			</dd>
+		</dl>
+	<% end %>
+	<p><%= will_paginate @ports %></p>
 <% else %>
-  <p>No ports found.</p>
+	<p class="no-data">No ports matched your query.</p>
 <% end %>
-
-  <p>
-    <%= will_paginate @ports %>
-  </p>
-</div>
\ No newline at end of file

Modified: branches/gsoc11-statistics/stats-server/app/views/ports/show.html.erb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/views/ports/show.html.erb	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/app/views/ports/show.html.erb	2014-02-08 01:57:57 UTC (rev 116825)
@@ -4,7 +4,7 @@
 <% controller.set_chart_title :variant_count, 'All Variants' %>
 <% controller.set_chart_type :variant_count, 'PieChart' %>
 
-<% controller.set_chart_title :versions_over_time, 'Top Versions in use Over Last 12 Months' %>
+<% controller.set_chart_title :versions_over_time, 'Top Versions Over Last 12 Months' %>
 <% controller.set_chart_type :versions_over_time, 'LineChart' %>
 
 <% controller.set_chart_title :installs_over_time, 'Installations Over Last 12 Months' %>
@@ -16,75 +16,36 @@
                      :version_count, 
                      :variant_count] %>
 
-<h1> <%= @port.name %> </h1>
+<h2><%= @port.name %> Metadata</h2>
+<dl>
+	<dt>Current Version</dt>
+	<dd><%= @port.version %></dd>
+	<% unless @port.description.nil? %>
+		<dt>Description</dt>
+		<dd><%= @port.description %></dd>
+	<% end %>
+	<% unless @port.licenses.nil? %>
+		<dt>Licenses</dt>
+		<dd><%= @port.licenses %></dd>
+	<% end %>
+	<% unless @port.categories.nil? %>
+		<dt>Categories</dt>
+		<dd><%= @port.categories %></dd>
+	<% end %>
+	<% unless @port.variants.nil? %>
+		<dt>Variants</dt>
+		<dd><%= @port.variants %></dd>
+	<% end %>
+</dl>
 
-<br />
+<h2><%= @port.name %> Statistics</h2>
+<%# Generate links %>
+<ul>
+	<% ordered_charts.each do |chart|  %>
+		<li><%= link_to controller.chart_title(chart), :anchor => chart %></li>
+	<% end %>
+</ul>
 
-<div id="content">
-  <p>
-    <strong>Current Version:</strong> <%= @port.version %>
-  </p>
+<%# Draw charts %>
 
-  <% unless @port.description.nil? %>
-    <p>
-      <strong>Description:</strong> <%= @port.description %>
-    </p>
-  <% end %>
-
-  <% unless @port.licenses.nil? %>
-    <p>
-      <strong>Licenses:</strong> <%= @port.licenses %>
-    </p>
-  <% end %>
-
-  <p>
-    <strong>Categories</strong>
-    <%=h @port.categories %>
-  </p>
-
-  <% unless @port.variants.nil? %>
-    <p>
-      <strong>Variants:</strong> <%=h @port.variants %>
-    </p>
-  <% end %>
-
-  </div>
-  
-  <br />
-  
-  <h2> Stats </h2>
-
-  <%# Generate links %>
-  <ul>
-  <% ordered_charts.each do |chart|  %>
-  <li> <%= link_to controller.chart_title(chart), :anchor => chart %> </li>
-  <% end %>
-  </ul>
-
-  <br />
-
-  <%# Draw charts %>
-  
-  <%= render :partial => '/partials/chart_draw', :locals => {:charts => ordered_charts} %>
-
-  <table border=1>
-    <tr>
-      <th> ID </th>
-      <th> port_id </th>
-      <th> version </th>
-      <th> variants </th>
-      <th> modified_date </th>
-    </tr>
-
-  <% @installed.each do |row| %>
-    <tr>
-      <td> <%= row.id %> </td>
-      <td> <%= row.port_id %> </td>
-      <td> <%= row.version %></td>
-      <td> <%= row.variants %> </td>
-      <td> <%= row.updated_at %> </td>
-    </tr>
-  <% end %>
-  </table>
-  
-</div>
+<%= render :partial => '/partials/chart_draw', :locals => {:charts => ordered_charts, :headers => true} %>

Modified: branches/gsoc11-statistics/stats-server/public/stylesheets/scaffold.css
===================================================================
--- branches/gsoc11-statistics/stats-server/public/stylesheets/scaffold.css	2014-02-07 23:55:45 UTC (rev 116824)
+++ branches/gsoc11-statistics/stats-server/public/stylesheets/scaffold.css	2014-02-08 01:57:57 UTC (rev 116825)
@@ -1,56 +1,196 @@
-body { background-color: #fff; color: #333; }
+body {
+	margin: 0;
+	padding: 30px 40px;
 
-body, p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size:   13px;
-  line-height: 18px;
+	background: url("//macports.org/img/top-backdrop.png") repeat-x #ededed;
+	color: #000;
+
+	font: 12px/1.2em Helvetica, Arial, sans-serif;
 }
 
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
+.accessibility {
+	margin: 0;
+	display: block;
+	overflow: hidden;
+	width: 0;
+	height: 0;
 }
 
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
+a:link {
+	color: #0155CD;
+	text-decoration: underline;
+}
 
-div.field, div.actions {
-  margin-bottom: 10px;
+a:visited {
+	color: #012567;
 }
 
-#notice {
-  color: green;
+a:hover {
+	color: #3591ED;
 }
 
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
+h1, h2, h3 {
+	margin: 0;
+	color: white;
 }
 
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
+h1 {
+	float: left;
 }
 
-#error_explanation h2 {
-  text-align: left;
-  font-weight: bold;
-  padding: 5px 5px 5px 15px;
-  font-size: 12px;
-  margin: -7px;
-  margin-bottom: 0px;
-  background-color: #c00;
-  color: #fff;
+h1 a.title {
+	display: block;
+	float: left;
+	width: 183px;
+	height: 70px;
+	background: url("//macports.org/img/macports-logo-top.png");
+	background-size: 183px 73px;
 }
 
-#error_explanation ul li {
-  font-size: 12px;
-  list-style: square;
+h1 a.subtitle {
+	float: left;
+	font-size: 32px;
+	padding-top: 18px;
+	color: #0155cd;
+	text-decoration: none;
 }
+
+h2, h3 {
+	background: #8695B3;
+	padding: 0.2em;
+}
+
+h2 {
+	font: bold 24px "Lucida Grande", Helvetica, Arial, sans-serif;
+}
+
+#header {
+	height: 51px;
+	margin: 21px 0 17px 191px;
+	min-width: 250px;
+	max-width: 700px;
+}
+
+#header div, #header span {
+	float: right;
+}
+
+#navigation {
+	width: 183px;
+	float: left;
+	clear: left;
+	background: url("//macports.org/img/nav-header.png") top no-repeat #B1BACC;
+	line-height: 1.4em;
+}
+
+#navigation dl {
+	padding: 16px 0;
+	margin: 0;
+	background: url("//macports.org/img/nav-footer.png") bottom no-repeat;
+}
+
+#navigation dt {
+	margin: 0;
+	padding: 0 16px;
+	color: white;
+	font: bold 125% "Lucida Grande", Helvetica, Arial, sans-serif;
+}
+
+#navigation dd {
+	margin: 0;
+	padding: 0;
+}
+
+#navigation ul {
+	margin: 0 0 1em 0;
+	padding: 0;
+}
+
+#navigation li {
+	display: block;
+	margin-bottom: 1px;
+	padding: 0 16px 0 28px;
+}
+
+#navigation a {
+	text-decoration: none;
+	color: #242933;
+}
+
+#navigation a:hover {
+	text-decoration: underline;
+}
+
+.selected {
+	background: #8898ab;
+	font-weight: bold;
+}
+
+.warnings {
+	background: #FCC;
+	border: 2px solid #F66;
+	padding: 6px;
+	margin: 7px 7px 7px 198px;
+	min-width: 320px;
+	max-width: 670px;
+}
+
+.warnings p {
+	margin: 1em 0 0 0;
+	font-size: 1.2em;
+	font-weight: bold;
+}
+
+.warnings p:first-child {
+	margin: 0;
+}
+
+#content {
+	padding: 1px 0 40px 191px;
+	min-width: 350px;
+	max-width: 700px;
+}
+
+#content li {
+	margin-bottom: 0.7em;
+}
+
+#content li p {
+	margin: 0.6em 0 1.4em 0;
+	padding-left: 1.6em;
+}
+
+#content li ul {
+	margin-top: 0.7em;
+}
+
+
+#footer {
+	font-size: 90%;
+	clear: both;
+	text-align: center;
+}
+
+#footer img {
+	border: 0;
+	height: 31px;
+	width: 88px;
+}
+
+.graph_chart {
+	margin-bottom: 20px;
+}
+
+#content dl dt {
+	font-weight: bold;
+}
+
+#content .no-data {
+	margin: 10px auto;
+	text-align: center;
+	color: #8898ab;
+}
+
+.port-search form, .port-search p {
+	text-align: center;
+}

    

[116825] branches/gsoc11-statistics/stats-server

cal＠macports.org