merged with supriya's orgitdown code

1 files changed, 208 insertions, 54 deletions

diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index a695307..8f5c30d 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -51,6 +51,186 @@
 				display: block;
 				position: absolute;
 			}
+.orgitdown .orgitdownButton1 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/org/images/save.jpeg);
+}
+.orgitdown .orgitdownButton2 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/bold.png);
+}
+.orgitdown .orgitdownButton3 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/italic.png);
+}
+.orgitdown .orgitdownButton4 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/stroke.png);
+}
+
+.orgitdown .orgitdownButton5 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/list-bullet.png); 
+}
+.orgitdown .orgitdownButton6 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/list-numeric.png);
+}
+
+.orgitdown .orgitdownButton7 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/picture.png); 
+}
+.orgitdown .orgitdownButton8 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/link.png);
+}
+
+.orgitdown .orgitdownButton9 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/clean.png);
+}
+.orgitdown .preview a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/preview.png);
+}
+
+.orgitdown * {
+	margin:0px; padding:0px;
+	outline:none;
+}
+.orgitdown a:link,
+.orgitdown a:visited {
+	color:#000;
+	text-decoration:none;
+}
+.orgitdown  {
+	width:700px;
+	margin:5px 0 5px 0;
+		
+}
+.orgitdownContainer  {
+	border:1px solid #3C769D;	
+	background:#FFF url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-container.png) repeat-x top left; 
+	padding:5px 5px 2px 5px;
+	font:11px Verdana, Arial, Helvetica, sans-serif;
+        margin-left:450px;
+        width:450px;
+        margin-top:30px;
+}
+.orgitdownEditor {
+	font:12px 'Courier New', Courier, monospace;
+	padding:5px 5px 5px 35px;
+	border:3px solid #3C769D;
+	width:643px;
+	height:320px;
+	background:#FFF url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-editor.png) no-repeat;
+	clear:both;
+	line-height:18px;
+	overflow:auto;
+}
+.orgitdownPreviewFrame	{
+	overflow:auto;
+	background-color:#FFFFFF;
+	border:1px solid #3C769D;
+	width:99.9%;
+	height:300px;
+	margin:5px 0;
+}
+.orgitdownFooter {
+	width:100%;
+	cursor:n-resize;
+}
+.orgitdownResizeHandle {
+	overflow:hidden;
+	width:22px; height:5px;
+	margin-left:auto;
+	margin-right:auto;
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/handle.png);
+	cursor:n-resize;
+}
+/***************************************************************************************/
+/* first row of buttons */
+.orgitdownHeader ul li	{
+	list-style:none;
+	float:left;
+	position:relative;
+}
+.orgitdownHeader ul li ul{
+	display:none;
+}
+.orgitdownHeader ul li:hover > ul{
+	display:block;
+}
+.orgitdownHeader ul .orgitdownDropMenu {
+	background:transparent url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/menu.png) no-repeat 115% 50%;
+	margin-right:5px;
+}
+.orgitdownHeader ul .orgitdownDropMenu li {
+	margin-right:0px;
+}
+.orgitdownHeader ul .orgitdownSeparator {
+	margin:0 10px;
+	width:1px;
+	height:16px;
+	overflow:hidden;
+	background-color:#CCC;
+}
+.orgitdownHeader ul ul .orgitdownSeparator {
+	width:auto; height:1px;
+	margin:0px;
+}
+/* next rows of buttons */
+.orgitdownHeader ul ul {
+	display:none;
+	position:absolute;
+	top:18px; left:0px;	
+	background:#F5F5F5;
+	border:1px solid #3C769D;
+	height:inherit;
+}
+.orgitdownHeader ul ul li {
+	float:none;
+	border-bottom:1px solid #3C769D;
+}
+.orgitdownHeader ul ul .orgitdownDropMenu {
+	background:#F5F5F5 url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/submenu.png) no-repeat 100% 50%;
+}
+/* next rows of buttons */
+.orgitdownHeader ul ul ul {
+	position:absolute;
+	top:-1px; left:150px;
+}
+.orgitdownHeader ul ul ul li {
+	float:none;
+}
+.orgitdownHeader ul a {
+	display:block;
+	width:16px; height:16px;
+	text-indent:-10000px;
+	background-repeat:no-repeat;
+	padding:3px;
+	margin:0px;
+}
+.orgitdownHeader ul ul a {
+	display:block;
+	padding-left:0px;
+	text-indent:0;
+	width:120px; 
+	padding:5px 5px 5px 25px;
+	background-position:2px 50%;
+}
+.orgitdownHeader ul ul a:hover  {
+	color:#FFF;
+	background-color:#3C769D;
+}
+/***************************************************************************************/
+.html .orgitdownEditor {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-editor-html.png);
+}
+.markdown .orgitdownEditor {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-editor-markdown.png);
+}
+.textile .orgitdownEditor {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-editor-textile.png);
+}
+.bbcode .orgitdownEditor {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-editor-bbcode.png);
+}
+.wiki .orgitdownEditor,
+.dotclear .orgitdownEditor {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-editor-wiki.png);
+}
 
 		</style>
 		<!-- the header lines from grappelli -->
