diff options
| author | Arun yadav <arunkumar5587@gmail.com> | 2012-05-30 19:05:36 +0530 |
|---|---|---|
| committer | Arun yadav <arunkumar5587@gmail.com> | 2012-05-30 19:05:36 +0530 |
| commit | 776083c03638e50e8182d5ac606607d605131a76 (patch) | |
| tree | 014cae04cf9602095288e4ce389582bcbc2b2332 /gstudio/templates | |
| parent | adb0662690f845be8524d68cf2aa9f57c10fac13 (diff) | |
| parent | b3744d0a70635dfb702396c82558b46b0d74c054 (diff) | |
| download | gnowsys-776083c03638e50e8182d5ac606607d605131a76.tar.gz | |
Merge branch 'master' of https://github.com/gnowgi/gnowsys-studio
Conflicts with the main branch fixed
Diffstat (limited to 'gstudio/templates')
| -rw-r--r-- | gstudio/templates/gstudio/base.html | 5 | ||||
| -rw-r--r-- | gstudio/templates/gstudio/nodetype_detail.html | 3 | ||||
| -rw-r--r-- | gstudio/templates/gstudio/skeleton.html | 6 | ||||
| -rw-r--r-- | gstudio/templates/gstudio/version_base.html | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/gstudio/templates/gstudio/base.html b/gstudio/templates/gstudio/base.html index bf84918..f1c4aa1 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/nodetype_detail.html b/gstudio/templates/gstudio/nodetype_detail.html index 7947e58..1a01279 100644 --- a/gstudio/templates/gstudio/nodetype_detail.html +++ b/gstudio/templates/gstudio/nodetype_detail.html @@ -250,6 +250,7 @@ {% endblock %} <!-- Dynamic form begins --> +{% if user.is_authenticated %} <p> {% if object.reftype == 'Objecttype' %} <b>Add Attributes:</b> @@ -264,7 +265,7 @@ <a href="{{ get_absolute_url }}/objects/dynamicRelation/displaymem/{{ i }}/{{ object.title }}">{{ i }}</a><nbsp>; {% endfor %} {% endif %} - +{% endif %} </p> <!-- Dyanic form ends --> <div class="nodetype-content"> diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html index 96a2287..ad6cf4a 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 6972c9e..15ee3a8 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> |