Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added auto complet,e worked on layout design

  • Loading branch information...
commit 13555a06bffda9519a90329016a6af64d8f96dc2 1 parent b8654fc
unknown authored
View
2  .idea/.rakeTasks
@@ -4,4 +4,4 @@ You are allowed to:
1. Remove rake task
2. Add existing rake tasks
To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="List versions of all Rails frameworks and the environment" fullCmd="about" taksId="about" /><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Create the database from config/database.yml for the current Rails.env (use db:create:all to create all dbs in the config)" fullCmd="db:create" taksId="create" /><RakeTask description="Drops the database for the current Rails.env (use db:drop:all to drop all databases)" fullCmd="db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Load fixtures into the current environment's database" fullCmd="db:fixtures:load" taksId="load" /><RakeTask description="" fullCmd="db:fixtures:identify" taksId="identify" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false)" fullCmd="db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeTask description="Create a db/schema.rb file that can be portably used against any DB supported by AR" fullCmd="db:schema:dump" taksId="dump" /><RakeTask description="Load a schema.rb file into the database" fullCmd="db:schema:load" taksId="load" /></RakeGroup><RakeTask description="Load the seed data from db/seeds.rb" fullCmd="db:seed" taksId="seed" /><RakeTask description="Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)" fullCmd="db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dump the database structure to an SQL file" fullCmd="db:structure:dump" taksId="dump" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="db:version" taksId="version" /><RakeTask description="" fullCmd="db:abort_if_pending_migrations" taksId="abort_if_pending_migrations" /><RakeTask description="" fullCmd="db:charset" taksId="charset" /><RakeTask description="" fullCmd="db:collation" taksId="collation" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="db:forward" taksId="forward" /><RakeTask description="" fullCmd="db:load_config" taksId="load_config" /><RakeTask description="" fullCmd="db:reset" taksId="reset" /><RakeGroup description="" fullCmd="" taksId="sessions"><RakeTask description="" fullCmd="db:sessions:clear" taksId="clear" /><RakeTask description="" fullCmd="db:sessions:create" taksId="create" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="" fullCmd="db:test:clone" taksId="clone" /><RakeTask description="" fullCmd="db:test:clone_structure" taksId="clone_structure" /><RakeTask description="" fullCmd="db:test:load" taksId="load" /><RakeTask description="" fullCmd="db:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="db:test:purge" taksId="purge" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="doc"><RakeTask description="Generate docs for the app -- also availble doc:rails, doc:guides, doc:plugins (options: TEMPLATE=/rdoc-template.rb, TITLE=&quot;Custom Title&quot;)" fullCmd="doc:app" taksId="app" /><RakeTask description="" fullCmd="doc:clobber" taksId="clobber" /><RakeTask description="" fullCmd="doc:clobber_app" taksId="clobber_app" /><RakeTask description="" fullCmd="doc:clobber_plugins" taksId="clobber_plugins" /><RakeTask description="" fullCmd="doc:clobber_rails" taksId="clobber_rails" /><RakeTask description="" fullCmd="doc:guides" taksId="guides" /><RakeTask description="" fullCmd="doc:plugins" taksId="plugins" /><RakeTask description="" fullCmd="doc:rails" taksId="rails" /><RakeTask description="" fullCmd="doc:reapp" taksId="reapp" /><RakeTask description="" fullCmd="doc:rerails" taksId="rerails" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="jobs"><RakeTask description="Clear the delayed_job queue" fullCmd="jobs:clear" taksId="clear" /><RakeTask description="Start a delayed_job worker" fullCmd="jobs:work" taksId="work" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="log"><RakeTask description="Truncates all *.log files in log/ to zero bytes" fullCmd="log:clear" taksId="clear" /></RakeGroup><RakeTask description="Prints out your Rack middleware stack" fullCmd="middleware" taksId="middleware" /><RakeTask description="Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)" fullCmd="notes" taksId="notes" /><RakeGroup description="" fullCmd="" taksId="notes"><RakeTask description="Enumerate a custom annotation, specify with ANNOTATION=CUSTOM" fullCmd="notes:custom" taksId="custom" /><RakeTask description="" fullCmd="notes:fixme" taksId="fixme" /><RakeTask description="" fullCmd="notes:optimize" taksId="optimize" /><RakeTask description="" fullCmd="notes:todo" taksId="todo" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="rails"><RakeTask description="Applies the template supplied by LOCATION=/path/to/template" fullCmd="rails:template" taksId="template" /><RakeTask description="Update both configs and public/javascripts from Rails (or use just update:javascripts or update:configs)" fullCmd="rails:update" taksId="update" /><RakeGroup description="" fullCmd="" taksId="freeze"><RakeTask description="" fullCmd="rails:freeze:edge" taksId="edge" /><RakeTask description="" fullCmd="rails:freeze:gems" taksId="gems" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="templates"><RakeTask description="" fullCmd="rails:templates:copy" taksId="copy" /></RakeGroup><RakeTask description="" fullCmd="rails:unfreeze" taksId="unfreeze" /><RakeGroup description="" fullCmd="" taksId="update"><RakeTask description="" fullCmd="rails:update:application_controller" taksId="application_controller" /><RakeTask description="" fullCmd="rails:update:configs" taksId="configs" /><RakeTask description="" fullCmd="rails:update:javascripts" taksId="javascripts" /><RakeTask description="" fullCmd="rails:update:scripts" taksId="scripts" /></RakeGroup></RakeGroup><RakeTask description="Print out all defined routes in match order, with names" fullCmd="routes" taksId="routes" /><RakeTask description="Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions)" fullCmd="secret" taksId="secret" /><RakeTask description="Report code statistics (KLOCs, etc) from the application" fullCmd="stats" taksId="stats" /><RakeTask description="Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)" fullCmd="test" taksId="test" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="Run tests for recenttest:prepare / Test recent changes" fullCmd="test:recent" taksId="recent" /><RakeTask description="Run tests for uncommittedtest:prepare / Test changes since last checkin (only Subversion and Git)" fullCmd="test:uncommitted" taksId="uncommitted" /><RakeTask description="" fullCmd="test:benchmark" taksId="benchmark" /><RakeTask description="" fullCmd="test:functionals" taksId="functionals" /><RakeTask description="" fullCmd="test:integration" taksId="integration" /><RakeTask description="" fullCmd="test:plugins" taksId="plugins" /><RakeTask description="" fullCmd="test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="test:profile" taksId="profile" /><RakeTask description="" fullCmd="test:units" taksId="units" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="time"><RakeGroup description="" fullCmd="" taksId="zones"><RakeTask description="Displays all time zones, also available: time:zones:us, time:zones:local -- filter with OFFSET parameter, e.g., OFFSET=-6" fullCmd="time:zones:all" taksId="all" /><RakeTask description="" fullCmd="time:zones:local" taksId="local" /><RakeTask description="" fullCmd="time:zones:us" taksId="us" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="tmp"><RakeTask description="Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)" fullCmd="tmp:clear" taksId="clear" /><RakeTask description="Creates tmp directories for sessions, cache, sockets, and pids" fullCmd="tmp:create" taksId="create" /><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="" fullCmd="tmp:cache:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="pids"><RakeTask description="" fullCmd="tmp:pids:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sessions"><RakeTask description="" fullCmd="tmp:sessions:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sockets"><RakeTask description="" fullCmd="tmp:sockets:clear" taksId="clear" /></RakeGroup></RakeGroup><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="doc" taksId="doc" /><RakeTask description="" fullCmd="doc/api" taksId="doc/api" /><RakeTask description="" fullCmd="doc/api/index.html" taksId="doc/api/index.html" /><RakeTask description="" fullCmd="file" taksId="file" /><RakeTask description="" fullCmd="doc/app" taksId="doc/app" /><RakeTask description="" fullCmd="doc/app/index.html" taksId="doc/app/index.html" /><RakeTask description="" fullCmd="environment" taksId="environment" /><RakeTask description="" fullCmd="rails_env" taksId="rails_env" /></RakeGroup></Settings>
+--><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>
View
32 .idea/MBrowser7.iml
@@ -67,40 +67,40 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] activerecord (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/activerecord-3.0.5)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] activesupport (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/activesupport-3.0.5)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] actionpack (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/actionpack-3.0.5)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] activeresource (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/activeresource-3.0.5)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] actionmailer (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/actionmailer-3.0.5)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] bundler (v1.0.10, C:/Ruby187/lib/ruby/gems/1.8/gems/bundler-1.0.10)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] railties (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/railties-3.0.5)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] rails (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/rails-3.0.5)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] sqlite3 (v1.3.3, C:/Ruby187/lib/ruby/gems/1.8/gems/sqlite3-1.3.3-x86-mingw32)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] will_paginate (v3.0.pre2, C:/Ruby187/lib/ruby/gems/1.8/gems/will_paginate-3.0.pre2)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] rake (v0.8.7, C:/Ruby187/lib/ruby/gems/1.8/gems/rake-0.8.7)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] bundler (v1.0.7, C:/Ruby187/lib/ruby/gems/1.8/gems/bundler-1.0.7)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] jquery-rails (v0.2.7, C:/Ruby187/lib/ruby/gems/1.8/gems/jquery-rails-0.2.7)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] uuid (v2.3.1, C:/Ruby187/lib/ruby/gems/1.8/gems/uuid-2.3.1)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] macaddr (v1.0.0, C:/Ruby187/lib/ruby/gems/1.8/gems/macaddr-1.0.0)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] i18n (v0.5.0, C:/Ruby187/lib/ruby/gems/1.8/gems/i18n-0.5.0)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] acts-as-taggable-on (v2.0.6, C:/Ruby187/lib/ruby/gems/1.8/gems/acts-as-taggable-on-2.0.6)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] formtastic (v1.2.3, C:/Ruby187/lib/ruby/gems/1.8/gems/formtastic-1.2.3)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] rails (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/rails-3.0.5)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] delayed_job (v2.1.2, C:/Ruby187/lib/ruby/gems/1.8/gems/delayed_job-2.1.2)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] daemons (v1.1.0, C:/Ruby187/lib/ruby/gems/1.8/gems/daemons-1.1.0)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] will_paginate (v3.0.pre2, C:/Ruby187/lib/ruby/gems/1.8/gems/will_paginate-3.0.pre2)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] thor (v0.14.6, C:/Ruby187/lib/ruby/gems/1.8/gems/thor-0.14.6)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] jquery-rails (v0.2.7, C:/Ruby187/lib/ruby/gems/1.8/gems/jquery-rails-0.2.7)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] rake (v0.8.7, C:/Ruby187/lib/ruby/gems/1.8/gems/rake-0.8.7)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] macaddr (v1.0.0, C:/Ruby187/lib/ruby/gems/1.8/gems/macaddr-1.0.0)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] rack (v1.2.2, C:/Ruby187/lib/ruby/gems/1.8/gems/rack-1.2.2)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] erubis (v2.6.6, C:/Ruby187/lib/ruby/gems/1.8/gems/erubis-2.6.6)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] activerecord (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/activerecord-3.0.5)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] arel (v2.0.9, C:/Ruby187/lib/ruby/gems/1.8/gems/arel-2.0.9)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] activesupport (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/activesupport-3.0.5)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] actionpack (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/actionpack-3.0.5)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] thor (v0.14.6, C:/Ruby187/lib/ruby/gems/1.8/gems/thor-0.14.6)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] tzinfo (v0.3.25, C:/Ruby187/lib/ruby/gems/1.8/gems/tzinfo-0.3.25)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] polyglot (v0.3.1, C:/Ruby187/lib/ruby/gems/1.8/gems/polyglot-0.3.1)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] actionmailer (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/actionmailer-3.0.5)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] activeresource (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/activeresource-3.0.5)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] railties (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/railties-3.0.5)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] mail (v2.2.15, C:/Ruby187/lib/ruby/gems/1.8/gems/mail-2.2.15)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] rails (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/rails-3.0.5)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] mime-types (v1.16, C:/Ruby187/lib/ruby/gems/1.8/gems/mime-types-1.16)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] treetop (v1.4.9, C:/Ruby187/lib/ruby/gems/1.8/gems/treetop-1.4.9)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] activemodel (v3.0.5, C:/Ruby187/lib/ruby/gems/1.8/gems/activemodel-3.0.5)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] abstract (v1.0.0, C:/Ruby187/lib/ruby/gems/1.8/gems/abstract-1.0.0)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] i18n (v0.5.0, C:/Ruby187/lib/ruby/gems/1.8/gems/i18n-0.5.0)" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="[gem] daemons (v1.1.0, C:/Ruby187/lib/ruby/gems/1.8/gems/daemons-1.1.0)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] builder (v2.1.2, C:/Ruby187/lib/ruby/gems/1.8/gems/builder-2.1.2)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] rack-test (v0.5.7, C:/Ruby187/lib/ruby/gems/1.8/gems/rack-test-0.5.7)" level="application" />
<orderEntry type="library" scope="PROVIDED" name="[gem] rack-mount (v0.6.13, C:/Ruby187/lib/ruby/gems/1.8/gems/rack-mount-0.6.13)" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="[gem] sqlite3-ruby (v1.3.2, C:/Ruby187/lib/ruby/gems/1.8/gems/sqlite3-ruby-1.3.2-x86-mingw32)" level="application" />
</component>
</module>
View
2  .idea/misc.xml
@@ -6,6 +6,6 @@
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
- <component name="ProjectRootManager" version="2" project-jdk-name="Ruby SDK 1.8.7-p302" project-jdk-type="RUBY_SDK" />
+ <component name="ProjectRootManager" version="2" project-jdk-name="Ruby SDK 1.8.7-p330" project-jdk-type="RUBY_SDK" />
</project>
View
187 .idea/workspace.xml
@@ -2,7 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b8a98e3f-1060-4f79-b505-8dc70d58a075" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.rakeTasks" afterPath="$PROJECT_DIR$/.idea/.rakeTasks" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/MBrowser7.iml" afterPath="$PROJECT_DIR$/.idea/MBrowser7.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/helpers/tagging_room_helper.rb" afterPath="$PROJECT_DIR$/app/helpers/tagging_room_helper.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/tagging_room/index.html.erb" afterPath="$PROJECT_DIR$/app/views/tagging_room/index.html.erb" />
</list>
<ignored path="MBrowser7.iws" />
@@ -66,7 +70,7 @@
<file leaf-file-name="index.html.erb" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/movies/index.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="58" selection-start="569" selection-end="569" vertical-scroll-proportion="15.538462">
+ <state line="12" column="58" selection-start="569" selection-end="569" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -75,7 +79,16 @@
<file leaf-file-name="index.html.erb" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/views/tagging_room/index.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="133" column="29" selection-start="4618" selection-end="4618" vertical-scroll-proportion="2.3315117">
+ <state line="6" column="34" selection-start="224" selection-end="224" vertical-scroll-proportion="0.23480663">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="tagging_room_helper.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/helpers/tagging_room_helper.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="70" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -138,7 +151,7 @@
</option>
</component>
<component name="Git.Settings">
- <option name="GIT_EXECUTABLE" value="C:\Program Files\Git\bin\git.exe" />
+ <option name="GIT_EXECUTABLE" value="C:\Program Files (x86)\Git\bin\git.exe" />
<option name="CHECKOUT_INCLUDE_TAGS" value="false" />
<option name="UPDATE_CHANGES_POLICY" value="STASH" />
<option name="LINE_SEPARATORS_CONVERSION_ASK" value="false" />
@@ -146,7 +159,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/app/views/tags/index.html.erb" />
<option value="$PROJECT_DIR$/app/views/movies/index.js.erb" />
<option value="$PROJECT_DIR$/app/views/tags/show.html.erb" />
<option value="$PROJECT_DIR$/app/controllers/tags_controller.rb" />
@@ -161,6 +173,7 @@
<option value="$PROJECT_DIR$/app/models/movie.rb" />
<option value="$PROJECT_DIR$/app/controllers/movies_controller.rb" />
<option value="$PROJECT_DIR$/app/views/movies/index.html.erb" />
+ <option value="$PROJECT_DIR$/app/helpers/tagging_room_helper.rb" />
<option value="$PROJECT_DIR$/app/views/tagging_room/index.html.erb" />
</list>
</option>
@@ -198,8 +211,6 @@
<sortByType />
</navigator>
<panes>
- <pane id="Favorites" />
- <pane id="Scope" />
<pane id="RailsProjectView" />
<pane id="ProjectPane">
<subPane>
@@ -340,94 +351,6 @@
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="tagging_room" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MBrowser7" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="MBrowser7" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="system_files" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MBrowser7" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="MBrowser7" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="movies" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MBrowser7" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="MBrowser7" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="layouts" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MBrowser7" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="MBrowser7" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -499,15 +422,17 @@
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
+ <pane id="Favorites" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="options.splitter.main.proportions" value="0.3" />
+ <property name="options.lastSelected" value="project.propVCSSupport.VCSs.Git" />
<property name="recentsLimit" value="5" />
- <property name="options.lastSelected" value="org.jetbrains.plugins.ruby.settings.RubyIdeSdkConfigurable" />
<property name="RailsGeneratorsPopup.hiddenIncluded" value="false" />
- <property name="options.splitter.details.proportions" value="0.2" />
<property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@@ -734,12 +659,12 @@
</configuration>
<list size="7">
<item index="0" class="java.lang.String" itemvalue="Rake.db:migrate" />
- <item index="1" class="java.lang.String" itemvalue="Rails.Production: MBrowser7" />
- <item index="2" class="java.lang.String" itemvalue="Rails.Development: MBrowser7" />
- <item index="3" class="java.lang.String" itemvalue="Rake.test" />
- <item index="4" class="java.lang.String" itemvalue="Rake.spec" />
- <item index="5" class="java.lang.String" itemvalue="Rake.jobs:work" />
- <item index="6" class="java.lang.String" itemvalue="Rake.routes" />
+ <item index="1" class="java.lang.String" itemvalue="Rake.jobs:work" />
+ <item index="2" class="java.lang.String" itemvalue="Rake.routes" />
+ <item index="3" class="java.lang.String" itemvalue="Rails.Production: MBrowser7" />
+ <item index="4" class="java.lang.String" itemvalue="Rails.Development: MBrowser7" />
+ <item index="5" class="java.lang.String" itemvalue="Rake.test" />
+ <item index="6" class="java.lang.String" itemvalue="Rake.spec" />
</list>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
@@ -768,22 +693,22 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+ <frame x="-8" y="-8" width="1296" height="776" extended-state="6" />
<editor active="false" />
<layout>
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32972974" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32868218" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32824025" sideWeight="0.22162162" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32824025" sideWeight="0.67027026" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15898252" sideWeight="0.6713178" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.0" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32868218" sideWeight="0.0" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -834,11 +759,6 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/controllers/tags_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="6" column="93" selection-start="207" selection-end="207" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/public/javascripts/jquery.min.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
@@ -869,18 +789,28 @@
<state line="2" column="56" selection-start="116" selection-end="116" vertical-scroll-proportion="0.059130434" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/tagging_room_controller.rb">
+ <entry file="file://$PROJECT_DIR$/app/controllers/movies_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="47" selection-start="331" selection-end="331" vertical-scroll-proportion="0.0" />
+ <state line="7" column="52" selection-start="213" selection-end="213" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/system_files/index.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/models/movie.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="72" selection-start="102" selection-end="102" vertical-scroll-proportion="0.0">
+ <state line="40" column="46" selection-start="1181" selection-end="1181" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/views/movies/index.html.erb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="12" column="58" selection-start="569" selection-end="569" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/views/system_files/index.html.erb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1" column="72" selection-start="102" selection-end="102" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/app/controllers/system_files_controller.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="27" selection-start="996" selection-end="996" vertical-scroll-proportion="0.0" />
@@ -891,37 +821,26 @@
<state line="14" column="97" selection-start="498" selection-end="521" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/dropbox_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="45" column="25" selection-start="1197" selection-end="1197" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/models/movie.rb">
+ <entry file="file://$PROJECT_DIR$/app/controllers/tagging_room_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="46" selection-start="1181" selection-end="1181" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="12" column="47" selection-start="331" selection-end="331" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/movies_controller.rb">
+ <entry file="file://$PROJECT_DIR$/app/controllers/dropbox_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="52" selection-start="213" selection-end="213" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="45" column="25" selection-start="1197" selection-end="1197" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/movies/index.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/helpers/tagging_room_helper.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="58" selection-start="569" selection-end="569" vertical-scroll-proportion="15.538462">
+ <state line="5" column="70" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/tagging_room/index.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="133" column="29" selection-start="4618" selection-end="4618" vertical-scroll-proportion="2.3315117">
+ <state line="6" column="34" selection-start="224" selection-end="224" vertical-scroll-proportion="0.23480663">
<folding />
</state>
</provider>
View
20 app/helpers/tagging_room_helper.rb
@@ -1,2 +1,22 @@
module TaggingRoomHelper
+ def tag_boxes_for(tags)
+ s=""
+ unless tags.nil?
+ tags.each do |t|
+ s += %{<div class="droppable ui-widget-header" id="#{t.name}">
+ <div style="text-align:center">
+ <b>#{t.name}</b>
+
+ </div>
+ <div>
+ <span><br></span>
+ </div>
+ </div>
+ <div class="clear"></div>}
+ end
+ else
+ s += '<div><br></div>'
+ end
+ s.html_safe
+ end
end
View
72 app/views/tagging_room/index.html.erb
@@ -1,6 +1,14 @@
<script type="text/javascript" charset="utf-8">
$(document).ready(function()
{
+ var availableTags = [
+ <% s="" %>
+ <% @tags.each{ |t| s+= '"' + t.name + '",'} %>
+ <%= s.html_safe %>
+ ];
+ $( "#tag" ).autocomplete({
+ source: availableTags
+ });
$( ".draggable" ).draggable({
cursor: "move",
cursorAt: { top: 0, left: 150 },
@@ -23,8 +31,8 @@
success: function(msg){
$( this )
.addClass( "ui-state-highlight" )
- .find( "p" )
- .html( "Tagged with " + $(this).attr('id') );
+ .find( "div span" )
+ .html( "Tagged" );
}
});
}
@@ -34,8 +42,8 @@
$( "#progressbar" ).progressbar({
value:<%= (@tagged_count.to_f/@movies_count.to_f)*100 %>
});
- $( "button" ).button();
- $( "button").click(function() {
+ $( "#create_tag_button" ).button();
+ $( "#create_tag_button").click(function() {
$("#col4").prepend(
'<div class="droppable ui-widget-header" id="'+$( "#tag" ).attr('value')+'">'+
'<p>'+$( "#tag" ).attr('value')+'</p>'+
@@ -53,12 +61,12 @@
type: "POST",
url: "tagging_room/tag",
data: d,
- context: $(this),
+ context: $(this),
success: function(msg){
$( this )
.addClass( "ui-state-highlight" )
- .find( "p" )
- .html( "Tagged with " + $(this).attr('id') );
+ .find( "div span" )
+ .html( "Tagged" );
}
});
}
@@ -75,37 +83,23 @@
<div class="g480 inside" style="text-align:center"><%= @tagged_count.to_s + " / " + @movies_count.to_s %></div>
<div class="clear"></div>
<div class="inside g80" id="col1">
- <% @tags[0..10].each do |t| %>
- <div class="droppable ui-widget-header" id="<%=t.name%>" style="width:50px">
- <p><%= t.name %></p>
- </div>
- <div class="clear"></div>
- <% end %>
-
+ <%= tag_boxes_for(@tags[0..10]) %>
</div>
<div class="g80" id="col2">
- <% unless @tags.size < 11 %>
- <% @tags[11..21].each do |t| %>
- <div class="droppable ui-widget-header" id="<%=t.name%>" style="width:50px">
- <p><%= t.name %></p>
- </div>
- <div class="clear"></div>
- <% end %>
- <% else %>
- <div><br></div>
- <% end %>
-
+ <%= tag_boxes_for(@tags[11..22]) %>
</div>
<div class="g640">
<div class="ui-widget-header inside g320">
<input id="tag" size="15">
- <button>Create tag</button>
- </div>
+ <button id="create_tag_button">Create tag</button>
+ </div>
<div class="inside g320">
- <button><span style="float:right"><%= link_to "I'm done, Next!", tagging_room_path %></span></button>
- <span style="float:left;margin-left:30px;margin-right:30px"><%= link_to image_tag("vlc.png"), system_file_path(@movie.system_files.first), :remote => true %></span>
+ <span style="float:right"><%= link_to "I'm done, Next!", tagging_room_path %></span>
+ <span style="float:left;margin-left:30px;margin-right:30px">
+ <%= link_to image_tag("vlc.png"), system_file_path(@movie.system_files.first), :remote => true %>
+ </span>
</div>
<div class="clear">&nbsp;</div>
<div id="<%= @movie.id %>" class="draggable ui-widget-content" >
@@ -120,25 +114,9 @@
</div>
</div>
<div class="g80" id="col3">
- <% unless @tags.size < 22 %>
- <% @tags[22..32].each do |t| %>
- <div class="droppable ui-widget-header" id="<%=t.name%>">
- <p><%= t.name %></p>
- </div>
- <div class="clear">&nbsp;</div>
- <% end %>
- <% end %>
-
+ <%= tag_boxes_for(@tags[22..32]) %>
</div>
<div class="g80" id="col4">
- <% unless @tags.size < 33 %>
- <% @tags[33..44].each do |t| %>
- <div class="droppable ui-widget-header" id="<%=t.name%>">
- <p><%= t.name %></p>
- </div>
- <div class="clear">&nbsp;</div>
- <% end %>
- <% end %>
-
+ <%= tag_boxes_for(@tags[33..43]) %>
</div>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.