From a276fb6b79de33ae442705a8f8b9167d5733b082 Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Mon, 15 Feb 2010 18:22:16 +0000
Subject: [PATCH] modified templates

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@585 e52654a7-88a9-db11-a3e9-0013d4bc506e
---
 html/fun_login.html | 2 +-
 html/fun_mkdir.html | 4 ++--
 templates/doc.cpp   | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/html/fun_login.html b/html/fun_login.html
index 05b563d..9f3db61 100755
--- a/html/fun_login.html
+++ b/html/fun_login.html
@@ -4,7 +4,7 @@
 	<p>{logged_as_long}: [user_name]<br>
 	<a href="[doc_base_url][if-one dir_can_read_exec][dir][if-any item_is item_can_read][item_url]/[end][else]/[end]logout">{logout}</a></p>
 [else]
-	<form id="login" method="post" action="[doc_base_url][if-one dir_can_read_exec][dir][if-any item_is item_can_read][item_url]/[end][else]/[end]login">
+	<form id="additem" method="post" action="[doc_base_url][if-one dir_can_read_exec][dir][if-any item_is item_can_read][item_url]/[end][else]/[end]login">
 	<fieldset>
 	<legend>{form_login_legend}:</legend>
 	<input class="edit" type="text" name="login">
diff --git a/html/fun_mkdir.html b/html/fun_mkdir.html
index b2f25ff..cad7b93 100755
--- a/html/fun_mkdir.html
+++ b/html/fun_mkdir.html
@@ -9,9 +9,9 @@
 <form id="additem" method="post" action="[doc_base_url][dir]mkdir">
 <fieldset>
 	<legend>{mkdir_form_legend}</legend>
-	{title}<br>
+	<p class="withnext">{title}</p>
 	<input class="edit" type="text" name="subject" value="">
-	{url}<br>
+	<p class="withnext">{suggested_url}</p>
 	<input class="edit" type="text" name="url" value="">
 	<input class="submit" type="submit" value="{add}">
 </fieldset>
diff --git a/templates/doc.cpp b/templates/doc.cpp
index ae53115..36a1148 100755
--- a/templates/doc.cpp
+++ b/templates/doc.cpp
@@ -25,11 +25,13 @@ namespace TemplatesFunctions
 void doc_title(Info & i)
 {
 	size_t a;
+	bool was_dir = false;
 
 	// from 1 means skipping the root directory
 	for(a = 1 ; a<request.dir_table.size() ; ++a)
 	{
 		HtmlEscape(i.out, request.dir_table[a]->subject);
+		was_dir = true;
 
 		if( a < request.dir_table.size()-1 )
 			i.out << data.title_separator;
@@ -37,7 +39,9 @@ void doc_title(Info & i)
 
 	if( request.is_item )
 	{
-		i.out << data.title_separator;
+		if( was_dir )
+			i.out << data.title_separator;
+
 		HtmlEscape(i.out, request.item.subject);
 	}
 }