From: Wilmer Ricciotti <ricciott@cs.unibo.it>
Date: Thu, 6 Oct 2011 15:19:26 +0000 (+0000)
Subject: Matitaweb: added a titlebar to the GUI.
X-Git-Tag: make_still_working~2233
X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=commitdiff_plain;h=866590ce137ec8fbbaf83fa8ba572177c30dbdd8

Matitaweb: added a titlebar to the GUI.
---

diff --git a/matitaB/matita/index.html b/matitaB/matita/index.html
index a1099ad7f..d3fe3491f 100644
--- a/matitaB/matita/index.html
+++ b/matitaB/matita/index.html
@@ -16,6 +16,12 @@
 
 <div class="matitaapparea">
 
+<div class="titlebar">
+  <div class="mainTitle"><H2 id="matitaTitle">Matita - &lt;&lt;Filename&gt;&gt;</H2></div>
+  <div class="mainRight" id="matitaLogout"><A id="hlogout" href="/logout.html">Log out</A></div>
+</div>
+
+
 <div class="toparea">
 <div class="navibar">
            <A href="javascript:advanceForm1()"><IMG class="topimg" src="icons/advance.png" 
diff --git a/matitaB/matita/matitaweb.css b/matitaB/matita/matitaweb.css
index e481b4162..03af7f6bb 100644
--- a/matitaB/matita/matitaweb.css
+++ b/matitaB/matita/matitaweb.css
@@ -11,6 +11,39 @@ div.upload {
 	background-color: #f3f3f3;
 }
 
+div.titlebar {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 4px;
+	width:100%;
+	height: 32px;
+	background-color: #007fff;
+	color: white;
+}
+
+div.mainTitle {
+	display: block;
+	margin-left: 3px;
+	margin-right: auto;
+	max-width: 600px;
+	max-height: 32px;
+        float: left;
+        line-height: 32px;
+        vertical-align: middle;
+}
+
+div.mainRight {
+	display: block;
+	max-width: 600px;
+	max-height: 32px;
+        line-height: 32px;
+	display: block;
+	margin-left: auto;
+	margin-right: 3px;
+        float: right;
+        vertical-align: middle;
+}
 
 div.dialog {
 	position:absolute;
@@ -49,6 +82,10 @@ div.diaClose {
         line-height: 32px
 }
 
+a#hlogout {
+  color: inherit;
+  font-weight: bold;
+}
 a#butClose {
   color: inherit;
 }
@@ -103,7 +140,7 @@ div.workarea {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
-	height:88%; 
+	height:84%; 
 	width:100%; 
 }
 
diff --git a/matitaB/matita/matitaweb.js b/matitaB/matita/matitaweb.js
index e4fbe5633..f05639282 100644
--- a/matitaB/matita/matitaweb.js
+++ b/matitaB/matita/matitaweb.js
@@ -38,6 +38,7 @@ function initialize()
   if (readCookie("session") == null) {
     window.location = "/login.html"
   } else {
+    matitaTitle = document.getElementById("matitaTitle");
     locked = document.getElementById("locked");
     unlocked = document.getElementById("unlocked");
     workarea = document.getElementById("workarea");
@@ -54,6 +55,8 @@ function initialize()
     dialogBox = document.getElementById("dialogBox");
     dialogTitle = document.getElementById("dialogTitle");
     dialogContent = document.getElementById("dialogContent");
+
+    changeFile("test.ma");
   
     // hide sequent view at start
     hideSequent();
@@ -63,6 +66,11 @@ function initialize()
   }
 }
 
+function changeFile(name) {
+    current_fname = name;
+    matitaTitle.innerHTML = "Matita - cic:/matita/" + name;
+}
+
 function init_keyboard(target)
 {
     if (target.addEventListener)
@@ -690,7 +698,7 @@ function retrieveFile(thefile)
 	processor = function(xml)
 	{
 	        if (is_defined(xml)) {	
-	                current_fname = thefile;
+	                changeFile(thefile);
 	        	lockedbackup = ""
 			locked.innerHTML = lockedbackup;
                         // code originally used in google chrome (problems with mozilla)
@@ -822,7 +830,6 @@ function saveFile(fname,lockedtxt,unlockedtxt,force,reloadDialog,reloadFile)
 	    // when force is true, reloadDialog is not needed 
         }
 	processor = function(xml) {
-	        current_fname = fname;
 		if (is_defined(xml)) {
 		  if (xml.childNodes[0].textContent != "ok") {
                     if (confirm("File already exists. All existing data will be lost.\nDo you want to proceed anyway?")) {
@@ -831,7 +838,7 @@ function saveFile(fname,lockedtxt,unlockedtxt,force,reloadDialog,reloadFile)
                       reloadDialog();
 		    }
 		  } else {
-  	            current_fname = fname;
+  	            changeFile(fname);
 	            debug("file saved!");
                     if (reloadFile) { retrieveFile(fname); }
 		  }