diff options
author | Dhiru <dhiru@labadmin-P5E-Deluxe.(none)> | 2012-06-16 18:38:21 +0530 |
---|---|---|
committer | Dhiru <dhiru@labadmin-P5E-Deluxe.(none)> | 2012-06-16 18:38:21 +0530 |
commit | 6d7c90142f6cd3f08e0ee28216392c421711a209 (patch) | |
tree | 8f09a817c710358a680908fd3c0e9abb643974bc /objectapp | |
parent | c09d5d8fc986e4df80e617d298ae3ecef00860fa (diff) | |
download | gnowsys-6d7c90142f6cd3f08e0ee28216392c421711a209.tar.gz |
cleaned up the interface, search and rss feeds in the header, home page, third column removed, versions as a series of '+' marks below the title.
Diffstat (limited to 'objectapp')
-rw-r--r-- | objectapp/static/objectapp/css/screen.css | 4 | ||||
-rw-r--r-- | objectapp/templates/objectapp/_gbobject_detail.html | 13 | ||||
-rw-r--r-- | objectapp/templates/objectapp/skeleton.html | 9 | ||||
-rw-r--r-- | objectapp/templates/objectapp/tags/breadcrumbs.html | 14 |
4 files changed, 33 insertions, 7 deletions
diff --git a/objectapp/static/objectapp/css/screen.css b/objectapp/static/objectapp/css/screen.css index 408dd84b..a94f4f40 100644 --- a/objectapp/static/objectapp/css/screen.css +++ b/objectapp/static/objectapp/css/screen.css @@ -93,6 +93,8 @@ caption { background: #eeeeee; } .bottom { margin-bottom: 0; padding-bottom: 0; } +.objectbreadcrumbsearch { position: absolute; right: 50px; margin-bottom: -8px; margin-top: -21px;} + .container { width: 950px; margin: 0 auto; overflow: hidden; *zoom: 1; } .column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-24 { display: inline; float: left; margin-right: 10px; } @@ -399,7 +401,7 @@ fieldset { padding: 1.4em; margin: 0 0 1.5em 0; } legend { font-weight: bold; font-size: 1.2em; } -input.text, input.title, input[type=email], input[type=text], input[type=password] { margin: 0.5em 0; background-color: white; padding: 5px; } +input.text, input.title, input[type=email], input[type=text], input[type=password] { margin: 0em 0; background-color: white; padding: 5px; } input.title { font-size: 1.5em; } textarea { margin: 0.5em 0; padding: 5px; } diff --git a/objectapp/templates/objectapp/_gbobject_detail.html b/objectapp/templates/objectapp/_gbobject_detail.html index c2d6b33f..2680c8a3 100644 --- a/objectapp/templates/objectapp/_gbobject_detail.html +++ b/objectapp/templates/objectapp/_gbobject_detail.html @@ -6,6 +6,18 @@ {{ object.title }} </a><a href="{{ object.ref.get_edit_url }}" target="_blank" >[edit]</a> </h2> + + + <table border="1" cellspacing="0"> + + {% for sid in object.ref.get_ssid %} + + + <a href="/objects/display/viewhistory/{{ sid }}/{{ forloop.counter }}" title= "{{ object.title }} {{ object.id }}.{{ forloop.counter }}" style="color:#FFA500"><b>+</b></a> + + {% endfor %} + </table> + <p class="gbobject-info"> {% if object.authors.count %} {% trans "Written by" %} @@ -31,6 +43,7 @@ <p> <b>Name: </b> {{ object.title }} <br/> + {% if object.get_rendered_nbh.plural %} <b> Plural Name :<nbsp></b> diff --git a/objectapp/templates/objectapp/skeleton.html b/objectapp/templates/objectapp/skeleton.html index 00dc6c7f..72432f15 100644 --- a/objectapp/templates/objectapp/skeleton.html +++ b/objectapp/templates/objectapp/skeleton.html @@ -193,7 +193,7 @@ {% include "gstudio/_header.html" %} - <div id="breadcrumbs" class="span-24 last"> + <div id="breadcrumbs" class=""> / {% block breadcrumbs %}{% endblock %} </div> @@ -640,11 +640,8 @@ function check_Relation(metadata,relations) </script> {% block graph %} {% endblock %} </div> - <div id="sidebar"> - {% block sidebar %} - {% endblock %} + </div> - <div id="footer"> <p> @@ -657,7 +654,7 @@ function check_Relation(metadata,relations) {{ GSTUDIO_VERSION }}</a>. </p> </div> - </div> + </body> </html> diff --git a/objectapp/templates/objectapp/tags/breadcrumbs.html b/objectapp/templates/objectapp/tags/breadcrumbs.html index c7a5361a..14d78c83 100644 --- a/objectapp/templates/objectapp/tags/breadcrumbs.html +++ b/objectapp/templates/objectapp/tags/breadcrumbs.html @@ -1,3 +1,5 @@ +{% load objectapp_tags i18n %} + {% for crumb in breadcrumbs %} {% if not forloop.last %} <a href="{{ crumb.url }}" title="{{ crumb.name }}">{{ crumb.name }}</a> {{ separator }} @@ -5,3 +7,15 @@ {{ crumb.name }} {% endif %} {% endfor %} +<div class="objectbreadcrumbsearch"> + <form method="get" id="searchform" action="{% url nodes_search %}"> + <p> + <input type="text" value="{% trans "Keywords..." %}" name="pattern" id="searchbox" onfocus="this.value=''" /> + <input type="submit" class="submitbutton" value="OK" /> + <a title="{% trans 'You can use - to exclude words or phrases, "double quotes" for exact phrases and the AND/OR boolean operators combined with parenthesis for complex searchs.' %}"> + <img src="/static/objectapp/img/help.png" alt="?" width="14" height="14" /> + <a href="{% url objectapp_gbobject_latest_feed %}" class="feeds" title="Rssfeed"><img src="/static/objectapp/img/rss.png" alt="?" width="20" height="" /></a> + </a> + </p> + </form> +</div> |