Skip to content

Commit

Permalink
making the images transparent
Browse files Browse the repository at this point in the history
Former-commit-id: e61c644f2bf8578ffc2ad602cd0d268ea45c5f1a
  • Loading branch information
Daniel Sherson committed May 12, 2011
1 parent ca12057 commit f6a0b86
Show file tree
Hide file tree
Showing 123 changed files with 46 additions and 42 deletions.
4 changes: 2 additions & 2 deletions app/helpers/search_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def sign_attribute_image attribute, number, main, in_menu=false
end

#these images have been resized with
# mogrify -resize 42x42 -background white -gravity center -extent 42x42 *.png
# mogrify -negate -alpha copy -negate -resize 42x42 -background transparent -gravity center -extent 42x42 *.png
# or
# mogrify -resize 72x72 -background white -gravity center -extent 72x72 *.png
# mogrify -negate -alpha copy -negate -resize 72x72 -background transparent -gravity center -extent 72x72 *.png

# Sign Attribute is Selected?

Expand Down
4 changes: 4 additions & 0 deletions app/helpers/static_pages_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ def time_listing
def signs_from_array(array)
array.map{|v| [v[0], Sign.find(:id => v[1])]}.reject{|v| v[1].nil? }
end
def link_sign name, id
return link_to name, sign_path(id) if Sign.find(:id => id)
return name
end
def classifiers
{
:sass => [
Expand Down
18 changes: 9 additions & 9 deletions app/views/static_pages/classifiers.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
Classifier signs describe and/or represent a noun by depicting its semantic or visual
features. For instance, objects that are flat and round (eg, a coin), straight and thin (eg,
a picture frame), or spherical (eg, the earth) are represented by handshapes that are
manipulated in space to represent a feature of the objects appearance, size and location.
manipulated in space to represent a feature of the object’s appearance, size and location.
Instrumental or handling classifiers represent how an object is used, with the handshape
reflecting something about the objects shape or how it is held, and the movement showing
reflecting something about the object’s shape or how it is held, and the movement showing
how it is used (eg, unscrewing a lid or turning a knob).

Certain classifier handshapes represent closed semantic categories, such as ‘vehicle’,
or ‘person’, and these are also used like a pronoun that can be moved to incorporate a verb
of motion and location. For example, a flat open handshape with the blade down represents
a vehicle, and can be moved in an upward-sloping, zig-zag motion to express a car driving
up a steep winding road. These complex classifier constructions that incorporate an entity
and an action are also known as pro-forms.
a vehicle, and can be moved in an upward-sloping, zig-zag motion to express ‘a car driving
up a steep winding road’. These complex classifier constructions that incorporate an entity
and an action are also known as ‘pro-forms’.

Number and quantity is expressed in some classifiers by a change or reduplication of
handshape; eg, three upright fingers moving forward, rather than one, can stand for three
Expand All @@ -34,11 +34,11 @@
representing parts of the same entity, or two different entities that relate to each other in
space (eg, a car parked under a roof, a bird on a rock, two people sitting opposite, a train
entering a tunnel).

%p
Classifiers are a productive source of new vocabulary creation in signed languages, as they
can be used to represent new nouns (eg, [mobile phone](/signs/5581)), activities (eg, [bungy-jump](/signs/6066)), and
can be used to represent new nouns (eg, #{link_sign 'mobile phone', 5581}, activities (eg, #{link_sign 'bungy-jump', 6066}), and
other concepts. Many signs in the established dictionary lexicon that reflect shape or action
originate in classifiers, such as [table](/signs/834), [hammer](/signs/3846), [plate](/signs/5666), [jump](/signs/2974), [meet](/signs/2461), [assertive](/signs/2405).
originate in classifiers, such as #{link_sign 'table', 834}, #{link_sign 'hammer', 3846}, #{link_sign 'plate', 5666}, #{link_sign 'jump', 2974}, #{link_sign 'meet', 2461}, #{link_sign 'assertive', 2405}.

Frequently used NZSL classifier handshapes are shown in these pages, according to
categories of meaning.
Expand All @@ -59,7 +59,7 @@
= render :partial => 'static_pages/grid', :locals => {:group => value.last}
.typogarphy
%h3 Body parts classifiers
%p.note These handshapes describe moveable body parts including: legs, arms, head, feet, eyes, hair, ears, penis, eyebrows, mouth, tongue, buttocks, etc. For animals paws, tail, whiskers, claws, wings, beak. These can function as proforms incorporating noun and verb.
%p.note These handshapes describe moveable body parts including: legs, arms, head, feet, eyes, hair, ears, penis, eyebrows, mouth, tongue, buttocks, etc. For animals — paws, tail, whiskers, claws, wings, beak. These can function as proforms incorporating noun and verb.
= render :partial => 'static_pages/grid', :locals => {:group => classifiers[:body_parts]}
.typography
%h3 Mass or quantity classifiers
Expand Down
1 change: 0 additions & 1 deletion app/views/static_pages/contact-us.html.haml

This file was deleted.

6 changes: 0 additions & 6 deletions app/views/static_pages/copyright.html.haml

This file was deleted.

31 changes: 18 additions & 13 deletions app/views/static_pages/help.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.typography.rule_after
:markdown
:markdown
Help
====

About the Entries
-----------------

Expand All @@ -10,19 +11,21 @@
line drawing, as a videoclip, and as used in an example sentence. The sign is translated with
equivalent English words - usually a main gloss, and secondary or other possible meanings.
Both main and secondary English glosses are included in a sign search.

All the sentence examples reflect natural NZSL usage, and the structure of the signed
sentence is represented in a literal gloss displayed below the videoclip. Notice that each
written sign gloss in a sentence can be clicked to link to the entry for that sign within the
dictionary. An English translation of example sentences is provided to show the meaning
and grammatical context for using the sign.

Drawings and video clips will be the most important way for learners to see how to make
a sign. But some entries also contain a ‘hint’ that helps to remember the way a sign looks,
based on a visual aspect of the sign.

All signs are indexed to a topic, which allows users to look for signs according to a topic
area: actions, emotions, family, health, politics, time, for example.
area: [actions](/signs/search?tag=5), [emotions](/signs/search?tag=18),
[family](/signs/search?tag=15), [health](/signs/search?tag=23),
[politics](/signs/search?tag=22), [time](/signs/search?tag=39), for example.

Entries contain grammatical information about how a sign is formed and used, including the
following: its main grammatical role in NZSL (verb, noun, adjective, pronoun, interrogative,
Expand All @@ -34,15 +37,17 @@
Information about the origin and the users of particular signs is shown in some entries.
Where this information is known (not in every case), origin of a sign is noted (for example,
within NZSL or adopted from Auslan, BSL or ASL). Certain signs are known to be used more
by one generation than another, in which case the entry will indicate ‘older’ or ‘younger’ use.
by one generation than another, in which case the entry will indicate ‘older’
or ‘younger’ use.

A small number of signs are marked as ‘archaic’ or ‘rare’, meaning that they are no longer,
or very infrequently, used. Other signs that have been recently coined (sometimes for
specialised or educational purposes) and are not yet in widespread use are marked
as ‘neologisms’. Signs that are regarded by the NZSL community as obscene, or
as ‘informal’ slang, are marked as such.

A small number of signs are marked as [archaic](/signs/search?usage=1) or
[rare](/signs/search?usage=5), meaning that they are no longer, or very infrequently, used. Other
signs that have been recently coined (sometimes for specialised or educational purposes) and are
not yet in widespread use are marked as [neologisms](/signs/search?usage=2). Signs that are
regarded by the NZSL community as [obscene](signs/search?usage=3), or as
[informal](/signs/search?usage=4) slang, are marked as such.

How to Use
-----------

==========
_Coming soon!_
13 changes: 6 additions & 7 deletions app/views/static_pages/nzsl.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

Research on natural signed languages and Deaf cultures began to positively impact the NZ Deaf community
in the mid 1980s. From this time, the local sign language was researched, documented in dictionaries, and
named as NZSL. In the decades since, Deaf New Zealanders have assumed a more positive sense of ownership
of their language and asserted a Deaf cultural identity. NZSL was accepted for use in Deaf education from
1993. In 2006 it was legally recognised in the [NZSL Act](http://www.odi.govt.nz/what-we-do/nzsl/index.html)
as an official language of New Zealand.
named as ‘NZSL’. In the decades since, Deaf New Zealanders have assumed a more positive sense
of ownership of their language and asserted a Deaf cultural identity. NZSL was accepted for use in Deaf
education from 1993. In 2006 it was legally recognised in the
[NZSL Act](http://www.odi.govt.nz/what-we-do/nzsl/index.html) as an official language of New Zealand.

Variation in the lexicon
------------------------
Expand All @@ -48,9 +48,8 @@
Where can I learn NZSL?
-----------------------

The best way to start is to take an NZSL course with a qualified Deaf teacher. Credit-
bearing courses are offered at Victoria University of Wellington and Auckland University of
Technology.
The best way to start is to take an NZSL course with a qualified Deaf teacher. Credit-bearing courses are
offered at Victoria University of Wellington and Auckland University of Technology.

Many non-credit courses are offered by local community education providers. These can be
located by visiting the [website of the NZSL Teachers Association](http://www.nzslta.org.nz) or by
Expand Down
Binary file modified public/images/handshapes/42/handshape.1.1.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.1.1.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.1.1.3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.1.2.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.1.2.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.1.3.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.1.3.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.1.4.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.2.1.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.2.1.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.2.2.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.2.2.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.2.3.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.2.3.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.2.3.3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.3.1.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.3.2.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.3.3.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.3.4.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.3.4.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.3.5.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.3.5.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.4.1.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.4.1.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.4.2.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/handshapes/42/handshape.4.2.2.png
Binary file modified public/images/handshapes/42/handshape.4.3.1.png
Binary file modified public/images/handshapes/42/handshape.4.3.2.png
Binary file modified public/images/handshapes/42/handshape.5.1.1.png
Binary file modified public/images/handshapes/42/handshape.5.1.2.png
Binary file modified public/images/handshapes/42/handshape.5.2.1.png
Binary file modified public/images/handshapes/42/handshape.5.3.1.png
Binary file modified public/images/handshapes/42/handshape.5.3.2.png
Binary file modified public/images/handshapes/42/handshape.5.4.1.png
Binary file modified public/images/handshapes/42/handshape.6.1.1.png
Binary file modified public/images/handshapes/42/handshape.6.1.2.png
Binary file modified public/images/handshapes/42/handshape.6.1.3.png
Binary file modified public/images/handshapes/42/handshape.6.1.4.png
Binary file modified public/images/handshapes/42/handshape.6.2.1.png
Binary file modified public/images/handshapes/42/handshape.6.2.2.png
Binary file modified public/images/handshapes/42/handshape.6.2.3.png
Binary file modified public/images/handshapes/42/handshape.6.2.4.png
Binary file modified public/images/handshapes/42/handshape.6.3.1.png
Binary file modified public/images/handshapes/42/handshape.6.3.2.png
Binary file modified public/images/handshapes/42/handshape.6.4.1.png
Binary file modified public/images/handshapes/42/handshape.6.4.2.png
Binary file modified public/images/handshapes/42/handshape.6.5.1.png
Binary file modified public/images/handshapes/42/handshape.6.5.2.png
Binary file modified public/images/handshapes/42/handshape.6.6.1.png
Binary file modified public/images/handshapes/42/handshape.6.6.2.png
Binary file modified public/images/handshapes/42/handshape.7.1.1.png
Binary file modified public/images/handshapes/42/handshape.7.1.2.png
Binary file modified public/images/handshapes/42/handshape.7.1.3.png
Binary file modified public/images/handshapes/42/handshape.7.1.4.png
Binary file modified public/images/handshapes/42/handshape.7.2.1.png
Binary file modified public/images/handshapes/42/handshape.7.3.1.png
Binary file modified public/images/handshapes/42/handshape.7.3.2.png
Binary file modified public/images/handshapes/42/handshape.7.3.3.png
Binary file modified public/images/handshapes/42/handshape.7.4.1.png
Binary file modified public/images/handshapes/42/handshape.7.4.2.png
Binary file modified public/images/handshapes/42/handshape.8.1.1.png
Binary file modified public/images/handshapes/42/handshape.8.1.2.png
Binary file modified public/images/handshapes/42/handshape.8.1.3.png
Binary file modified public/images/locations/42/location.1.1.in_front_of_body.png
Binary file modified public/images/locations/42/location.2.2.in_front_of_face.png
Binary file modified public/images/locations/42/location.3.3.head.png
Binary file modified public/images/locations/42/location.3.4.top_of_head.png
Binary file modified public/images/locations/42/location.3.5.eyes.png
Binary file modified public/images/locations/42/location.3.6.nose.png
Binary file modified public/images/locations/42/location.3.7.ear.png
Binary file modified public/images/locations/42/location.3.8.cheek.png
Binary file modified public/images/locations/42/location.3.9.lower_head.png
Binary file modified public/images/locations/42/location.4.0.body.png
Binary file modified public/images/locations/42/location.4.10.neck_throat.png
Binary file modified public/images/locations/42/location.4.11.shoulders.png
Binary file modified public/images/locations/42/location.4.12.chest.png
Binary file modified public/images/locations/42/location.4.13.abdomen.png
Binary file modified public/images/locations/42/location.4.14.hips_pelvis_groin.png
Binary file modified public/images/locations/42/location.4.15.upper_leg.png
Binary file modified public/images/locations/42/location.5.0.arm.png
Binary file modified public/images/locations/42/location.5.16.upper_arm.png
Binary file modified public/images/locations/42/location.5.17.elbow.png
Binary file modified public/images/locations/42/location.5.18.lower_arm.png
Binary file modified public/images/locations/42/location.6.0.hand.png
Binary file modified public/images/locations/42/location.6.19.wrist.png
Binary file modified public/images/locations/42/location.6.20.fingers_thumb.png
Binary file modified public/images/locations/42/location.6.21.palm_of_hand.png
Binary file modified public/images/locations/42/location.6.22.back_of_hand.png
Binary file modified public/images/locations/42/location.6.23.blades_of_hand.png
Binary file modified public/images/locations/72/location.1.1.in_front_of_body.png
Binary file modified public/images/locations/72/location.2.2.in_front_of_face.png
Binary file modified public/images/locations/72/location.3.3.head.png
Binary file modified public/images/locations/72/location.3.4.top_of_head.png
Binary file modified public/images/locations/72/location.3.5.eyes.png
Binary file modified public/images/locations/72/location.3.6.nose.png
Binary file modified public/images/locations/72/location.3.7.ear.png
Binary file modified public/images/locations/72/location.3.8.cheek.png
Binary file modified public/images/locations/72/location.3.9.lower_head.png
Binary file modified public/images/locations/72/location.4.0.body.png
Binary file modified public/images/locations/72/location.4.10.neck_throat.png
Binary file modified public/images/locations/72/location.4.11.shoulders.png
Binary file modified public/images/locations/72/location.4.12.chest.png
Binary file modified public/images/locations/72/location.4.13.abdomen.png
Binary file modified public/images/locations/72/location.4.14.hips_pelvis_groin.png
Binary file modified public/images/locations/72/location.4.15.upper_leg.png
Binary file modified public/images/locations/72/location.5.0.arm.png
Binary file modified public/images/locations/72/location.5.16.upper_arm.png
Binary file modified public/images/locations/72/location.5.17.elbow.png
Binary file modified public/images/locations/72/location.5.18.lower_arm.png
Binary file modified public/images/locations/72/location.6.0.hand.png
Binary file modified public/images/locations/72/location.6.19.wrist.png
Binary file modified public/images/locations/72/location.6.20.fingers_thumb.png
Binary file modified public/images/locations/72/location.6.21.palm_of_hand.png
Binary file modified public/images/locations/72/location.6.22.back_of_hand.png
Binary file modified public/images/locations/72/location.6.23.blades_of_hand.png
11 changes: 7 additions & 4 deletions public/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ a.logo {height:71px; width:92px; background:url('/images/ui/logo.png') top left
.dropdown .close {position:absolute; top:5px; right:5px; background:url('/images/ui/close_search.png') right center no-repeat; padding-right:20px; height:15px; line-height:15px;}

.attribute_options .row {clear:left;}
.attribute_options li {display:block; margin: 0 0 2px 2px; float:left; position:relative; background:white; border:1px solid #bbb;}
.attribute_options li {display:block; margin: 0 0 2px 2px; float:left; position:relative; border:1px solid #bbb;}
.attribute_options .group {width:71px; height:71px;}
.attribute_options .selected {border-color:#598afb;}

Expand All @@ -203,11 +203,12 @@ a.logo {height:71px; width:92px; background:url('/images/ui/logo.png') top left

.attribute_options .selected .sub:hover,
.sub {top:48px; right:0; height:23px; display:block; margin:0; padding:0; float:left; position:absolute; background:white;}
.attribute_options .selected .sub:hover {background:transparent;}
.attribute_options .selected .sub:hover .image,
.sub .image {width:21px; height:21px; line-height:1;}
.sub .image img {height:100%;}
.sub li,
.attribute_options .selected .sub li{border-color:white; margin:0;}
.sub li {border-color:white; margin:0;}
.attribute_options .selected .sub li{border-color:#e2edfc; margin:0;}
.sub1, .attribute_options .selected .sub1:hover {width:23px;}
.sub2, .attribute_options .selected .sub2:hover {width:46px;}
.sub3, .attribute_options .selected .sub3:hover {width:69px;}
Expand All @@ -217,6 +218,8 @@ a.logo {height:71px; width:92px; background:url('/images/ui/logo.png') top left
.sub:hover {height:44px; z-index:10; top:38px;}
.sub:hover .image {width:42px; height:42px; line-height:1;}

.attribute_options .selected, .attribute_options .selected ul {background-color:#e2edfc;}

.locations .image {width:72px; height:72px;}
.locations .attribute_options li{font-size:8px; text-align:center; line-height:10px;}

Expand Down Expand Up @@ -400,7 +403,7 @@ a.video_replace {background:#99a0a5; display:block; border:0; float:left;}

.rule_after {background:url('/images/ui/hr.png') left bottom no-repeat; padding-bottom:1px; margin-bottom:16px;}
.rounded {-webkit-border-radius:4px; -moz-border-radius:4px; -o-border-radius:4px; border-radius:4px;}
.transition {-webkit-transition-duration:0.5s; -webkit-transition-property:width height background; -webkit-transition-time:1s;}
.transition {/*-webkit-transition-duration:0.5s; -webkit-transition-property:width height background; -webkit-transition-time:1s;*/}
.vertical_space {padding-bottom:16px;}
.shadow {-webkit-box-shadow:0 2px 3px rgba(0,0,0,0.5);
-moz-box-shadow:0 2px 3px rgba(0,0,0,0.5);
Expand Down

0 comments on commit f6a0b86

Please sign in to comment.