@@ -91,42 +271,23 @@
 		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_autocomplete_generic.js" type="text/javascript"></script>
 
     <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
-	<!-- Gnowmacs css, js -->
-
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/test/dl/js/thelib.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/jquery-1.7.1.min.js"></script> 
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/jquery-ui-1.8.18.custom.min.js"></script>
-	
-	    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}gstudio/js/Gnowmacs/test/dl/css/default.css" />
-	    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}gstudio/js/Gnowmacs/src/css/ymacs.css" />
-	
-	
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/jquery.ui.gnowmacs.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-keyboard.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-regexp.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-frame.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-textprop.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-exception.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-interactive.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-buffer.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-marker.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-commands.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-commands-utils.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-keymap.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-keymap-isearch.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-minibuffer.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-tokenizer.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-mode-paren-match.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/gnowmacs.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/savedata.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/Gnowmacs/src/js/ymacs-keymap-emacs.js"></script>
 	  
 	<script src="{{STATIC_URL}}gstudio/js/gstudio.js" type="text/javascript"></script>
 	<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/diasporaSyndicate.js"></script>
 	<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/twitterSyndicate.js" ></script>
 	
+	
+
+	<!-- orgitdown css,js -->
+        <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/org/set.js"></script>
+	
+	<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/jquery.orgitdown.js"></script>
+	
+	<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/savedata.js"></script>
+
 	<!-- EXTRAHEAD -->
+	
 		{% block extrahead %}{% endblock %}
 
 		{% endblock %} <!-- the header lines from gstudio -->
@@ -177,8 +338,9 @@
 					{% endblock %}
 				</div>
 
-				<div id="gnoweditor">
-				</div>
+				<textarea id="gnoweditor" style="visibility:hidden;">
+				</textarea>
+				
 				
 				<div id="graphcss">
 				<div id="chart">
@@ -196,14 +358,6 @@
 				-->
 				
 <script type="text/javascript" >
-			//alert(s)
-	//if ( parseInt(s) > 0 ){
-    			
-		//	}
-//	else{
-  //  			var w = 700,
-     //   		    h = 300,
-	//     }  
 
 function init(a,b)
 {
@@ -249,14 +403,14 @@ function load(key)
   
 			if (s > 0 ){
 			var a = 50 * s;
-			var w = 700;
-	   		var p = 100 + "%";
-			var h = 620;
+			var w = 1000;
+	   		var p = 140 + "%";
+			var h = 650;
    			var q = 3 * s + 75 + "%";
 			}else{
-			var w = 700;
-	   		var p = 100 + "%";
-			var h = 620;
+			var w = 1000;
+	   		var p = 140 + "%";
+			var h = 650;
    			var q = 110 + "%";			
 			}
         fill = d3.scale.category20();
@@ -281,10 +435,10 @@ function load(key)
 
 	       
     var force = d3.layout.force()
-              .linkStrength(0.5)
-              .charge(-5000)
+              .linkStrength(1)
+              .charge(-4000)
               .friction(0.7)
-              .gravity(0.7)
+              .gravity(0.4)
               .linkDistance(50)
               .nodes([])
               .links([])
@@ -523,7 +677,7 @@ $(window).bind('keydown',function(event) {
 		new_g.filter(function(d) { return (d._id).charAt(0)=="-"; }).append("svg:rect")
                                                       .attr("x",bbox.x-22)
 						      .attr("y", bbox.y)	
-						       .attr("width", function(d) {var ttx=d.screen_name ; return (ttx.length+bbox.width+40)})
+						       .attr("width", function(d) {var ttx=d.screen_name ; return (ttx.length+bbox.width+50)})
 							.attr("height", bbox.height)
 						      .call(force.drag)
 				    		      .style("fill-opacity", ".1")
@@ -539,11 +693,11 @@ $(window).bind('keydown',function(event) {
 				    .attr("cx", bbox.x+25)
 				    .attr("cy", bbox.y+13)
 				    .call(force.drag)
-				    .attr("rx",function(d) {var ttx=d.screen_name ; return (ttx.length + 40)})
+				    .attr("rx",function(d) {var ttx=d.screen_name ; return (ttx.length + 70)})
 				    .attr("ry",13)
-				    .style("fill-opacity", ".2")
-				    .style("stroke", "#666")
-				    .style("stroke-width", "1.5px")
+				    .style("fill-opacity", "0.3")
+				    .style("stroke", "white")
+				    .style("stroke-width", "0.0px")
 				    .style("fill", function(d) {if ((d.expanded=="true" && d.refType=="Objecttype") ||(d._id=={{object.id}}) ) return "blue"; else if(d.expanded=="true" && d.refType=="Gbobject") return "red"; else return "none"});