diff --git a/app/assets/images/48px-all.zip b/app/assets/images/48px-all.zip new file mode 100644 index 00000000..f37c75b5 Binary files /dev/null and b/app/assets/images/48px-all.zip differ diff --git a/app/assets/images/96px-gen001.zip b/app/assets/images/96px-gen001.zip new file mode 100644 index 00000000..8d88a57c Binary files /dev/null and b/app/assets/images/96px-gen001.zip differ diff --git a/app/assets/images/action.png b/app/assets/images/action.png index 91b6755c..f4519f46 100644 Binary files a/app/assets/images/action.png and b/app/assets/images/action.png differ diff --git a/app/assets/images/activity.png b/app/assets/images/activity.png new file mode 100644 index 00000000..acfe5ae5 Binary files /dev/null and b/app/assets/images/activity.png differ diff --git a/app/assets/images/bizarre.png b/app/assets/images/bizarre.png new file mode 100644 index 00000000..ef0fa697 Binary files /dev/null and b/app/assets/images/bizarre.png differ diff --git a/app/assets/images/catalyst.png b/app/assets/images/catalyst.png new file mode 100644 index 00000000..16d73cdc Binary files /dev/null and b/app/assets/images/catalyst.png differ diff --git a/app/assets/images/closed.png b/app/assets/images/closed.png new file mode 100644 index 00000000..73675064 Binary files /dev/null and b/app/assets/images/closed.png differ diff --git a/app/assets/images/futuredev.png b/app/assets/images/futuredev.png new file mode 100644 index 00000000..ae7884b0 Binary files /dev/null and b/app/assets/images/futuredev.png differ diff --git a/app/assets/images/group.png b/app/assets/images/group.png index 1557b554..3241a3e2 100644 Binary files a/app/assets/images/group.png and b/app/assets/images/group.png differ diff --git a/app/assets/images/implication.png b/app/assets/images/implication.png new file mode 100644 index 00000000..4327406b Binary files /dev/null and b/app/assets/images/implication.png differ diff --git a/app/assets/images/insight.png b/app/assets/images/insight.png new file mode 100644 index 00000000..99a01166 Binary files /dev/null and b/app/assets/images/insight.png differ diff --git a/app/assets/images/intention.png b/app/assets/images/intention.png index 9a177111..4093a7dc 100644 Binary files a/app/assets/images/intention.png and b/app/assets/images/intention.png differ diff --git a/app/assets/images/junto.png b/app/assets/images/junto.png new file mode 100644 index 00000000..4a1cf6e7 Binary files /dev/null and b/app/assets/images/junto.png differ diff --git a/app/assets/images/knowledge.png b/app/assets/images/knowledge.png new file mode 100644 index 00000000..5406a635 Binary files /dev/null and b/app/assets/images/knowledge.png differ diff --git a/app/assets/images/location.png b/app/assets/images/location.png index b3481869..530499a3 100644 Binary files a/app/assets/images/location.png and b/app/assets/images/location.png differ diff --git a/app/assets/images/old icons/action.png b/app/assets/images/old icons/action.png new file mode 100644 index 00000000..91b6755c Binary files /dev/null and b/app/assets/images/old icons/action.png differ diff --git a/app/assets/images/old icons/group.png b/app/assets/images/old icons/group.png new file mode 100644 index 00000000..1557b554 Binary files /dev/null and b/app/assets/images/old icons/group.png differ diff --git a/app/assets/images/old icons/intention.png b/app/assets/images/old icons/intention.png new file mode 100644 index 00000000..9a177111 Binary files /dev/null and b/app/assets/images/old icons/intention.png differ diff --git a/app/assets/images/old icons/location.png b/app/assets/images/old icons/location.png new file mode 100644 index 00000000..b3481869 Binary files /dev/null and b/app/assets/images/old icons/location.png differ diff --git a/app/assets/images/old icons/person.png b/app/assets/images/old icons/person.png new file mode 100644 index 00000000..96e76bcc Binary files /dev/null and b/app/assets/images/old icons/person.png differ diff --git a/app/assets/images/old icons/resource.png b/app/assets/images/old icons/resource.png new file mode 100644 index 00000000..ca1a288d Binary files /dev/null and b/app/assets/images/old icons/resource.png differ diff --git a/app/assets/images/openissue.png b/app/assets/images/openissue.png new file mode 100644 index 00000000..2200be4f Binary files /dev/null and b/app/assets/images/openissue.png differ diff --git a/app/assets/images/opportunity.png b/app/assets/images/opportunity.png new file mode 100644 index 00000000..81671350 Binary files /dev/null and b/app/assets/images/opportunity.png differ diff --git a/app/assets/images/person.png b/app/assets/images/person.png index 96e76bcc..8b057b52 100644 Binary files a/app/assets/images/person.png and b/app/assets/images/person.png differ diff --git a/app/assets/images/platform.png b/app/assets/images/platform.png new file mode 100644 index 00000000..1ac19c36 Binary files /dev/null and b/app/assets/images/platform.png differ diff --git a/app/assets/images/problem.png b/app/assets/images/problem.png new file mode 100644 index 00000000..719f6f3f Binary files /dev/null and b/app/assets/images/problem.png differ diff --git a/app/assets/images/requirement.png b/app/assets/images/requirement.png new file mode 100644 index 00000000..28f5d8a0 Binary files /dev/null and b/app/assets/images/requirement.png differ diff --git a/app/assets/images/resource.png b/app/assets/images/resource.png index ca1a288d..db0701f0 100644 Binary files a/app/assets/images/resource.png and b/app/assets/images/resource.png differ diff --git a/app/assets/images/role.png b/app/assets/images/role.png new file mode 100644 index 00000000..821e93bc Binary files /dev/null and b/app/assets/images/role.png differ diff --git a/app/assets/images/task.png b/app/assets/images/task.png new file mode 100644 index 00000000..3e1e569e Binary files /dev/null and b/app/assets/images/task.png differ diff --git a/app/assets/images/trajectory.png b/app/assets/images/trajectory.png new file mode 100644 index 00000000..64fbb696 Binary files /dev/null and b/app/assets/images/trajectory.png differ diff --git a/app/views/groups/_group.html.erb b/app/views/groups/_group.html.erb index d50a2dbc..d8a4f249 100644 --- a/app/views/groups/_group.html.erb +++ b/app/views/groups/_group.html.erb @@ -1,7 +1,7 @@ <%= div_for group do %>

