Browse Source

some ux improvements

eal 4 months ago
parent
commit
5d93dd8770
4 changed files with 43 additions and 36 deletions
  1. 32
    27
      events/events.en.xhtml
  2. BIN
      graphics/infomaterial-450px.png
  3. 9
    7
      index.en.xhtml
  4. 2
    2
      news/news.en.xhtml

+ 32
- 27
events/events.en.xhtml View File

@@ -11,33 +11,38 @@
11 11
     <include-events/>
12 12
   </body>
13 13
 
14
-  <sidebar promo="none">
15
-    <h2><i class="fa"></i></h2>
16
-    <p>
17
-      Free Software Foundation Europe participates in many Free
18
-      Software events. If you know about a FSFE related event that is not yet
19
-      listed here or that you run on your own, you can easily add it by
20
-      using our <a href="/community/tools/eventregistration.html">event
21
-      announcement tool</a>.
22
-    </p>
23
-    <p>
24
-      Some internal events are only announced on our <a href="http://wiki.fsfe.org/Events">wiki</a>.
25
-    </p>
26
-    
27
-    <p>The FSFE's events are covered by our <a href="https://fsfe.org/about/codeofconduct">Code of Conduct</a> that kindly asks all participants to be excellent to each other.
28
-    </p>
29
-    <div class="share-buttons-sidebar">
30
-      <a target="_blank" href="https://fsfe.org/news/newsletter">
31
-        <button class="share-button-sidebar share-mail">Newsletter</button>
32
-      </a>
33
-      <a target="_blank" href="events.rss">
34
-        <button class="share-button-sidebar share-rss">RSS Feed</button>
35
-      </a>
36
-      <a target="_blank" href="webcal://fsfe.org/events/events.en.ics">
37
-        <button class="share-button-sidebar share-cal">iCalendar feed</button>
38
-      </a>
39
-    </div>
40
-  </sidebar>
14
+    <sidebar promo="none">
15
+		<h2>Follow our events</h2>
16
+			<p>Free Software Foundation Europe participates in many Free
17
+			  Software events. Official events end up on this page. To make sure to not miss them you can follow our events via <a href="/events/events.en.rss">RSS</a> or as <a href="webcal://fsfe.org/events/events.en.ics">iCalendar feed</a>.</p>
18
+
19
+			<div class="share-buttons-sidebar">
20
+			  <a target="_blank" href="events.rss">
21
+				<button class="share-button-sidebar share-rss">RSS Feed</button>
22
+			  </a>
23
+			  <a target="_blank" href="	">
24
+				<button class="share-button-sidebar share-cal">iCalendar feed</button>
25
+			  </a>
26
+			</div>
27
+
28
+		
29
+		<h2>Add an event</h2>
30
+			<p>  If you know about a FSFE related event that is not yet
31
+			  listed here or that you run on your own, you can easily add it by
32
+			  using our <a href="/community/tools/eventregistration.html">event
33
+			  announcement tool</a>.
34
+
35
+				<div style="margin: -1.5em 0 2em 0;">
36
+					  <a class="big-donate" href="/community/tools/eventregistration.html">Add event</a>
37
+				</div>
38
+			</p>
39
+		<h2>Code of Conduct</h2>
40
+			<p>All FSFE's events are covered by our <a href="https://fsfe.org/about/codeofconduct.html">Code of Conduct</a> that kindly asks all participants to be excellent to each other.
41
+			</p>
42
+		<h2>Self-created events</h2>
43
+			<p>Some inofficial and self-organised community events are only announced in our <a href="http://wiki.fsfe.org/Events">wiki calendar</a>. If you are interested, make sure to not miss them.
44
+			</p>
45
+	</sidebar>
41 46
 
42 47
   <text id="current">Current events</text>
43 48
   <text id="future">Future events</text>

BIN
graphics/infomaterial-450px.png View File


+ 9
- 7
index.en.xhtml View File

@@ -26,7 +26,7 @@
26 26
         <all-news />
27 27
         <div class="more-news">
28 28
           <a href="/news/news.html" class="learn-more">See all news</a>
29
-          <a href="https://planet.fsfe.org/en" class="learn-more community-blog-link">Read the Community blog</a>
29
+          <a href="https://planet.fsfe.org/en" class="learn-more community-blog-link">Read the Community blogs</a>
30 30
         </div>
31 31
       </div>
32 32
 
@@ -52,18 +52,20 @@
52 52
       </div>
53 53
 
54 54
       <div id="shop-promo" class="section">
55
-        <div class="home-shop-block">
56
-          <a href="/order/order.html?ref-frontpage" class="home-order-image-container">
57
-            <img src="/graphics/t-shirt-promo-v2.png" alt="" class="home-order-image" />
55
+		  <div class="home-shop-block">
56
+          <a href="/contribute/spreadtheword.html" class="home-order-image-container">
57
+            <img src="/graphics/infomaterial-450px.png" alt="" class="home-order-image" />
58 58
           </a>
59
-          <a class="big-donate" href="/order/order.html?ref-frontpage">Shop</a>
59
+          <a class="big-donate" href="/contribute/spreadtheword.html">Infomaterial</a>
60 60
         </div>
61
+		  
61 62
         <div class="home-shop-block">
62 63
           <a href="/order/order.html?ref-frontpage" class="home-order-image-container">
63
-            <img src="/graphics/pr-material.png" alt="" class="home-order-image" />
64
+            <img src="/graphics/t-shirt-promo-v2.png" alt="" class="home-order-image" />
64 65
           </a>
65
-          <a class="big-donate" href="/order/order.html?ref-frontpage">Promotion material</a>
66
+          <a class="big-donate" href="/order/order.html?ref-frontpage">Shop</a>
66 67
         </div>
68
+        
67 69
       </div>
68 70
     </div>
69 71
   </body>

+ 2
- 2
news/news.en.xhtml View File

@@ -39,7 +39,7 @@
39 39
       <h2>Follow our News</h2>
40 40
 
41 41
       <p>
42
-        To keep up with our latest news, you can subscribe our <a href="/news/news.en.rss">RSS feed</a> and
42
+        To keep up with our latest news, subscribe to our <a href="/news/news.en.rss">RSS feed</a> and
43 43
         our <a href="/news/newsletter">Newsletter</a>.
44 44
       </p>
45 45
 
@@ -56,7 +56,7 @@
56 56
       <h2>Social Media</h2>
57 57
 
58 58
       <p>
59
-        For instant updates and hot news you can also follow us on <a
59
+        For short news follow us on <a
60 60
           href="https://mastodon.social/@fsfe">Mastodon</a>, <a href="https://diasp.eu/u/fsfe">Diaspora</a>, <a
61 61
           href="https://twitter.com/fsfe">Twitter</a> and <a href="https://facebook.com/thefsfe">Facebook</a>.
62 62
       </p>

Loading…
Cancel
Save