SHA1 Hash:	f3807dbd88a8d65b85ca39489611268b5ea3a962
Date:	2007-10-10 02:49:29
User:	jnc
Comment:	Removed unnecessary items from WWW Configuration, also made RSS Title and Description into generic Project Name and Project Description settings, which will be used elsewhere in the web site.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/rss.c from [486c7677a8] to [05e7ced61b].

@@ -46,11 +46,11 @@
 */
 
 void page_timeline_rss(void){
   Stmt q;
   int nLine=0;
-  char *zPubDate, *zRSSTitle, *zRSSDescr, *zFreeRSSTitle=0;
+  char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0;
   const char zSQL[] =
     @ SELECT
     @   blob.rid,
     @   uuid,
     @   datetime(event.mtime),
@@ -63,28 +63,28 @@
     @ ORDER BY event.mtime DESC
   ;
 
   cgi_set_content_type("application/rss+xml");
 
-  zRSSTitle = db_get("rss-title", 0);
-  if( zRSSTitle==0 ){
-    zFreeRSSTitle = zRSSTitle = mprintf("Fossil source repository for: %s",
+  zProjectName = db_get("project-name", 0);
+  if( zProjectName==0 ){
+    zFreeProjectName = zProjectName = mprintf("Fossil source repository for: %s",
       g.zBaseURL);
   }
-  zRSSDescr = db_get("rss-description", 0);
-  if( zRSSDescr==0 ){
-    zRSSDescr = zRSSTitle;
+  zProjectDescr = db_get("project-description", 0);
+  if( zProjectDescr==0 ){
+    zProjectDescr = zProjectName;
   }
 
   zPubDate = cgi_rfc822_datestamp(time(NULL));
 
   @ <?xml version="1.0"?>
   @ <rss version="2.0">
   @   <channel>
-  @     <title>%s(zRSSTitle)</title>
+  @     <title>%s(zProjectName)</title>
   @     <link>%s(g.zBaseURL)</link>
-  @     <description>%s(zRSSDescr)</description>
+  @     <description>%s(zProjectDescr)</description>
   @     <pubDate>%s(zPubDate)</pubDate>
   @     <generator>Fossil version %s(MANIFEST_VERSION) %s(MANIFEST_DATE)</generator>
   db_prepare(&q, zSQL);
   while( db_step(&q)==SQLITE_ROW && nLine<=20 ){
     const char *zId = db_column_text(&q, 1);
@@ -117,6 +117,10 @@
   }
 
   db_finalize(&q);
   @   </channel>
   @ </rss>
+
+  if( zFreeProjectName != 0 ){
+    free( zFreeProjectName );
+  }
 }

Modified src/setup.c from [b3c7fee01f] to [2446896fe8].

@@ -537,39 +537,23 @@
 
   style_header("WWW Configuration");
   db_begin_transaction();
   @ <form action="%s(g.zBaseURL)/setup_config" method="POST">
 
-  @ <hr>
-  entry_attribute("Home page", 60, "homepage", "hp", "");
-  @ <p>The name of a wiki file that is the homepage for the website.
-  @ The home page is the page that is displayed by the "Home" link
-  @ at the top of this screen.  Omit the path and the ".wiki"
-  @ suffix.  </p>
+  @ <hr />
+
+  entry_attribute("Project Name", 60, "project-name", "pn", "");
+  @ <p>Give your project a name so visitors know what this site is about.
+  @ The project name will also be used as the RSS feed title.</p>
+
+  @ <hr />
 
-  entry_attribute("Ticket subdirectory", 60, "ticket-subdir", "tsd", "");
-  @ <p>A subdirectory in the file hierarchy that contains all trouble
-  @ tickets.  Leave this blank to disable ticketing.  Tickets text
-  @ files within this subdirectory containing a particular format
-  @ (documented separately) and with the ".tkt" suffix.</p>
+  textarea_attribute("Project Description", 5, 60, "project-description", "pd", "");
+  @ <p>Describe your project. This will be used in page headers for search
+  @ engines as well as a short RSS description.</p>
 
-  entry_attribute("Wiki subdirectory", 60, "wiki-subdir", "wsd", "");
-  @ <p>A subdirectory in the file hierarchy that contains wiki pages.
-  @ Leave this blank to disable wiki.  Wiki pages are
-  @ files within this subdirectory whose name is he wiki page title
-  @ and with the suffix ".wiki".</p>
-
-  entry_attribute("RSS Feed Title", 60, "rss-title", "rst", "");
-  @ <p>The title of the RSS feed that publishes the changes to the
-  @ repository. If left blank, the system will generate a generic
-  @ title that, unfortunantly, not very helpful.</p>
-
-  textarea_attribute("RSS Feed Description", 5, 60, "rss-description", "rsd", "");
-  @ <p>The description of the RSS feed that publishes the changes to
-  @ the repository. If left blank, the system will use the RSS Feed Title.
-
-  @ <hr>
+  @ <hr />
   @ <p><input type="submit"  name="submit" value="Apply Changes"></p>
   @ </form>
   db_end_transaction(0);
   style_footer();
 }

Modified src/style.c from [7864b9469a] to [5a0e7535f4].

@@ -69,16 +69,20 @@
 /*
 ** Draw the header.
 */
 void style_header(const char *zTitle){
   const char *zLogInOut = "Logout";
+  char *zProjectDescr = db_get("project-description", 0);
   login_check_credentials();
   @ <html>
   @ <head>
   @ <title>%s(zTitle)</title>
   @ <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="%s(g.zBaseURL)/timeline.rss">
   @ <link rel="stylesheet" href="%s(g.zBaseURL)/style.css" type="text/css" media="screen">
+  if( zProjectDescr != 0 ){
+    @ <meta name="description" content="%s(zProjectDescr)">
+  }
   @ </head>
   @ <body>
   @ <div id="page-title">%s(zTitle)</div>
   @ <div id="login-status">
   if( g.zLogin==0 ){
@@ -91,13 +95,10 @@
   @ <div id="main-menu">
   @ <a href="%s(g.zBaseURL)/index">Home</a>
   if( g.okRead ){
     @ | <a href="%s(g.zBaseURL)/leaves">Leaves</a>
     @ | <a href="%s(g.zBaseURL)/timeline">Timeline</a>
-  }
-  if( g.okRdWiki ){
-    @ | <a href="%s(g.zBaseURL)/wiki">Wiki</a>
   }
 #if 0
   @ | <font color="#888888">Search</font>
   @ | <font color="#888888">Ticket</font>
   @ | <font color="#888888">Reports</font>
@@ -145,11 +146,11 @@
 ** WEBPAGE: index
 ** WEBPAGE: home
 ** WEBPAGE: not_found
 */
 void page_index(void){
-  char *zHome = (char*)db_get("homepage", 0);
+  char *zHome = "Home";
   if( zHome ){
     g.zExtra = zHome;
     g.okRdWiki = 1;
     wiki_page();
   }else{

Modified src/user.c from [45a74402e3] to [9649e14426].