changeset 1:1091e7c07c8b

Much work, including preliminary download page
author Chris Cannam
date Thu, 30 Jun 2011 16:34:40 +0100
parents 942405da97e3
children 753051f9ee33 815273d56c81
files .hgignore download.html index.html screen.css
diffstat 4 files changed, 135 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Thu Jun 30 16:34:40 2011 +0100
@@ -0,0 +1,2 @@
+syntax: glob
+re:^download\.html\.~1~$
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/download.html	Thu Jun 30 16:34:40 2011 +0100
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <title>EasyMercurial</title>
+    <link rel="stylesheet" href="screen.css" media="screen"/>
+    <meta name="robots" content="index">
+    <meta name="description" content="">
+  </head>
+<body>
+
+<div id="logo-title"><h1 id="site-name">EasyMercurial</h1></div>
+          
+    <div id="navbar"><div id="navbar-inner">
+          <a name="navigation" id="navigation"></a>
+                      <div id="primary">
+              <ul class="links"><li class="first"><a href="index.html" title="">Home</a></li>
+<li><a href="http://code.soundsoftware.ac.uk/projects/easyhg" title="Project page">Project page</a></li>
+<li><a href="http://code.soundsoftware.ac.uk/projects/easyhg/wiki/Screenshots" title="Screenshots">Screenshots</a></li>
+<li class=last>Download</li>
+</ul>            </div>
+        </div></div>
+      
+<div id="page">
+<div id="download-windows">
+<h2>Windows</h2>
+
+<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/114/EasyMercurial-0.9.7-Setup.exe">Download EasyMercurial Windows installer</a></big></p>
+
+<p>The Mercurial executable and KDiff3 diff/merge application are included.  Just install and run.  (Thanks to Joachim Eibl for <a href="http://kdiff3.sourceforge.net/">KDiff3</a> and the <a href="http://tortoisehg.bitbucket.org/">TortoiseHg project</a> for the bundling mechanism.)</p>
+
+</div>
+<div id="download-mac">
+<h2>Mac OS/X</h2>
+
+<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/119/EasyMercurial-0.9.7.dmg">Download EasyMercurial package for Mac OS/X</a></big></p>
+
+<p>Mercurial itself is not included in this package.<br><a href="http://mercurial.selenic.com/" target="_new">Download and install it</a> before you run EasyMercurial.</p>
+
+<p>You may also wish to install the <a href="https://www.dlitz.net/software/pycrypto/">PyCrypto</a> library to enable the EasyMercurial password management facility.  To do so, type <b><code>sudo easy_install pycrypto</code></b> in a terminal window.</p>
+
+</div>
+<div id="download-linux">
+<h2>Linux</h2>
+
+<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/120/EasyMercurial-0.9.7-linux-i386.tar.gz">Download EasyMercurial for 32-bit Linux</a><br>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/121/EasyMercurial-0.9.7-linux-x86_64.tar.gz">Download EasyMercurial for 64-bit Linux</a></big></p>
+
+First install the prerequisites using your distribution's package manager. These are Mercurial itself, the Qt4 and PyQt4 toolkits, and KDiff3. In Ubuntu the packages you need are: <b><code>mercurial python-qt4 kdiff3</code></b>.
+
--- a/index.html	Thu Jun 23 22:12:29 2011 +0100
+++ b/index.html	Thu Jun 30 16:34:40 2011 +0100
@@ -9,19 +9,42 @@
   </head>
 <body>
 
-<h1>EasyMercurial</h1>
+<div id="logo-title"><h1 id="site-name">EasyMercurial</h1></div>
+          
+    <div id="navbar"><div id="navbar-inner">
+          <a name="navigation" id="navigation"></a>
+                      <div id="primary">
+              <ul class="links"><li class="first">Home</li>
+<li><a href="http://code.soundsoftware.ac.uk/projects/easyhg" title="Project page">Project page</a></li>
+<li><a href="http://code.soundsoftware.ac.uk/projects/easyhg/wiki/Screenshots" title="Screenshots">Screenshots</a></li>
+<li class=last><a href="download.html" title="Download">Download</a></li>
+</ul>            </div>
+        </div></div>
+      
+<div id="page">
+<p><big>EasyMercurial is a simple user interface for the <a href="http://mercurial.selenic.com/">Mercurial</a> distributed version control system.  It's free, open source, and cross-platform.  </big></p>
 
-<p>EasyMercurial is a user interface for the Mercurial distributed version control system.</p>
+<p>Our aim has been to make EasyMercurial straightforward to teach and learn.<br>It uses a friendly graph representation for history, to make
+branching and merging easier to understand: it makes common working
+patterns easy to find and learn, particularly when using a shared
+remote repository: and it is consistent across platforms.</p>
 
