Mercurial > pub > site.implab

changeset 8:7d92a42f8e18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved doxygen library
author sergey
date Wed, 14 May 2014 17:28:22 +0400
parents fa7a99c2d079
children 3efa63d911d4
files deploy.pl public_html/static/css/global.css schemas/doxygen/compound.xsd shared_view/layout/default.tt shared_view/layout/init.tt view/layout/default/library.tt view/layout/dojo.tt view/layout/init.tt view/site/library/@Collection.tt view/templates/Collection.tt view/templates/Compound.tt view/templates/Library.tt view/templates/Member.tt
diffstat 8 files changed, 72 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/deploy.pl	Wed May 14 01:22:21 2014 +0400
+++ b/deploy.pl	Wed May 14 17:28:22 2014 +0400
@@ -2,7 +2,6 @@
 use strict;
 use lib '.';
 use config;
-use config::bootstrap;
 use IMPL::require {
     DoxModel => 'Benzin::Doxygen::Model'
 };
--- a/public_html/static/css/global.css	Wed May 14 01:22:21 2014 +0400
+++ b/public_html/static/css/global.css	Wed May 14 17:28:22 2014 +0400
@@ -4,6 +4,12 @@
     padding: 0;
 }
 
+a {
+    transition: all 0.5s;
+    color: inherit;
+    font-weight: bold;
+}
+
 .block {
 	display: block;
 }
@@ -12,6 +18,23 @@
 	text-align: center;
 }
 
+/********************************* MENUS **************************************/
+
+ul.menu-bar {
+	padding: 0;
+    margin: 0;
+    list-style: none;
+}
+
+ul.menu-bar li {
+	display: inline-block;
+    line-height: 100%;
+}
+
+.menu-bar a {
+	
+}
+
 /********************************* TABLES *************************************/
 
 table.pretty-table
--- a/schemas/doxygen/compound.xsd	Wed May 14 01:22:21 2014 +0400
+++ b/schemas/doxygen/compound.xsd	Wed May 14 17:28:22 2014 +0400
@@ -214,6 +214,7 @@
 
   <xsd:complexType name="paramType">
     <xsd:sequence>
+      <xsd:element name="attributes" type="linkedTextType" minOccurs="0"/>
       <xsd:element name="type" type="linkedTextType" minOccurs="0" />
       <xsd:element name="declname" minOccurs="0" />
       <xsd:element name="defname" minOccurs="0" />
--- a/shared_view/layout/default.tt	Wed May 14 01:22:21 2014 +0400
+++ b/shared_view/layout/default.tt	Wed May 14 17:28:22 2014 +0400
@@ -3,6 +3,8 @@
 	document.scripts = [];
 	document.meta = [];
 	document.class = [];
+	document.postRender = [];
+	render('init',model = model);
 %]
 [% BLOCK PAGE_LAYOUT %]
 <!DOCTYPE html>
@@ -13,7 +15,7 @@
 		<link rel="stylesheet" href="$item" type="text/css">
 		[% END %]
 		[% FOREACH item IN document.scripts +%]
-		<script type="[% item.type || 'text/javascript' %]"[% ' href="' _ item.href _ '"' IF item.href %]>
+		<script type="[% item.type || 'text/javascript' %]"[% ' src="' _ item.src _ '"' IF item.src %]>
 			[% item.text %]
 		</script>
 		[% END %]
@@ -32,5 +34,8 @@
 [% WRAPPER PAGE_LAYOUT;
 	WRAPPER CONTENT_LAYOUT;
 		content;
-	END;	
+	END;
+	FOREACH item IN document.postRender;
+		render(item, model = model);
+	END;
 END %]
--- a/view/layout/default/library.tt	Wed May 14 01:22:21 2014 +0400
+++ b/view/layout/default/library.tt	Wed May 14 17:28:22 2014 +0400
@@ -2,7 +2,8 @@
 	labels(
 		CollectionTitle = "Home (%name%)"
 	);
-	document.css.push(css.global);
+	document.postRender.push('dojo');
+	
 	document.css.push(css.library);
 	
 	CollectionClass = 'Benzin::Doxygen::Model::Collection';
@@ -53,6 +54,7 @@
 		[% END %]
 	</ul>
 [% END %]
+[% BLOCK LAYOUT %]
 <div class="library-pane">
 	
 	<div id="toc-nav" class="nav-pane left">
@@ -88,4 +90,8 @@
 			sticky('siblings-nav', { along: 'content-pane' });
 		});
 	</script>
-</div>
\ No newline at end of file
+</div>
+[% END %]
+[% WRAPPER LAYOUT;
+	render('base', content = content);
+END %]
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/view/layout/dojo.tt	Wed May 14 17:28:22 2014 +0400
@@ -0,0 +1,15 @@
+[%
+	modules = document.dojo.modules.unique;
+	style = document.dojo.style || 'tundra';
+	dojo.js = cdn.dojo.SetView('js').dojo.dojo;
+    dijit.css = cdn.dojo.dijit.themes.${style}.${style}.SetView('css');
+    dojo.css = cdn.dojo.dojo.resources.dojo.SetView('css');
+    
+	document.css.push(dojo.css);
+	document.css.push(dijit.css);
+	document.scripts.push({ text = 'dojoConfig = ' _ toJSON(document.dojo.config) _ ';' });
+	document.scripts.push({ src = dojo.js });
+	IF modules.size;
+		document.scripts.push({ text = "require(" _ toJSON(modules) _ ");"});
+	END;
+%]
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/view/layout/init.tt	Wed May 14 17:28:22 2014 +0400
@@ -0,0 +1,12 @@
+[%
+	document.dojo = {
+		modules = [],
+		config = {
+			parseOnLoad = 1,
+            async = 1,
+            packages = [
+            	{name = 'implab', location = app.location.static.js.implab.toString()}
+            ]
+		}
+	};
+%]
\ No newline at end of file
--- a/view/site/library/@Collection.tt	Wed May 14 01:22:21 2014 +0400
+++ b/view/site/library/@Collection.tt	Wed May 14 17:28:22 2014 +0400
@@ -2,13 +2,12 @@
 	document.layout = 'library';
 	compounds = resource.GetCompoundsLocation();
  	IF model.indexDocument;
-		display_model(
-			model.indexDocument,
-			args = {
-				compounds = compounds.toString(),
-				members = resource.GetMembersLocation().toString()
-			}
-		);
+ 		args = {
+			compounds = compounds.toString(),
+			members = resource.GetMembersLocation().toString()
+		}
+		T = import('Benzin::Doxygen::DisplayTransform');
+		T.instance.DisplayCompound(model.indexDocument, args );
 	ELSE;
 %]
 	<h1>$model.description</h1>