added new images and item types

This commit is contained in:
Connor Turland 2012-10-03 21:40:26 -04:00
parent 66d13159f0
commit f08f5835ec
39 changed files with 96 additions and 15 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
app/assets/images/junto.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
app/assets/images/role.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8 KiB

BIN
app/assets/images/task.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

View file

@ -1,7 +1,7 @@
<%= div_for group do %> <%= div_for group do %>
<p class="type">Group</p> <p class="type">Group</p>
<%= image_tag "group.png", :class => 'icon' %> <%= image_tag "group.png", :class => 'icon', :size => '50x50' %>
<%= link_to group.name, group_url(group), :class => 'title' %> <%= link_to group.name, group_url(group), :class => 'title' %>
<div class="desc"><p><%= group.desc %></p></div> <div class="desc"><p><%= group.desc %></p></div>
<%= link_to group.link, group.link, :class => 'link' %> <%= link_to group.link, group.link, :class => 'link' %>

View file

@ -1,7 +1,7 @@
<div class="focus"> <div class="focus">
<div class="focusleft"> <div class="focusleft">
<p>Group</p> <p>Group</p>
<%= image_tag "group.png", :class => 'icon' %> <%= image_tag "group.png", :class => 'icon', :size => '50x50' %>
</div> </div>
<div class="focusmiddle"> <div class="focusmiddle">
<h1 class="title"><%= @group.name %> <%= link_to "[edit]", edit_group_path(@group) %></h1> <h1 class="title"><%= @group.name %> <%= link_to "[edit]", edit_group_path(@group) %></h1>

View file

@ -1,6 +1,6 @@
<%= div_for item do %> <%= div_for item do %>
<p class="type"><%= item.item_category.name %></p> <p class="type"><%= item.item_category.name %></p>
<%= 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' %> <%= link_to item.name, item_url(item), :class => 'title' %>
<div class="desc"><p><%=item.desc %></p></div> <div class="desc"><p><%=item.desc %></p></div>
<%= link_to item.link, item.link, :class => 'link' %> <%= link_to item.link, item.link, :class => 'link' %>

View file

@ -2,7 +2,7 @@
<div class="focusleft"> <div class="focusleft">
<p><%= @item.item_category.name %></p> <p><%= @item.item_category.name %></p>
<%= image_tag @item.item_category.icon, :class => 'icon' %> <%= image_tag @item.item_category.icon, :class => 'icon', :size => '50x50' %>
</div> </div>
<div class="focusmiddle"> <div class="focusmiddle">
<h1 class="title"><%= @item.name %> <%= link_to "[edit]", edit_item_path(@item) %></h1> <h1 class="title"><%= @item.name %> <%= link_to "[edit]", edit_item_path(@item) %></h1>

View file

@ -1,6 +1,6 @@
<%= div_for person do %> <%= div_for person do %>
<p class="type">Person</p> <p class="type">Person</p>
<%= image_tag "person.png", :class => 'icon' %> <%= image_tag "person.png", :class => 'icon', :size => '50x50' %>
<%= link_to person.name, person_url(person), :class => 'title' %> <%= link_to person.name, person_url(person), :class => 'title' %>
<div class="desc"><p><%=person.desc %></p></div> <div class="desc"><p><%=person.desc %></p></div>
<%= link_to person.link, person.link, :class => 'link' %> <%= link_to person.link, person.link, :class => 'link' %>

View file

@ -1,7 +1,7 @@
<div class="focus"> <div class="focus">
<div class="focusleft"> <div class="focusleft">
<p>Person</p> <p>Person</p>
<%= image_tag "person.png", :class => 'icon' %> <%= image_tag "person.png", :class => 'icon', :size => '50x50' %>
</div> </div>
<div class="focusmiddle"> <div class="focusmiddle">
<h1 class="title"><%= @person.name %> <%= link_to "[edit]", edit_person_path(@person) %></h1> <h1 class="title"><%= @person.name %> <%= link_to "[edit]", edit_person_path(@person) %></h1>

View file

@ -4,37 +4,110 @@ one:
name: Action name: Action
icon: action.png 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 name: Experience
icon: experience.png icon: experience.png
three: seven:
name: Future Dev
icon: futuredev.png
eight:
name: Idea name: Idea
icon: idea.png icon: idea.png
nine:
name: Implication
icon: implication.png
ten:
name: Insight
icon: insight.png
four: eleven:
name: Intention name: Intention
icon: intention.png 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 name: Opinion
icon: opinion.png 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 name: Question
icon: question.png icon: question.png
seven: twenty:
name: Reference name: Reference
icon: reference.png icon: reference.png
twentyone:
name: Requirement
icon: requirement.png
eight: twentytwo:
name: Resource name: Resource
icon: resource.png icon: resource.png
twentythree:
name: Role
icon: role.png
twentyfour:
name: Task
icon: task.png
nine: twentyfive:
name: Tool name: Tool
icon: tool.png icon: tool.png
twentysix:
name: Trajectory
icon: trajectory.png

View file

@ -7,3 +7,11 @@ connor:
crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972 crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972
persistence_token: persistence_token:
perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc
ishan:
name: Ishan Shapiro
email: ishanshapiro@gmail.com
password_salt: i9vWzlSSPA3uIaer5jk
crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972
persistence_token:
perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc