Merge pull request #33 from Dhiru/master

changes made in css affecting, header, extra space and 100% width 

8 files changed, 87 insertions, 82 deletions

diff --git a/demo/grappelli/static/grappelli/css/forms.css b/demo/grappelli/static/grappelli/css/forms.css
index 84e21f6..277334e 100644
--- a/demo/grappelli/static/grappelli/css/forms.css
+++ b/demo/grappelli/static/grappelli/css/forms.css
@@ -2,7 +2,7 @@
 
 
 /*  Basic Settings, Fieldsets, Form-Rows
------------------------------------------------------------------------------------------------------- */
+----------------------------------------------------------------------------------------------------- */
 
 form {
     margin: 0;
@@ -657,7 +657,7 @@ select.span-16, textarea.span-16,
 div.autocomplete-wrapper-m2m.span-16, 
 .span-20 label + input[type=text], .span-20 label + input[type=password], 
 .span-20 label + select, .span-20 label + textarea {
-    width: 598px;
+    width: 230px;
 }
 .span-16 div.autocomplete-wrapper-m2m ul.repr, 
 .span-16 div.autocomplete-wrapper-m2m ul.repr li, 
@@ -1240,4 +1240,4 @@ div.autocomplete-wrapper-m2m input.vManyToManyRawIdAdminField, div.autocomplete-
     background: transparent !important;
     box-shadow: none !important; -moz-box-shadow: none !important; -webkit-box-shadow: none !important;
     cursor: default !important;
-}
\ No newline at end of file
+}
diff --git a/demo/grappelli/static/grappelli/css/grappelli-skin-default.css b/demo/grappelli/static/grappelli/css/grappelli-skin-default.css
index 6f5e721..fe718a3 100644
--- a/demo/grappelli/static/grappelli/css/grappelli-skin-default.css
+++ b/demo/grappelli/static/grappelli/css/grappelli-skin-default.css
@@ -7,7 +7,7 @@
 
 
 /*  Paragraphs
------------------------------------------------------------------------------------------------------- */
+----------------------------------------------------------------------------------------------------- */
 
 .module p.help, 
 p.help {
@@ -166,6 +166,7 @@ body {
     background: -moz-linear-gradient(top, white, white);
     background: -webkit-gradient(linear, left top, left bottom, from(white), to(white));
     background: -o-linear-gradient(top, white, white);
+	background: #2B3959;
 }
 #header a:hover, #header a:active {
     color: red;
@@ -1907,7 +1908,7 @@ a:hover, a:active, a.selected {
 }
 
 #header a:link, #header a:visited {
-    color: #0872B4;
+    color: white;
 }
 #header a:hover, #header a:active {
     color: red;
@@ -2016,11 +2017,11 @@ hr {
 /*  User Tools ................................................... */
 
 #user-tools {
-    border-left: 1px solid #303030;
+    border-left: 0px solid #303030;
 }
 #user-tools>li {
