X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=etc%2Fproducer%2Fstartpage.template;h=6eef45232d7caa1d5d98ac14507ec9ba984fa1ec;hb=317b86eb93cc794b255f2c36b1f3cf69dc0be9b7;hp=9e9d255a2ff0e67010a8b13c08101dbf3905c6a1;hpb=55220c800520075ca76a361dc7ec387d393990d2;p=nyc.indymedia.org.git

diff --git a/etc/producer/startpage.template b/etc/producer/startpage.template
index 9e9d255..6eef452 100755
--- a/etc/producer/startpage.template
+++ b/etc/producer/startpage.template
@@ -1,19 +1,12 @@
-<comment>
-  Template file for the front page.  
-  - all paths relative to /
-  - no complicated freemarker code
-</comment><!DOCTYPE HTML PUBLIC 
-   "-//W3C//DTD HTML 4.01 Transitional//EN" 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
    "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
    <title>${config["Mir.Name"]}</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}"> 
-   <meta name="keywords" content="">
-   <meta name="description" content="">
-   <!-- <meta http-equiv="expires" content="599"> -->
-   <meta http-equiv="pragma" content="no-cache">
-   <link rel="stylesheet" type="text/css" href="http://sarai.indymedia.org/~patrick/mir.nyc/css/main.css" />
+   <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}" /> 
+   <meta name="keywords" content="" />
+   <meta name="description" content=""  />
+   <link rel="stylesheet" type="text/css" href="/css/main.css" />
 
 </head>
 
@@ -31,17 +24,23 @@
                      begin breaking news
                   </comment>
                   <if breakingnews && breakingnews[0].text!=".">
-                     <p class="breakingNews">
-                        <b class="title">${lang("startpage.breakingnews")}</b>
+                     <div class="breakingNews">
+                        <p class="title">
+                           <b>${lang("startpage.breakingnews")}</b>
+                        </p>
                         <assign stop="0">
                         <list breakingnews as bn>
+                          <div>
                           <if bn.text=="."><assign stop="1"></if>
                           <if stop=="0">
-                              ${bn.creationdate.formatted["dd-MM-yyyy HH:mm"]}:
-                              ${bn.text}
+                              <p>
+                                 <span class="datestamp">${bn.creationdate.formatted["MMM dd hh:mm'<span>'a'</span>'"]}:</span>
+                                 ${bn.text}
+                              </p>
                           </if>
+                          </div>
                         </list>
-                     </p>
+                     </div>
                   </if>
                   <comment>
                      end breaking news
@@ -58,18 +57,16 @@
                            <else>
                               <assign i=f>
                            </if>
-                           <p class="title">
+                           <p class="headline">
                               <b><a
                               href="${config["Producer.DocRoot"]}/${language.code}/${i.date.formatted["yyyy'/'MM"]}/${i.id}.html" 
                               >${i.title}</a></b>
                            </p>
                            <p class="summary">
                               <small class="author">${forig.creator}&#160;|</small>
-                              ${i.description_parsed}
-                              <small><span class="comments">${i.commentcount}&#160;Comment(s)</span>
-                              <a 
-                              href="${config["Producer.DocRoot"]}/${language.code}/${i.date.formatted["yyyy'/'MM"]}/${i.id}.html" 
-                              class="readMore">${lang("general.readmore")}</a></small>
+                              <span class="lead">${i.subtitle}</span>
+                              <small><span class="comments">${i.commentcount} Comments</span>
+                              <a href="${config["Producer.DocRoot"]}/${language.code}/${i.date.formatted["yyyy'/'MM"]}/${i.id}.html" class="readMore">${lang("general.readmore")}</a></small>
                            </p>
                      </list>
                   </div>
@@ -100,7 +97,8 @@
                      <list mostcomments as mc>
                      <div class="storyWrap">      
                         <p class="story">
-                           <a href="#"><img src="http://sarai.indymedia.org/~patrick/mir.nyc/img/zapatista.02.gif" class="icon" border="0" /></a>
+                           <!-- placeholder image for now, need icon per meta-category -->
+                           <a href="${config["Producer.DocRoot"]}/${language.code}/${mc.date.formatted["yyyy'/'MM"]}/${mc.id}.html"><img src="/img/placeholder.mds.gif" class="icon" width="30" height="30" alt="Most discussed stories" /></a>
                            <span class="comments">${mc.commentcount}&#160;Comments</span>
                            <a href="${config["Producer.DocRoot"]}/${language.code}/${mc.date.formatted["yyyy'/'MM"]}/${mc.id}.html">${mc.title}</a>
                         </p>
