Skip to content

Commit

Permalink
Better text layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Guo Yunhe committed Jul 2, 2017
1 parent 1b43e5b commit 9a52599
Showing 1 changed file with 26 additions and 31 deletions.
57 changes: 26 additions & 31 deletions app/views/distributions/index.html.erb
Expand Up @@ -46,32 +46,36 @@

<section class="mb-4">
<div class="container">
<h2 id="choosing-which-distribution-to-download">
<h2 class="display-4 text-center mb-5">
<%= _('Choosing which Distribution to Download') %>
</h2>
<p>
<%= _('%{tumbleweed} is a <strong>rolling-release</strong>. This means the software is always the latest stable versions available from the openSUSE Project. Things will change regularly as Free and Open Source projects continually release new versions of their software.') % { tumbleweed: link_to(_('openSUSE Tumbleweed'), tumbleweed_distributions_path) } %>
</p>
<p>
<%= _('Tumbleweed is recommended for <strong>Developers</strong>, <strong>openSUSE Contributors</strong>, and <strong>Linux/FOSS Enthusiasts</strong>.') %>
</p>

<p>
<%= _('%{leap} is a <strong>regular-release</strong>. This means it releases %{annually}, with security and stability updates being the priority during each release %{lifetime}.') %
{ leap: link_to(_('openSUSE Leap'), leap_distributions_path),
annually: link_to(_('annually'), _('https://en.opensuse.org/openSUSE:Roadmap')),
lifetime: link_to(_('lifetime'), _("https://en.opensuse.org/Lifetime"))
} %>
<%= _('It is not expected to change in any significant way until its next annual release.') %>
</p>
<p>
<%= _('Leap shares a Common Base System with %{sles}, so major architectural changes are not expected for several years, aligned with each new Major Release (eg 12, 13, etc) of SUSE Linux Enterprise.') % {
sles: link_to(_('SUSE Linux Enterprise'), "https://www.suse.com/products/server/")
<div class="row mb-3">
<div class="col-md-6">
<p>
<%= _('%{tumbleweed} is a <strong>rolling-release</strong>. This means the software is always the latest stable versions available from the openSUSE Project. Things will change regularly as Free and Open Source projects continually release new versions of their software.') % { tumbleweed: link_to(_('openSUSE Tumbleweed'), tumbleweed_distributions_path) } %>
</p>
<p>
<%= _('Tumbleweed is recommended for <strong>Developers</strong>, <strong>openSUSE Contributors</strong>, and <strong>Linux/FOSS Enthusiasts</strong>.') %>
</p>
</div><!-- /.col- -->
<div class="col-md-6">
<p>
<%= _('%{leap} is a <strong>regular-release</strong>. This means it releases %{annually}, with security and stability updates being the priority during each release %{lifetime}.') %
{ leap: link_to(_('openSUSE Leap'), leap_distributions_path),
annually: link_to(_('annually'), _('https://en.opensuse.org/openSUSE:Roadmap')),
lifetime: link_to(_('lifetime'), _("https://en.opensuse.org/Lifetime"))
} %>
</p>
<p>
<%= _('Leap is recommended for <strong>Sysadmins</strong>, <strong>Enterprise Developers</strong>, and <strong>‘Regular’ Desktop Users</strong>.') %>
</p>
<%= _('It is not expected to change in any significant way until its next annual release.') %>
<%= _('Leap shares a Common Base System with %{sles}, so major architectural changes are not expected for several years, aligned with each new Major Release (eg 12, 13, etc) of SUSE Linux Enterprise.') % {
sles: link_to(_('SUSE Linux Enterprise'), "https://www.suse.com/products/server/")
} %>
</p>
<p>
<%= _('Leap is recommended for <strong>Sysadmins</strong>, <strong>Enterprise Developers</strong>, and <strong>‘Regular’ Desktop Users</strong>.') %>
</p>
</div><!-- /.col- -->
</div><!-- /.row -->

<p>
<%= _('Both distributions are well tested by <a href="https://openqa.opensuse.org">openQA</a> as well as by human openSUSE contributors so both can be relied upon to work.') %>
Expand All @@ -90,12 +94,3 @@
</p>
</div><!-- /.container -->
</section>

<section class="mb-4">
<div class="container">
<h2><a href="https://en.opensuse.org/Derivatives"><%= _('Derivatives') %></a></h2>
<p>
<%= _('openSUSE has a number of unofficial derivative distributions. These are made by our awesome community, often for special purposes.') %>
</p>
</div><!-- /.container -->
</section>

0 comments on commit 9a52599

Please sign in to comment.