Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorAlex Legler <alex@a3li.li>2014-04-20 11:41:09 +0200
committerAlex Legler <alex@a3li.li>2014-04-20 11:41:09 +0200
commita41215c4ab710fcbbe4185b9871ccd6982c34f33 (patch)
treed63b60118a092beb5db36f72431b8228afcc1d2c /views
parent...but all visible notices count when calculating the number of items (diff)
downloadinfra-status-a41215c4ab710fcbbe4185b9871ccd6982c34f33.tar.gz
infra-status-a41215c4ab710fcbbe4185b9871ccd6982c34f33.tar.bz2
infra-status-a41215c4ab710fcbbe4185b9871ccd6982c34f33.zip
infra-status 1.5
* Items in the service overview are clickable, filtering notices * Share button * Tyrian update * Human names for services now come from services.rb * New icons
Diffstat (limited to 'views')
-rw-r--r--views/index.erb81
-rw-r--r--views/layout.erb17
-rw-r--r--views/notice.erb9
3 files changed, 17 insertions, 90 deletions
diff --git a/views/index.erb b/views/index.erb
index 98869a2..f8ea886 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -7,91 +7,18 @@
<div class="row">
<div class="col-lg-4">
<h3>Community Services</h3>
- <ul class="list-group">
- <li class="list-group-item">
- <%= service_info 'www' %>
- gentoo.org Website
- </li>
- <li class="list-group-item">
- <%= service_info 'forums' %>
- Forums
- </li>
- <li class="list-group-item">
- <%= service_info 'wiki' %>
- Wiki
- </li>
- <li class="list-group-item">
- <%= service_info 'planet' %>
- Planet Gentoo
- </li>
- <li class="list-group-item">
- <%= service_info 'pgo' %>
- Package Database
- </li>
- <li class="list-group-item">
- <%= service_info 'lists' %>
- Mailing Lists
- </li>
- <li class="list-group-item">
- <%= service_info 'archives' %>
- Mailing List Archives
- </li>
- </ul>
+ <%= services_info %w[www forums wiki planet pgo lists archives] %>
</div>
<div class="col-lg-4">
<h3>Development Services</h3>
- <ul class="list-group">
- <li class="list-group-item">
- <%= service_info 'cvs' %>
- CVS Server
- </li>
- <li class="list-group-item">
- <%= service_info 'bugzilla' %>
- Bugzilla
- </li>
- <li class="list-group-item">
- <%= service_info 'rsync' %>
- Master <tt>rsync</tt> Mirror
- </li>
- <li class="list-group-item">
- <%= service_info 'devmanual' %>
- Developer Manual
- </li>
- <li class="list-group-item">
- <%= service_info 'overlays' %>
- Overlays
- </li>
- <li class="list-group-item">
- <%= service_info 'sources' %>
- Source Code Browser
- </li>
- </ul>
+ <%= services_info %w[cvs bugzilla rsync devmanual overlays sources] %>
</div>
<div class="col-lg-4">
<h3>Developer Resources</h3>
- <ul class="list-group">
- <li class="list-group-item">
- <%= service_info 'dgo_ssh' %>
- <tt>dev.gentoo.org</tt> Shell Access
- </li>
- <li class="list-group-item">
- <%= service_info 'dgo_http' %>
- <tt>dev.gentoo.org</tt> Web Hosting
- </li>
- <li class="list-group-item">
- <%= service_info 'dgo_smtp' %>
- In-/Outbound Email (SMTP)
- </li>
- <li class="list-group-item">
- <%= service_info 'dgo_mbox' %>
- Mailbox Access (POP/IMAP)
- </li>
- </ul>
+ <%= services_info %w[dgo_ssh dgo_http dgo_smtp dgo_mbox] %>
</div>
-
</div>
-
-<h2>Maintenance and Outage Notices</h2>
+<h2 id="notices">Maintenance and Outage Notices <small id="notices-for"></small></h2>
<%= partial :notice, :collection => NoticeStore.instance.visible_notices %> \ No newline at end of file
diff --git a/views/layout.erb b/views/layout.erb
index c31a71a..a3dc612 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -5,7 +5,9 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
+ <!--<link href="/assets/css/bootstrap.css" rel="stylesheet" media="screen">-->
<link href="/assets/css/bootstrap.css" rel="stylesheet" media="screen">
+ <link href="/assets/css/tyrian.css" rel="stylesheet" media="screen">
<link rel="icon" href="http://www.gentoo.org/favicon.ico" type="image/x-icon">
</head>
<body>
@@ -13,11 +15,11 @@
<div class="site-title">
<div class="container">
<div class="row">
- <div class="site-title-buttons hidden-xs">
+ <div class="site-title-buttons">
<div class="btn-group btn-group-sm">
- <button type="button" class="btn btn-primary">Get Gentoo!</button>
+ <a href="http://get.gentoo.org/" type="button" class="get-gentoo btn">Get Gentoo!</a>
<div class="btn-group btn-group-sm">
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ <button type="button" class="gentoo-org-sites btn" data-toggle="dropdown">
<span class="glyphicon glyphicon-globe"></span> gentoo.org sites <span class="caret"></span>
</button>
<ul class="dropdown-menu">
@@ -46,7 +48,7 @@
</div>
</div>
</div>
- <nav class="navbar navbar-default navbar-static-top clearfix" role="navigation">
+ <nav class="tyrian-navbar" role="navigation">
<div class="container">
<div class="row">
<div class="navbar-header">
@@ -60,7 +62,7 @@
<div class="collapse navbar-collapse navbar-main-collapse">
<ul class="nav navbar-nav">
<li><a href="/">Home</a></li>
- <li><a href="/feed.atom"><span class="glyphicon glyphicon-bullhorn"></span> Atom Feed</a></li>
+ <li><a href="/feed.atom"><span class="fa fa-rss"></span> Atom Feed</a></li>
</ul>
</div>
</div>
@@ -110,6 +112,7 @@
<script src="/assets/js/jquery.js"></script>
<script src="/assets/js/bootstrap.js"></script>
+<script src="/assets/js/infra-status.js"></script>
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(["trackPageView"]);
@@ -122,10 +125,6 @@
var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
})();
-
- jQuery(function($) {
- $('.has-tooltip').tooltip()
- });
</script>
</body>
</html>
diff --git a/views/notice.erb b/views/notice.erb
index 5a91342..378c95b 100644
--- a/views/notice.erb
+++ b/views/notice.erb
@@ -1,4 +1,4 @@
-<div class="panel <%= panel_class(notice) %>">
+<div class="panel <%= panel_class(notice) %> notice" data-services="<%= notice['affects'].join ' ' %>" data-url="<%= notice.url %>">
<div class="panel-heading">
<h3 class="panel-title"><%= item_icon notice['type']%> <a href="/notice/<%= h notice['id'] %>"><%= h notice['title'] %></a></h3>
</div>
@@ -26,13 +26,14 @@
<% else %>
<div class="col-sm-4"></div>
<% end %>
- <div class="col-sm-4 has-tooltip" data-toggle="tooltip" data-placement="top" title="Estimated time of service recovery">
+ <div class="col-sm-4">
+ <button class="btn btn-default pull-right btn-xs share-btn" data-toggle="popover" data-content="<button onclick='InfraStatus.share(this);' class='btn btn-default btn-sm btn-facebook'><i class='fa fa-facebook'></i></button> <button onclick='InfraStatus.share(this);' class='btn btn-default btn-sm btn-google-plus'><i class='fa fa-google-plus'></i></button> <button onclick='InfraStatus.share(this);' class='btn btn-default btn-sm btn-twitter'><i class='fa fa-twitter'></i></button>"><span class="fa fa-share"></span></button>
<span class="glyphicon glyphicon-ok pull-left" title="Estimated time of service recovery"></span>
- <div style="margin-left: 1.25em;">
+ <div style="margin-left: 1.25em;" class="has-tooltip" data-toggle="tooltip" data-placement="top" title="Estimated time of service recovery">
<% if notice.has_key? 'eta' %>
<em><%= date_format notice['eta'] %></em> (estimated)
<% else %>
- No estimated time of service recovery available.
+ No ETA for service recovery available.
<% end %>
</div>
</div>