@@ -142,7 +140,7 @@
                            <p class="summary">
                               <small class="author">${s.creator}&#160;|</small> 
                               ${s.description_parsed}
-                              <small><a href="${config["Producer.DocRoot"]}/${language.code}/${s.date.formatted["yyyy'/'MM"]}/${s.id}.html" class="readMore">${lang("general.readmore")}</a></small>
+                              <small><a href="${config["Producer.DocRoot"]}/${language.code}/${s.date.formatted["yyyy'/'MM"]}/${s.id}.html" class="readMore">more...</a></small>
                            </p> 
                      </list>
 
@@ -156,22 +154,22 @@
             <tr>
                <td>
                   <div class="listWrap">
-                     <!--#include virtual="/fpincludes/random1.inc" -->
-                     <!--#include virtual="/fpincludes/random2.inc" -->
-                     <!--#include virtual="/fpincludes/random3.inc" -->
-                     <!--#include virtual="/fpincludes/random4.inc" -->
-                     <!--#include virtual="/fpincludes/random5.inc" -->
+                     <!--#include virtual="/${language.code}/randomcats/random1.html" -->
+                     <!--#include virtual="/${language.code}/randomcats/random2.html" -->
+                     <!--#include virtual="/${language.code}/randomcats/random3.html" -->
+                     <!--#include virtual="/${language.code}/randomcats/random4.html" -->
+                     <!--#include virtual="/${language.code}/randomcats/random5.html" -->
                
 	        </div>
                </td>
                <td class="margin"><div><!-- --></div></td>
                <td>
                   <div class="listWrap">
-                     <!--#include virtual="/fpincludes/random6.inc" -->
-                     <!--#include virtual="/fpincludes/random7.inc" -->
-                     <!--#include virtual="/fpincludes/random8.inc" -->
-                     <!--#include virtual="/fpincludes/random9.inc" -->
-                     <!--#include virtual="/fpincludes/random10.inc" -->
+                     <!--#include virtual="/${language.code}/randomcats/random6.html" -->
+                     <!--#include virtual="/${language.code}/randomcats/random7.html" -->
+                     <!--#include virtual="/${language.code}/randomcats/random8.html" -->
+                     <!--#include virtual="/${language.code}/randomcats/random9.html" -->
+                     <!--#include virtual="/${language.code}/randomcats/random10.html" -->
                   </div>
                </td>
             </tr>
@@ -187,20 +185,25 @@
 
       <div class="listWrap">
 
+         <p class="alert">
+            <b>Notice:</b> 
+            This is a beta site. Limited features only until upgrade is complete.
+            <a href="http://nyc.indymedia.org/en/static/beta.html" class="readMore">${lang("general.readmore")}</a>
+         </p>
+
          <div class="newswireWrap">
-            <b><a href="#">Newswire</a></b><br />
-            <a href="/${language.code}/">Local</a>&#160;|
-            <a href="#">Global</a>&#160;|
-            <a href="?category">Category</a>
+            <b><a href="/${language.code}/">Newswire</a> | <a href="?category">Blogwire</a> |
+            <a href="https://nyc.traven.indymedia.org.uk/nyc/servlet/OpenMir">publish</a></b>
          </div>
+<comment>
             <!-- #if expr="\"$DOCUMENT_URI\" = /?category/" 
             --><!-- #include virtual="/${language.code}/languagebar.html"
             --><!-- #else
             --><!-- #include virtual="/${language.code}/newswireinclude.html"
             --><!-- #endif
             -->
-         <!-- <iframe name="shazbot" id="shazbot" src="/${language.code}/newswireinclude.html" frameborder="0" style="overflow: hidden;"></iframe> -->
-
+            <!-- <iframe name="shazbot" id="shazbot" src="/${language.code}/newswireinclude.html" frameborder="0" style="overflow: hidden;"></iframe> -->
+</comment>
    		<!--#if expr="\"$QUERY_STRING\" = /category/" -->
    		<!--#include virtual="/${language.code}/rssnewswireinclude.html" -->
    		<!--#else -->
@@ -217,4 +220,4 @@
    </tr>
 </table>
 
-<!--#include virtual="/${language.code}/footer.inc" -->
+<!--#include virtual="/${language.code}/footer.html" -->
