Bug 980489 - Reorder links on calendar project main page

bedrock/mozorg/templates/mozorg/projects/calendar.html

@@ -33,31 +33,9 @@
   </div>
   <div class="midbox">
       <p>{{ _('Organize your schedule and life&rsquo;s important events in a calendar that&rsquo;s fully integrated with your Thunderbird or Seamonkey email. Manage multiple calendars, create your daily to do list, invite friends to events, and subscribe to public calendars.') }}</p>
-      <p>{{ _('Our contributors have put together <a href="%s">holiday calendars</a> for many national holiday schedules.')|format(url('mozorg.projects.holiday_calendars')) }}</p>
   </div>
   <div class="items">
     <ul>
-      <li>
-        <img src="{{ media('/img/projects/calendar/bulb-icon.png') }}" alt="">
-        <div class="itemtext">
-          <a href="https://support.mozilla.org/products/thunderbird/calendar" class="title">{{ _('Knowledge Base') }}</a>
-          <span class="desc">{{ _('Need help with Lightning?') }}</span>
-        </div>
-      </li>
-      <li>
-        <img src="{{ media('/img/projects/calendar/question-icon.png') }}" alt="">
-        <div class="itemtext">
-          <a href="http://getsatisfaction.com/mozilla_messaging/" class="title">{{ _('Get Support') }}</a>
-          <span class="desc">{{ _('No luck above? Ask a question!') }}</span>
-        </div>
-      </li>
-      <li>
-        <img src="{{ media('/img/projects/calendar/bug-icon.png') }}" alt="">
-        <div class="itemtext">
-          <a href="https://bugzilla.mozilla.org/enter_bug.cgi?product=Calendar" class="title">{{ _('Bugzilla') }}</a>
-          <span class="desc">{{ _('Found a bug? Let us know!') }}</span>
-        </div>
-      </li>
       <li>
         <img src="{{ media('/img/projects/calendar/info-icon.png') }}" alt="">
         <div class="itemtext">
@@ -65,6 +43,20 @@
           <span class="desc">{{ _('Thunderbird, Seamonkey, what version?') }}</span>
         </div>
       </li>
+      <li>
+        <img src="{{ media('/img/projects/calendar/question-icon.png') }}" alt="">
+        <div class="itemtext">
+          <a href="https://support.mozilla.org/products/thunderbird/calendar" class="title">{{ _('Get Support') }}</a>
+          <span class="desc">{{ _('Need help with Lightning?') }}</span>
+        </div>
+      </li>
+      <li>
+        <img src="{{ media('/img/projects/calendar/holiday-icon.png') }}" alt="">
+        <div class="itemtext">
+          <a href="{{ url('mozorg.projects.holiday_calendars') }}" class="title">{{ _('Holiday Calendars') }}</a>
+          <span class="desc">{{ _('Need a break? Now you know when!') }}</span>
+        </div>
+      </li>
       <li>
         <img src="{{ media('/img/projects/calendar/tools-icon.png') }}" alt="">
         <div class="itemtext">
@@ -72,11 +64,18 @@
           <span class="desc">{{ _('Dive into development.') }}</span>
         </div>
       </li>
+      <li>
+        <img src="{{ media('/img/projects/calendar/bug-icon.png') }}" alt="">
+        <div class="itemtext">
+          <a href="https://bugzilla.mozilla.org/enter_bug.cgi?product=Calendar" class="title">{{ _('Bugzilla') }}</a>
+          <span class="desc">{{ _('Found a bug? Let us know!') }}</span>
+        </div>
+      </li>
       <li>
         <img src="{{ media('/img/projects/calendar/bugspray-icon.png') }}" alt="">
         <div class="itemtext">
           <a href="http://www.joshmatthews.net/bugsahoy/?calendar=1 " class="title">{{ _('Bugs Ahoy!') }}</a>
-          <span class="desc">{{ _('Want to make a difference? Find a bug that fits your interests.') }}</span>
+          <span class="desc">{{ _('Want to make a difference? Fix a bug that fits your interests.') }}</span>
         </div>
       </li>
     </ul>