-    border-left: 1px solid #404040;
-    border-right: 1px solid #303030;
+    border-left: 0px solid #404040;
+    border-right: 0px solid #303030;
 }
 li.user-options-container.open a.user-options-handler {
     color: #eee !important;
@@ -2946,7 +2947,7 @@ ul.pagination li.separator span {
 
 
 /*  Tooltips
------------------------------------------------------------------------------------------------------- */
+----------------------------------------------------------------------------------------------------- */
 
 .module.search .tooltip .tooltip-content {
     border: 1px solid #ccc;
diff --git a/gstudio/static/gstudio/css/screen.css b/gstudio/static/gstudio/css/screen.css
index a5e3ba3..c107776 100644
--- a/gstudio/static/gstudio/css/screen.css
+++ b/gstudio/static/gstudio/css/screen.css
@@ -1,4 +1,4 @@
-body { line-height: 1.5; font-family: Arial, Helvetica, sans-serif; color: #333333; font-size: 75%; height:1500px;width:1500px}
+body { line-height: 1.5; font-family: Arial, Helvetica, sans-serif; color: #333333; font-size: 75%; height:1500px; width: 90%; }
 
 h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #176691; border-radius:15px; }
 h1 img, h2 img, h3 img, h4 img, h5 img, h6 img { margin: 0; }
@@ -130,7 +130,7 @@ caption { background: #eeeeee; }
 
 .span-15 { width: 590px; }
 
-.span-16 { width: 150px; }
+.span-16 { width: 500px; }
 
 .span-17 { width: 670px; }
 
@@ -406,7 +406,7 @@ textarea { margin: 0.5em 0; padding: 5px; }
 
 select { margin: 0.5em 0; }
 
-fieldset { border: 1px solid #cccccc; }
+fieldset { border: 1px solid #cccccc; width:150px;}
 
 input.text, input.title, input[type=email], input[type=text], input[type=password], textarea { background-color: #fff; border: 1px solid #bbbbbb; }
 input.text:focus, input.title:focus, input[type=email]:focus, input[type=text]:focus, input[type=password]:focus, textarea:focus { border: 1px solid #666666; }
@@ -424,7 +424,7 @@ ul, ol { margin: 0 1.5em 1.5em 0; padding-left: 3.333em; }
 a { text-decoration: none; }
 a:hover { text-decoration: underline; }
 
-#header { margin-bottom: 1em; border-bottom: 1px solid #e9e9f3; }
+#header { margin-bottom: 1em; border-bottom: 1px solid #e9e9f3; background: #2b3959; color: white;}
 #header h1 { font-size: 2em; font-weight: bold; margin-bottom: 0; }
 #header .top-navigation { float: right; }
 #header .top-navigation img { border: 0; }
@@ -436,7 +436,7 @@ a:hover { text-decoration: underline; }
 #b1 {position:relative; center:5%; background-color:#43AEE7; color: white; border: 1px solid #000000; font-size:1em;}
 #b2 {position:relative; center:6%; background-color:#43AEE7; color: white; border: 1px solid #000000; font-size:1em;}
 
-#body { margin-bottom: 1em; border-bottom: 1px solid #e9e9f3; }
+#body { margin-bottom: 1em; border-bottom: 1px solid #e9e9f3; width: 100%; }
 
 #content h1, #content h2, #content h3 { margin-top: 10px; }
 
@@ -446,13 +446,12 @@ a:hover { text-decoration: underline; }
     float: left;
     clear: both;
     margin-bottom: 10px;
-    margin-left: 0;
-    margin-right: 60px;
+    margin-left: 0%;
+    margin-right: 0%;
     margin-top: 10px;
-    padding-right: 30px;
+    padding-right: 0px;
     width:250px;
 }
-
 #graph {
     position: absolute;
     float: left;
@@ -475,14 +474,14 @@ a:hover { text-decoration: underline; }
     font-weight: bold;
 }
 #graphcss {
-	margin-left: 180px;
-    margin-right: 200px;
-    margin-top: -150px;
+	margin-left: 231px;
+    margin-right: 0%;
+    margin-top: 1px;
     position: absolute;
-    width: 300px;
+    width: 54%;
     height: 900px
 }
-#sidebar{position:absolute; margin-left:1000px; margin-right:150px; margin-top:10px; width:300px;}
+#sidebar{position:relative; margin-left:85%; margin-right:0%; margin-top:10px; width:24%;}
 #sidebar div:first-child h3 { margin-top:0px; }
 #sidebar h3 { background-color: #C4EBF4; padding: 0.5em; }
 #sidebar p { padding-left: 1em; }
@@ -504,7 +503,7 @@ a:hover { text-decoration: underline; }
 #sidebar .tags div ul .tag_4 { font-size: 2em; color: #0070a8; }
 #sidebar .tags div ul .tag_5 { font-size: 2.25em; color: #0099e5; }
 #sidebar .tags div ul .tag_6 { font-size: 3em; color: #00adff; }
-
+#footer{position: static; top: 4px; left: -1px; margin-top: 18px;} 
 th.month{padding:0cm 2.5cm;}
 table.month { margin-bottom: 0; }
 table.month th.month { text-transform: uppercase; color: #006699; background: none; }
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index d179220..3b945f4 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -46,8 +46,8 @@
 				display: block;
 			}
 			svg {
-				margin-left: 50%;
-				margin-right: 50%;
+				margin-left: 0%;
+				margin-right: 10%;
 				display: block;
 				position: absolute;
 			}
@@ -215,26 +215,25 @@ $.getJSON('/nodetypes/graphs/graph_json/' + {{object.id}}, function (json1) {
 function load(key)
 {
   
-
-var a = 25 * s;
-	
-			if ( a > 700 )
-				{
-	   				 var w = 700;
-				}
-			else
-				{ 
-				          var w = a;
-				} 
-    			
-   			var h = 24 * s,
+			if (s > 0 ){
+			var a = 50 * s;
+			var w = 700;
+	   		var p = 100 + "%";
+			var h = 600;
+   			var q = 3 * s + 35 + "%";
+			}else{
+			var w = 700;
+	   		var p = 100 + "%";
+			var h = 600;
+   			var q = 110 + "%";			
+			}
         fill = d3.scale.category20();
  
   var vis = d3.select("#chart")
         .append("svg:svg")
 	.attr("id", "amazingViz") 
-        .attr("width", w)
-        .attr("height", h);
+        .attr("width", p)
+        .attr("height", q);
 
     vis.append("svg:g").attr("class", "edges");        
     vis.append("svg:g").attr("class", "nodes");
@@ -469,7 +468,6 @@ $(window).bind('keydown',function(event){
 
 </script>
 
-
 				</div>
 				<div id="sidebar">
 				  {% block sidebar %}
@@ -477,7 +475,7 @@ $(window).bind('keydown',function(event){
 				</div>
 				
 				
-				<div id="footer" class="span-24 last">
+				<div id="footer">
 					<p> 
 
 						<a rel="license"
@@ -490,6 +488,6 @@ $(window).bind('keydown',function(event){
 					</p>
 				</div>
 		
-		
+		</div>
 	</body>
 </html>
diff --git a/objectapp/settings.py b/objectapp/settings.py
index 885a870..2b215f0 100644
--- a/objectapp/settings.py
+++ b/objectapp/settings.py
@@ -56,7 +56,7 @@ SAVE_PING_EXTERNAL_URLS = getattr(settings, 'OBJECTAPP_PING_EXTERNAL_URLS', True
 
 COPYRIGHT = getattr(settings, 'OBJECTAPP_COPYRIGHT', 'Objectapp')
 
-PAGINATION = getattr(settings, 'OBJECTAPP_PAGINATION', 10)
+PAGINATION = getattr(settings, 'OBJECTAPP_PAGINATION', 4)
 ALLOW_EMPTY = getattr(settings, 'OBJECTAPP_ALLOW_EMPTY', True)
 ALLOW_FUTURE = getattr(settings, 'OBJECTAPP_ALLOW_FUTURE', True)
 
diff --git a/objectapp/static/objectapp/css/screen.css b/objectapp/static/objectapp/css/screen.css
index fd913f7..408dd84 100644
--- a/objectapp/static/objectapp/css/screen.css
+++ b/objectapp/static/objectapp/css/screen.css
@@ -1,4 +1,4 @@
-body { line-height: 1.5; font-family: Arial, Helvetica, sans-serif; color: #333333; font-size: 75%; height:1500px;width:1500px}
+body { line-height: 1.5; font-family: Arial, Helvetica, sans-serif; color: #333333; font-size: 75%; height:1500px; width: 85%; }
 
 h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #000000; border-radius:15px; }
 h1 img, h2 img, h3 img, h4 img, h5 img, h6 img { margin: 0; }
@@ -424,7 +424,7 @@ ul, ol { margin: 0 1.5em 1.5em 0; padding-left: 3.333em; }
 a { text-decoration: none; }
 a:hover { text-decoration: underline; }
 
-#header { margin-bottom: 1em; border-bottom: 1px solid #e9e9f3; }
+#header { margin-bottom: 1em; border-bottom: 1px solid #e9e9f3;  background: #2b3959; color: white;}
 #header h1 { font-size: 2em; font-weight: bold; margin-bottom: 0; }
 #header .top-navigation { float: right; }
 #header .top-navigation img { border: 0; }
@@ -440,7 +440,7 @@ a:hover { text-decoration: underline; }
 #b1 {position:relative; center:5%; background-color:#43AEE7; color: white; border: 1px solid #000000; font-size:1em;}
 #b2 {position:relative; center:6%; background-color:#43AEE7; color: white; border: 1px solid #000000; font-size:1em;}
 
-#body { margin-bottom: 1em; border-bottom: 1px solid #e9e9f3; }
+#body { margin-bottom: 1em; border-bottom: 0px solid #e9e9f3; width: 100%;}
 
 #content h1, #content h2, #content h3 { margin-top: 10px; }
 
@@ -450,10 +450,10 @@ a:hover { text-decoration: underline; }
     float: left;
     clear: both;
     margin-bottom: 10px;
-    margin-left: 0;
-    margin-right: 60px;
+    margin-left: 0%;
+    margin-right: 0%;
     margin-top: 10px;
-    padding-right: 30px;
+    padding-right: 0%;
     width:250px;
 }
 
@@ -479,14 +479,14 @@ a:hover { text-decoration: underline; }
     font-weight: bold;
 }
 #graphcss{
-    margin-left: 180px;
-    margin-right: 200px;
-    margin-top: -150px;
+    margin-left: 237px;
+    margin-right: 0px;
+    margin-top: 1px;
     position: absolute;
-    width: 300px;
+    width: 46%;
     height: 900px
 }
-#sidebar{position:absolute; margin-left:600px; margin-right:150px; margin-top:10px; width:300px;}
+#sidebar{position:relative; margin-left:92%; margin-right:0px; margin-top:10px; width:23%;}
 #sidebar div:first-child h3 { margin-top:0px; }
 #sidebar h3 { background-color: #FFE9E8; padding: 0.5em; }
 #sidebar p { padding-left: 1em; }
@@ -508,7 +508,7 @@ a:hover { text-decoration: underline; }
 #sidebar .tags div ul .tag_4 { font-size: 2em; color: #0070a8; }
 #sidebar .tags div ul .tag_5 { font-size: 2.25em; color: #0099e5; }
 #sidebar .tags div ul .tag_6 { font-size: 3em; color: #00adff; }
-
+#footer{ position:static; border-bottom: 1px solid #E9E9F3; margin-top: 85px; }
 th.month{padding:0cm 2.5cm;}
 table.month { margin-bottom: 0; }
 table.month th.month { text-transform: uppercase; color: #555555; background: none; }
@@ -516,7 +516,7 @@ table.month th { text-transform: capitalize; color: #555555; background-color: #
 table.month td { text-align: center; font-weight: bold; }
 table.month td.objecttype { background-color: #C4EBF4; }
 
-div.paginator { margin-bottom: 1em; }
+div.paginator { margin-bottom: 2em; }
 div.paginator span { font-size: 1.2em; margin-left: 0.3em; padding: 0 0.5em 0 0.5em; float: left; border: 1px solid #e9e9f3; }
 div.paginator span.index { margin-left: 0; }
 div.paginator span.page:hover, div.paginator span.next:hover, div.paginator span.previous:hover { background-color: #006699; }
diff --git a/objectapp/templates/objectapp/_gbobject_detail.html b/objectapp/templates/objectapp/_gbobject_detail.html
index 6b21356..ee43aba 100644
--- a/objectapp/templates/objectapp/_gbobject_detail.html
+++ b/objectapp/templates/objectapp/_gbobject_detail.html
@@ -28,7 +28,7 @@
 
 </div>
 
-</div>
+
 <p>
              <b>Name: </b> {{ object.title }} <br/>
 
@@ -76,7 +76,7 @@
 
 </p>
 
-
+</div>
   
 
   <div class="gbobject-body span-16 last">
diff --git a/objectapp/templates/objectapp/skeleton.html b/objectapp/templates/objectapp/skeleton.html
index 2e08471..928c0e6 100644
--- a/objectapp/templates/objectapp/skeleton.html
+++ b/objectapp/templates/objectapp/skeleton.html
@@ -47,8 +47,8 @@
 				display: block;
 			}
 			svg {
-				margin-left: 10%;
-				margin-right: 10%;
+				margin-left: 0%;
+				margin-right: 0%;
 				display: block;
 				position: absolute;
 			}
@@ -224,27 +224,26 @@ $.getJSON('/nodetypes/graphs/graph_json/' + {{object.id}}, function (json1) {
 
 function load(key)
 {
-  
 
-var a = 800 * s;
-	
-			if ( a > 700 )
-				{
-	   				 var w = 700;
-				}
-			else
-				{ 
-				          var w = a;
-				} 
-    			
-   			var h = 232 * s,
+
+if ( s > 0) {
+var w = 700;
+var p = 122 + "%";
+var h = 800;
+var q = 3 * s + 60 + "%";
+}else{
+var w = 700;
+var p = 122 + "%";
+var h = 800;
+var q = 110 + "%";
+} 
         fill = d3.scale.category20();
  
   var vis = d3.select("#chart")
         .append("svg:svg")
 	.attr("id", "amazingViz") 
-        .attr("width", w)
-        .attr("height", h);
+        .attr("width", p)
+        .attr("height", q);
 
     vis.append("svg:g").attr("class", "edges");        
     vis.append("svg:g").attr("class", "nodes");
@@ -474,16 +473,24 @@ $(window).bind('keydown',function(event){
 </script>
          {% block graph %} {% endblock %}
 	</div>
-	<div id="sidebar" class="span-8 last">
+	<div id="sidebar">
 	  {% block sidebar %}
 	  {% endblock %}
 	</div>
-      </div>
-      <div id="footer" class="span-24 last">
-	<p>Powered by <a href="http://www.djangoproject.com" title="http://www.djangoproject.com">Django</a> and <a href="http://github.com/gnowgi/django-gstudio" title="http://github.com/gnowgi/django-gstudio">Gstudio {{ GSTUDIO_VERSION }}</a>.</p>
+	
+      <div id="footer">
+	<p> 
+
+	  <a rel="license"
+	     href="http://creativecommons.org/licenses/by-sa/3.0/" title="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative
+																    Commons License" style="border-width:0"src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"/></a> All material is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/" title = "http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a> unless mentioned otherwise.
+	  <br/>
+	  Poweredby <a href="http://www.djangoproject.com" title="https://www.djangoproject.com/">Django</a>
+	  and <a href="https://github.com/gnowgi/gnowsys-studio" title="https://github.com/gnowgi/gnowsys-studio">Gstudio
+	    {{ GSTUDIO_VERSION }}</a>.
+	  </p>
       </div>
     </div>
   </body>
 </html>
 
-