From 375a9f6eba14cbd99ffe27a1eb8d406f32b7d0d7 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 21 Oct 2016 15:54:58 +0200 Subject: CSS: fixed position for shortcut menu and top bar. Show/hide shortcut menu. --- ishtar_common/static/js/ishtar.js | 12 +++++++++ ishtar_common/static/media/style.css | 51 ++++++++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 8 deletions(-) (limited to 'ishtar_common/static') diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 6017aed64..8abf23289 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -63,6 +63,18 @@ function init_shortcut_menu(html){ load_shortcut_menu ); }); + $(".short-menu-close").click(function(){ + $('#shortcut-menu div').hide(); + $('#shortcut-menu table').hide(); + $(".short-menu-close").hide(); + $(".short-menu-open").show(); + }); + $(".short-menu-open").click(function(){ + $('#shortcut-menu div').show(); + $('#shortcut-menu table').show(); + $(".short-menu-open").hide(); + $(".short-menu-close").show(); + }); } function init_shortcut_fields(){ diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 8aac9e2a2..729889dc8 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -22,6 +22,8 @@ div.form, ul.form { /* color */ +.short-menu-open, +.short-menu-close, .pin-action, #window hr, #context_menu .red, @@ -78,7 +80,7 @@ a.add-button, a.add-button, a.remove, #progress-content, div.form { - border:0 solid #CCC; + border:0 solid #EAEAEA; } #window hr{ @@ -347,10 +349,13 @@ div.nav-button{ } div#header{ + position: fixed; + top: 0; + z-index: 10; width:100%; text-align:left; font-size: 0.9em; - background-color: #CCC; + background-color: #EAEAEA; margin-bottom:10px; line-height:30px; padding:0 20px; @@ -434,6 +439,33 @@ div#language_form_div label{ margin-top: -20px; } +.short-menu-open:hover, +.short-menu-close:hover{ + cursor: pointer; +} + +.short-menu-open{ + display: none; +} + +.short-menu-open, +.short-menu-close{ + position: absolute; + right: -5px; + top: -5px; + font-size: 0.8em; +} + +.short-menu-open .fa-stack-2x, +.short-menu-close .fa-stack-2x { + font-size: 1.7em; +} + +.short-menu-open .fa-stack-1x, +.short-menu-close .fa-stack-1x { + line-height: 1.7em; +} + div#context_menu{ height:110px; margin-right:10px; @@ -444,11 +476,14 @@ div#context_menu{ div#context_menu fieldset{ margin-top: 8px; - background-color:#f1f2f6; - border:0 solid #CCC; + background-color: #E6E6E6; + border:0 solid #EAEAEA; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; + position: fixed; + top: 40px; + right: 10px; } div#action_current_items{ @@ -627,7 +662,7 @@ ul#form_path li a:link, ul#form_path li a:visited { #reminder{ padding:0.4em; margin-right:10px; - border:1px solid #CCC; + border:1px solid #EAEAEA; -moz-border-radius:0; -webkit-border-radius:0; border-radius:0; @@ -809,7 +844,7 @@ ul.form .help_text{ .delete td{ text-align:center; - border-bottom:1px solid #CCC; + border-bottom:1px solid #EAEAEA; padding:6px; } @@ -865,7 +900,7 @@ table.confirm tr.spacer td:last-child{ .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background:none; background-color: #F1F2F6; - border: 1px solid #CCC; + border: 1px solid #EAEAEA; border-radius-top: 4px; } @@ -973,7 +1008,7 @@ a.photo{ background: #FFF; text-align:left; padding:10px; - border:1px solid #CCC; + border:1px solid #EAEAEA; border-top-left-radius: 0; border-top-right-radius: 0; } -- cgit v1.2.3 From cd37c622b2830325366a5432636941d3cc75c1fc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 21 Oct 2016 17:03:21 +0200 Subject: Small CSS fix --- ishtar_common/static/media/style.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'ishtar_common/static') diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 729889dc8..7b441c085 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -599,7 +599,7 @@ div#welcome{ div#content{ clear:both; - margin-top:190px ; + margin-top:205px ; margin-bottom: 70px; margin-left: 200px; margin-right: 150px; @@ -667,9 +667,10 @@ ul#form_path li a:link, ul#form_path li a:visited { -webkit-border-radius:0; border-radius:0; background-color:white; - position: absolute; + position: fixed; z-index:1000; left: 200px; + top: 35px; } #reminder p{ @@ -910,13 +911,13 @@ table.confirm tr.spacer td:last-child{ } .sheet{ - width:90%; + top: 35px; + bottom: 35px; + left: 15px; + right: 15px; position:fixed; - height:90%; background: #FFF; z-index: 2000; - /*left: 50%;*/ - margin-left: 5%; -webkit-box-shadow: 0px 0px 20px #444; -moz-box-shadow: 0px 0px 20px #444; text-align: left; -- cgit v1.2.3 From 6fef57483fddfbd5003cf72e34d0b370e02f5e95 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 22 Oct 2016 10:59:35 +0200 Subject: Sheets: highlight main references --- .../templates/ishtar/sheet_contextrecord.html | 4 +++- archaeological_finds/templates/ishtar/sheet_find.html | 9 ++++++++- archaeological_operations/templates/ishtar/sheet_operation.html | 8 ++++---- ishtar_common/static/media/style.css | 6 ++++++ 4 files changed, 21 insertions(+), 6 deletions(-) (limited to 'ishtar_common/static') diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 907697c9e..e5edb4af5 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -10,6 +10,9 @@ {% endif%} +

{{ item.parcel.short_label }}

+

{{ item.label|default:"" }}

+
  • {{item.full_label}}
    • {% field_li "Creation date" item.creation_date %} @@ -17,7 +20,6 @@ {% field_li "Type" item.unit %} {% field_li_multiple "Chronology" item.datings %} {% field_li "Town" item.parcel.town %} -{% field_li "Parcel" item.parcel.short_label %}
{% field "Comment on datings" item.datings_comment "
" "
" %} diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 0cc1616b2..00470906d 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -10,8 +10,15 @@ {% endif%} +

{{ item.label|default:"" }}

+

{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.complete_id}}{% endfor %}

+

{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.short_id}}{% endfor %}

+

{{ item.administrative_index|default:"" }}

+

{{ item.contextrecord|default:"" }}

+ + +
    -{% field_li "Free-ID" item.label %} {% field_li "Previous ID" item.previous_id %} {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} {% with item.history_creator.ishtaruser.full_label|add:"
    "|add:creation_date|add:"" as creator %} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 07f8d8ab0..daddb42d6 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -17,12 +17,12 @@

    {%trans "Patriarche OA code not yet recorded!"%}

    {% endif %} +

    {% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} – OA{{item.code_patriarche}}{% endif %} +

    +

    {{item.common_name|default:''}}

    +

    {% trans "General"%}

      -{% field_li "Name" item.common_name %} -{% field_li "Year" item.year %} -{% field_li "Numeric reference" item.operation_code %} -{% field_li "Code patriarche" item.code_patriarche 'OA' %} {% field_li "Old code" item.old_code %}
    • {% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}
      • {% field_li "Created by" item.history_creator.ishtaruser.full_label %} diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 7b441c085..00fed380d 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -739,6 +739,12 @@ ul.form-flex li li label { width: 300px; } +.window-refs{ + font-size: 1.1em; + font-weight: bold; + text-align: center; +} + #window ul.form-flex label { width: 150px; } -- cgit v1.2.3