summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gstudio/templates/gstudio/base.html5
-rw-r--r--gstudio/templates/gstudio/skeleton.html6
-rw-r--r--gstudio/templates/gstudio/version_base.html4
-rw-r--r--objectapp/templates/objectapp/base.html4
-rw-r--r--objectapp/templates/objectapp/gbobject_detail.html4
-rw-r--r--objectapp/templates/objectapp/skeleton.html6
6 files changed, 15 insertions, 14 deletions
diff --git a/gstudio/templates/gstudio/base.html b/gstudio/templates/gstudio/base.html
index bf849184..f1c4aa17 100644
--- a/gstudio/templates/gstudio/base.html
+++ b/gstudio/templates/gstudio/base.html
@@ -20,8 +20,8 @@
{% endblock %}
{% block sidebar %}
- <img src="{{ STATIC_URL }}gstudio/img/rss.png" alt="?" width="20" height="" />
- <a href="{% url gstudio_nodetype_latest_feed %}" class="feeds"><h4>Rssfeed</h4></a>
+
+ <a href="{% url gstudio_nodetype_latest_feed %}" class="feeds" title="Rssfeed"><img src="{{ STATIC_URL }}gstudio/img/rss.png" alt="?" width="20" height="" /></a>
<div class="search">
<h3>{% trans "Search" %}</h3>
@@ -52,6 +52,7 @@
<a href="{{ object.get_version_url }}{{ sid }}/{{ forloop.counter }}">{{ object.title }} {{ object.id }}.{{ forloop.counter }}</a><br>
{% endfor %}
+ </table>
</div>
<br>
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index 3b945f48..eba5e283 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -219,12 +219,12 @@ function load(key)
var a = 50 * s;
var w = 700;
var p = 100 + "%";
- var h = 600;
- var q = 3 * s + 35 + "%";
+ var h = 620;
+ var q = 3 * s + 75 + "%";
}else{
var w = 700;
var p = 100 + "%";
- var h = 600;
+ var h = 620;
var q = 110 + "%";
}
fill = d3.scale.category20();
diff --git a/gstudio/templates/gstudio/version_base.html b/gstudio/templates/gstudio/version_base.html
index 6972c9e2..15ee3a8a 100644
--- a/gstudio/templates/gstudio/version_base.html
+++ b/gstudio/templates/gstudio/version_base.html
@@ -57,8 +57,8 @@
<!-- {% endfor %} -->
<!-- <br> -->
<!-- <input type="submit" value="Compare" /> -->
-<!-- </div> -->
-<!-- <br> -->
+</div>
+<br>
<div class="authors">
<h3>{% trans "Authors" %}</h3>
diff --git a/objectapp/templates/objectapp/base.html b/objectapp/templates/objectapp/base.html
index d2b78ceb..90e061bb 100644
--- a/objectapp/templates/objectapp/base.html
+++ b/objectapp/templates/objectapp/base.html
@@ -19,8 +19,8 @@
{% endblock %}
{% block sidebar %}
- <img src="{{ STATIC_URL }}objectapp/img/rss.png" alt="?" width="20" height="" />
- <a href="{% url objectapp_gbobject_latest_feed %}" class="feeds"><h4>Rssfeed</h4></a>
+
+ <a href="{% url objectapp_gbobject_latest_feed %}" class="feeds" title="Rssfeed"><img src="{{ STATIC_URL }}objectapp/img/rss.png" alt="?" width="20" height="" /></a>
<div class="search">
<h3>{% trans "Search" %}</h3>
diff --git a/objectapp/templates/objectapp/gbobject_detail.html b/objectapp/templates/objectapp/gbobject_detail.html
index 283f9c68..cfe16511 100644
--- a/objectapp/templates/objectapp/gbobject_detail.html
+++ b/objectapp/templates/objectapp/gbobject_detail.html
@@ -124,7 +124,7 @@
<h3>{% trans "Similar objects" %}</h3>
{% get_similar_gbobjects 5 %}
</div>
-</div>
+
{% endblock %}
@@ -142,7 +142,7 @@
<a href=" {{ get_absolute_url }}/objects/dynamicRelation/displaymem/{{ i }}/{{ object.title }}/">{{ i }}</a><nbsp>;
{% endfor %}
</p>
-
+</div>
{% block gbobject-comments %}
<div id="comments" class="span-16 last">
<h3>{% trans "Comments" %}</h3>
diff --git a/objectapp/templates/objectapp/skeleton.html b/objectapp/templates/objectapp/skeleton.html
index 0a4a0362..d04b02f4 100644
--- a/objectapp/templates/objectapp/skeleton.html
+++ b/objectapp/templates/objectapp/skeleton.html
@@ -230,12 +230,12 @@ function load(key)
if ( s > 0) {
var w = 700;
var p = 122 + "%";
-var h = 800;
-var q = 3 * s + 60 + "%";
+var h = 680;
+var q = 3 * s + 80 + "%";
}else{
var w = 700;
var p = 122 + "%";
-var h = 800;
+var h = 680;
var q = 110 + "%";
}
fill = d3.scale.category20();