-<p>EasyMercurial is intended to be:</p>
+<p>EasyMercurial is not designed for large projects or for very
+experienced users, and there are other Mercurial interfaces that
+integrate more closely with particular operating system platforms (see
+a list <a
+href="http://mercurial.selenic.com/wiki/OtherTools">here</a>).  But if
+you are new to Mercurial or to version control systems in general &mdash; or
+if you are trying to introduce it to other users &mdash;
+consider using EasyMercurial.</p>
 
-<ul>
-<li>simple to teach and to learn</li>
-<li>indicative of the actual repository state, using a history graph representation</li>
-<li>recognisably close to normal command-line workflow for Mercurial</li>
-<li>consistent across platforms</li>
-</ul>
+</div>
 
-<p>We are not trying to produce "the best" Mercurial client for any one purpose. We actively encourage users to move on to other clients as their needs evolve. The aim is simply to provide something accessible for beginners in small project groups working with a shared remote repository.</p>
+<div id="footer">
+<div id="footer-content">
+<div style="float:right"><a href="http://soundsoftware.ac.uk/"><img src="http://code.soundsoftware.ac.uk/attachments/19/soundsoftware-logo-title-only-transparent.png" width=223 height=17></a></div>
+Development carried out at the Centre for Digital Music, Queen Mary University of London.  Funded by grant EP/H043101/1 of the UK Engineering and Physical Sciences Research Council.
+</div>
+</div>
 
 </body>
--- a/screen.css	Thu Jun 23 22:12:29 2011 +0100
+++ b/screen.css	Thu Jun 30 16:34:40 2011 +0100
@@ -1,11 +1,54 @@
 
 @import url('fonts.css');
 
+h1#site-name {
+    margin:0;
+    line-height:1.3em;
+    color:#525a38;
+    padding:0;
+/*     padding-bottom:0.1em; */
+    margin-top:0.6em;
+    font-weight:normal;
+    margin-left:20%;
+    font-size:3em;
+}
+#logo-title{
+    border-bottom:2px solid #a9b680;
+    margin:0;
+/*    margin-bottom:0.8em; */
+    padding:0;
+}
+#footer{
+    width: 100%;
+    border-top:1px solid #a9b680;
+    margin:0;
+    margin-top: 4em;
+    padding:0;
+}
+#footer-content {
+    margin-left: 20%;
+    margin-right: 20%;
+    padding-left: 0.25em;
+    padding-top: 2em;
+    font-size: 0.7em;
+}
+
+#navbar ul{margin:0;padding:0;text-align:left;list-style-type:none;}
+#navbar li{float:left;padding:0 10px 0 0;}
+#primary{float:left;margin-left:20%;margin-top:0;padding-left:0.25em;padding-top:0.8em;margin-bottom:0.5em;font-weight:normal;font-size:0.85em;}
+#primary li{margin:0px;border-left:1px solid #a9b680;padding-left:1em;padding-right:1em;}
+#primary li.first{margin:0px;border-left:0;padding-left:0;padding-right:1em;}
+#primary li.last{margin:0px;border-left:1px solid #a9b680;padding-left:1em;padding-right:0;}
+
+
   body
   {
+    margin: 0;
     font-size: 100%; /* Fixes exaggerated text resizing in IE6 and IE7 */
   }
 
+  big { line-height: 1.3em; }
+
   a:link,
   a:visited
   {
@@ -22,6 +65,10 @@
   {
       font-size: 0.94em;
       line-height: 1.3em;
+      margin-left: 20%;
+      padding-left: 0.25em;
+      margin-right: 20%;
+      margin-top: 5em;
   }
 
   body, caption, th, td, input, textarea, select, option, legend, fieldset, h1, h2, h3, h4, h5, h6
@@ -33,7 +80,7 @@
 
   pre, code
   {
-    font-size: 1.1em; /* Monospace fonts can be hard to read */
+    font-size: 0.85em;
     font-family: Consolas, "Bitstream Vera Sans Mono", "Courier New", monospace;
   }
 
@@ -108,7 +155,7 @@
     padding-left: 2em;
   }
 
-  .block ul, /* Drupal overrides */
+  .block ul,
   .item-list ul
   {
     margin: 1em 0;
@@ -131,14 +178,14 @@
     padding: 0;
   }
 
-  .item-list ul li /* Drupal override */
+  .item-list ul li
   {
     margin: 0;
     padding: 0;
     list-style: inherit;
   }
 
-  ul.menu li, /* Drupal override */
+  ul.menu li,
   li.expanded,
   li.collapsed,
   li.leaf
@@ -189,7 +236,6 @@
   }
 
 /** tables **/
-  /* Override Drupal default CSS */
   table
   {
     border-collapse: collapse;