Group

- <%= image_tag "group.png", :class => 'icon' %> + <%= image_tag "group.png", :class => 'icon', :size => '50x50' %> <%= link_to group.name, group_url(group), :class => 'title' %>

<%= group.desc %>

<%= link_to group.link, group.link, :class => 'link' %> diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb index c2f05cd0..51d6b881 100644 --- a/app/views/groups/show.html.erb +++ b/app/views/groups/show.html.erb @@ -1,7 +1,7 @@

Group

- <%= image_tag "group.png", :class => 'icon' %> + <%= image_tag "group.png", :class => 'icon', :size => '50x50' %>

<%= @group.name %> <%= link_to "[edit]", edit_group_path(@group) %>

diff --git a/app/views/items/_item.html.erb b/app/views/items/_item.html.erb index 5afb3a3b..ed4e3370 100644 --- a/app/views/items/_item.html.erb +++ b/app/views/items/_item.html.erb @@ -1,6 +1,6 @@ <%= div_for item do %>

<%= item.item_category.name %>

- <%= image_tag item.item_category.icon, :class => 'icon' %> + <%= image_tag item.item_category.icon, :class => 'icon', :size => '50x50' %> <%= link_to item.name, item_url(item), :class => 'title' %>

<%=item.desc %>

<%= link_to item.link, item.link, :class => 'link' %> diff --git a/app/views/items/show.html.erb b/app/views/items/show.html.erb index 4e33cc65..b34a8721 100644 --- a/app/views/items/show.html.erb +++ b/app/views/items/show.html.erb @@ -2,7 +2,7 @@

<%= @item.item_category.name %>

- <%= image_tag @item.item_category.icon, :class => 'icon' %> + <%= image_tag @item.item_category.icon, :class => 'icon', :size => '50x50' %>

<%= @item.name %> <%= link_to "[edit]", edit_item_path(@item) %>

diff --git a/app/views/people/_person.html.erb b/app/views/people/_person.html.erb index 01826769..3aed506f 100644 --- a/app/views/people/_person.html.erb +++ b/app/views/people/_person.html.erb @@ -1,6 +1,6 @@ <%= div_for person do %>

Person

- <%= image_tag "person.png", :class => 'icon' %> + <%= image_tag "person.png", :class => 'icon', :size => '50x50' %> <%= link_to person.name, person_url(person), :class => 'title' %>

<%=person.desc %>

<%= link_to person.link, person.link, :class => 'link' %> diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb index c33b8c37..10577e77 100644 --- a/app/views/people/show.html.erb +++ b/app/views/people/show.html.erb @@ -1,7 +1,7 @@

Person

- <%= image_tag "person.png", :class => 'icon' %> + <%= image_tag "person.png", :class => 'icon', :size => '50x50' %>

<%= @person.name %> <%= link_to "[edit]", edit_person_path(@person) %>

diff --git a/test/fixtures/item_categories.yml b/test/fixtures/item_categories.yml index afec29b4..4b33b173 100644 --- a/test/fixtures/item_categories.yml +++ b/test/fixtures/item_categories.yml @@ -4,37 +4,110 @@ one: name: Action icon: action.png -two: +two: + name: Activity + icon: activity.png + +three: + name: Bizarre + icon: bizarre.png + +four: + name: Catalyst + icon: catalyst.png + +five: + name: Closed + icon: closed.png + +six: name: Experience icon: experience.png -three: +seven: + name: Future Dev + icon: futuredev.png + + +eight: name: Idea icon: idea.png + +nine: + name: Implication + icon: implication.png + +ten: + name: Insight + icon: insight.png -four: +eleven: name: Intention icon: intention.png + +twelve: + name: Knowledge + icon: knowledge.png + +thirteen: + name: Location + icon: location.png + +fourteen: + name: Open Issue + icon: openissue.png -five: +fifteen: name: Opinion icon: opinion.png + +sixteen: + name: Opportunity + icon: opportunity.png + +seventeen: + name: Platform + icon: platform.png + +eighteen: + name: Problem + icon: problem.png -six: +nineteen: name: Question icon: question.png -seven: +twenty: name: Reference icon: reference.png + +twentyone: + name: Requirement + icon: requirement.png -eight: +twentytwo: name: Resource icon: resource.png + +twentythree: + name: Role + icon: role.png + +twentyfour: + name: Task + icon: task.png -nine: +twentyfive: name: Tool - icon: tool.png + icon: tool.png + +twentysix: + name: Trajectory + icon: trajectory.png + + + + diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index d9e9a83c..c2778fae 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -7,3 +7,11 @@ connor: crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972 persistence_token: perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc + +ishan: + name: Ishan Shapiro + email: ishanshapiro@gmail.com + password_salt: i9vWzlSSPA3uIaer5jk + crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972 + persistence_token: + perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc \ No newline at end of file