- Recordings optimisations

- Experimental 'yellow' Tooltips

3 files changed, 15 insertions, 30 deletions

diff --git a/css/styles.css b/css/styles.css
index 7612bde..cad5ef2 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -37,22 +37,18 @@ img {
 */
 
 div.domTTOverlib {
-	border: 1px solid #C0C1DA;
-	background-color: #E9EFFF;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	border: 1px solid #EBC94C;
+	background-color: #F4FFC3;
 }
 
 div.domTTOverlib .caption {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
 	font-weight: bold;
-	color: #FFFFFF;
 }
 
 div.domTTOverlib .contents {
-	font-size: 11px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
 	padding: 2px;
-	background-color: #F1F1FF;
 }
 
 
@@ -247,6 +243,10 @@ div.short {
 	margin: 5px;
 }
 
+div.hint {
+	font-style: italic;
+	margin: 0px 5px 5px 5px;
+}
 
 /* #############
    # Timers
@@ -389,11 +389,7 @@ div.recording_item {
 
 .recording_item div.recording_actions {
 	float: right;
-	margin-left: 3em;
-}
-
-div.recordings_data {
-	width: 66%;
+	padding-right: 3em;
 }
 
 /* ##############################
@@ -402,15 +398,11 @@ div.recordings_data {
 */
 
 div.domTTrecordings {
+	width: 66%;
 	border: none;
 }
 
-.domTTrecordings div.re_shortdescr {
-	background-color: #E9EFFF;
-}
-
 .domTTrecordings div.re_longdescr {
-        width: 75%;
 }
 
 .domTTrecordings div.re_content {
@@ -419,8 +411,6 @@ div.domTTrecordings {
 }
 
 .domTTrecordings div.boxheader div div a {
-	float: right;
-	margin-left: auto;
 }
 
 /*
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 2db0081..e07784a 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -107,11 +107,14 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 			+ std::string("<img src=\"transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />")
 			+ std::string("<img src=\"movie.png\" alt=\"movie\" />")
 			+ std::string("</div>");
+
+		const cRecordingInfo* info = recItem->RecInfo();
+		std::string shortDescr(tr("Click to view details.")); if (info && info->ShortText()) shortDescr = (std::string("") +  info->ShortText() + std::string("<br />") + shortDescr);
 }>
 			<div class="recording_day" style="width: <$ dayLen $>"><$ day $></div>
 			<div class="recording_date"><$ FormatDateTime(tr("%b %d %y"), recItem->StartTime()) $></div>
 			<div class="recording_time"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></div>
-			<div class="recording_name" <& tooltip.info domId=(sPref + recItem->Id()) &><& tooltip.display domId=(lPref + recItem->Id()) &>><$ recItem->Name() $></div>
+			<div class="recording_name" <& tooltip.hint text=(shortDescr) &><& tooltip.display domId=(lPref + recItem->Id()) &>><$ recItem->Name() $></div>
 			<div class="recording_actions">
 				 <img src="play.png" alt="" />
 				 <img src="edit.png" alt="" />
@@ -169,14 +172,6 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 					</div>
 				</div>
 			</div>
-			<div class="re_shortdescr" id="<$ (sPref + recItem->Id()) $>">
-				<div class="re_content">
-%			if (!shortDescr.empty()) {
-					<div class="short"><$ (shortDescr) $></div>
-%			}
-					<div class="hint"><$ tr("Click to view details.") $></div>
-				</div>
-			</div>
 <{
 		}
 	}
diff --git a/pages/tooltip.ecpp b/pages/tooltip.ecpp
index 470f5fb..1c012f3 100644
--- a/pages/tooltip.ecpp
+++ b/pages/tooltip.ecpp
@@ -12,7 +12,7 @@ value[];
 %   for (var_type::const_iterator it = var.begin(); it != var.end(); ++it, idx++) {
 	var <$ *it $> = "<$ (value[idx]) $>";
 %   }
-	domTT_addPredefined('tipHint', 'trail', true, 'delay', 0);
+	domTT_addPredefined('tipHint', 'trail', true, 'delay', 0, 'styleClass', 'domTTOverlib');
 	domTT_addPredefined('tipInfo', 'trail', true, 'delay', 0);
 	domTT_addPredefined('tipDisp', 'trail', false, 'delay', 0, 'type', 'sticky', 'caption', false, 'offsetX', -30, 'offsetY', -30, 'draggable', true);
     </script>