dcell 0.9.0 → 0.10.0

data/.travis.yml

@@ -5,6 +5,9 @@ rvm:
   - jruby-19mode
   - jruby-head
 
-# Rubies I would like to support, but they deadlock
+# https://github.com/rubinius/rubinius/issues/1628
 #  - rbx-18mode
 #  - rbx-19mode
+
+notifications:
+  irc: "irc.freenode.org#celluloid"

data/CHANGES.md

@@ -1,3 +1,14 @@
+0.10.0
+------
+* DCell::Explorer provides a web UI with Reel
+* Info service at DCell::Node#[:info]
+* Distributed gossip protocol, now default adapter
+* Support for marshaling Celluloid::Futures
+* Cassandra registry
+* Initial DCell::NodeManager
+* celluloid-zmq split out into a separate gem
+* Use Celluloid.uuid for mailbox and call IDs
+
 0.9.0
 -----
 * Use new Celluloid::ZMQ APIs

data/Gemfile

@@ -1,8 +1,11 @@
 source "http://rubygems.org"
 
-gem 'celluloid',     :git  => 'git://github.com/tarcieri/celluloid'
-gem 'celluloid-io',  :git  => 'git://github.com/tarcieri/celluloid-io'
-gem 'celluloid-zmq', :path => 'celluloid-zmq'
+gem 'celluloid',     :git => 'git://github.com/celluloid/celluloid'
+gem 'celluloid-io',  :git => 'git://github.com/celluloid/celluloid-io'
+gem 'celluloid-zmq', :git => 'git://github.com/celluloid/celluloid-zmq'
+#gem 'reel',          :git => 'git://github.com/celluloid/reel'
+
+gem 'jruby-openssl', :platform => :jruby
 
 # Specify your gem's dependencies in dcell.gemspec
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Tony Arcieri
+Copyright (c) 2012 Tony Arcieri
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,7 @@
-![DCell](https://github.com/tarcieri/dcell/raw/master/logo.png)
+![DCell](https://github.com/celluloid/dcell/raw/master/logo.png)
 =====
-[![Build Status](http://travis-ci.org/tarcieri/dcell.png)](http://travis-ci.org/tarcieri/dcell)
+[![Build Status](http://travis-ci.org/celluloid/dcell.png)](http://travis-ci.org/celluloid/dcell)
+[![Dependency Status](https://gemnasium.com/celluloid/dcell.png)](https://gemnasium.com/celluloid/dcell)
 
 > "Objects can message objects transparently that live on other machines
 > over the network, and you don't have to worry about the networking gunk,
@@ -17,15 +18,28 @@ and register several available services on a given node, obtain handles to
 them, and easily pass these handles around the network just like any other
 objects.
 
-DCell is a distributed extension to Celluloid, which provides concurrent
-objects for Ruby with many of the features of Erlang, such as the ability
-to supervise objects and restart them when they crash, and also link to
+DCell is a distributed extension to [Celluloid][celluloid], which provides
+concurrent objects for Ruby with many of the features of Erlang, such as the
+ability to supervise objects and restart them when they crash, and also link to
 other objects and receive event notifications of when they crash. This makes
 it easier to build robust, fault-tolerant distributed systems.
 
-You can read more about Celluloid at: http://celluloid.github.com
+DCell uses the [0MQ][zeromq] messaging protocol which provides a robust,
+fault-tolerant brokerless transport for asynchronous messages sent between
+nodes. DCell is built on top of the [Celluloid::ZMQ][celluloid-zmq] library,
+which provides a Celluloid-oriented wrapper around the underlying
+[ffi-rzmq][ffi-rzmq] library.
 
-Like DCell? [Join the Celluloid Google Group](http://groups.google.com/group/celluloid-ruby)
+[Please see the DCell Wiki](https://github.com/celluloid/dcell/wiki)
+for more detailed documentation and usage notes.
+
+Like DCell? [Join the Celluloid Google Group][googlegroup]
+
+[celluloid]: http://celluloid.io/
+[zeromq]: http://www.zeromq.org/
+[celluloid-zmq]: https://github.com/celluloid/celluloid-zmq
+[ffi-rzmq]: https://github.com/chuckremes/ffi-rzmq
+[googlegroup]: http://groups.google.com/group/celluloid-ruby
 
 ### Is It Good?
 
@@ -38,245 +52,15 @@ Not entirely, but eager early adopters are welcome!
 Supported Platforms
 -------------------
 
-DCell works on Ruby 1.9.2/1.9.3, JRuby 1.6 (in 1.9 mode), JRuby 1.7, and Rubinius 2.0.
-
-To use JRuby 1.6 in 1.9 mode, you'll need to pass the "--1.9" command line
-option to the JRuby executable, or set the "JRUBY_OPTS=--1.9" environment
-variable:
-
-    export JRUBY_OPTS=--1.9
-
-(Note: I'd recommend putting the above in your .bashrc/.zshrc/etc in
-general. 1.9 is the future, time to embrace it)
-
-To use JRuby 1.7 in 1.9 mode...just use it :)
-
-Celluloid works on Rubinius in either 1.8 or 1.9 mode.
-
-All components, including the 0MQ bindings, Redis, and Zookeeper adapters
-are all certified to work on the above platforms. The 0MQ binding is FFI.
-The Redis adapter is pure Ruby. The Zookeeper adapter uses an MRI-style
-native extension but also supplies a pure-Java backend for JRuby.
-
-Prerequisites
--------------
-
-DCell requires 0MQ. On OS X, this is available through Homebrew by running:
-
-    brew install zeromq
-
-DCell keeps the state of all connected nodes and global configuration data
-in a service it calls the "registry". There are presently two supported
-registry services:
-
-* Redis (Fast and Loose): Redis is a persistent data structures server.
-  It's simple and easy to use for development and prototyping, but lacks a
-  good distribution story.
-
-* Zookeeper (Serious Business): Zookeeper is a high-performance coordination
-  service for distributed applications. It exposes common services such as
-  naming, configuration management, synchronization, and group management.
-  Unfortunately, it has slightly more annoying client-side dependencies and is
-  more difficult to deploy than Redis.
-
-You may pick either one of these services to use as DCell's registry. The
-default is Redis.
-
-To install a local copy of Redis on OS X with Homebrew, run:
-
-    brew install redis
-
-To install a local copy Zookeeper for testing purposes, run:
-
-    rake zookeeper:install
-
-and to start it run:
-
-    rake zookeeper:start
-
-Configuration
--------------
-
-The simplest way to configure and start DCell is with the following:
-
-```ruby
-require 'dcell'
-
-DCell.start
-```
-
-This configures DCell with all the default options, however there are many
-options you can override, e.g.:
-
-```ruby
-DCell.start :id => "node42", :addr => "tcp://127.0.0.1:2042"
-```
-
-DCell identifies each node with a unique node ID, that defaults to your
-hostname. Each node needs to be reachable over 0MQ, and the addr option
-specifies the 0MQ address where the host can be reached. When giving a tcp://
-URL, you *must* specify an IP address and not a hostname.
-
-To join a cluster you'll need to provide the location of the registry server.
-This can be done through the "registry" configuration key:
-
-```ruby
-DCell.start :id => "node24", :addr => "tcp://127.0.0.1:2042",
-  :registry => {
-    :adapter => 'redis',
-    :host    => 'mycluster.example.org',
-    :port    => 6379
-  }
-```
-
-When configuring DCell to use Redis, use the following options:
-
-- **adapter**: "redis" (*optional, alternatively "zk"*)
-- **host**: hostname or IP address of the Redis server (*optional, default localhost*)
-- **port**: port of the Redis server (*optional, default 6379*)
-- **password**: password to the Redis server (*optional*)
-
-Usage
------
-
-You've now configured a single node in a DCell cluster. You can obtain the
-DCell::Node object representing the local node by calling DCell.me:
-
-```ruby
->> DCell.start
- => #<Celluloid::Supervisor(DCell::Application):0xed6>
->> DCell.me
- => #<DCell::Node[cryptosphere.local] @addr="tcp://127.0.0.1:7777">
-```
-
-DCell::Node objects are the entry point for locating actors on the system.
-DCell.me returns the local node. Other nodes can be obtained by their
-node IDs:
-
-```ruby
->> node = DCell::Node["cryptosphere.local"]
- => #<DCell::Node[cryptosphere.local] @addr="tcp://127.0.0.1:7777">
-```
-
-DCell::Node.all returns all connected nodes in the cluster:
-
-```ruby
->> DCell::Node.all
- => [#<DCell::Node[test_node] @addr="tcp://127.0.0.1:21264">, #<DCell::Node[cryptosphere.local] @addr="tcp://127.0.0.1:7777">]
-```
-
-DCell::Node is a Ruby Enumerable. You can iterate across all nodes with
-DCell::Node.each.
-
-Once you've obtained a node, you can look up services it exports and call them
-just like you'd invoke methods on any other Ruby object:
-
-```ruby
->> node = DCell::Node["cryptosphere.local"]
- => #<DCell::Node[cryptosphere.local] @addr="tcp://127.0.0.1:7777">
->> time_server = node[:time_server]
- => #<Celluloid::Actor(TimeServer:0xee8)>
->> time_server.time
- => "The time is: 2011-11-10 20:23:47 -0800"
-```
-
-You can also find all available services on a node with DCell::Node#all:
-
-```ruby
->> node = DCell::Node["cryptosphere.local"]
- => #<DCell::Node[cryptosphere.local] @addr="tcp://127.0.0.1:7777">
->> node.all
- => [:time_server]
-```
-
-Registering Actors
-------------------
-
-All services exposed by DCell must take the form of registered Celluloid actors.
-What follows is an extremely brief introduction to creating and registering
-actors, but for more information, you should definitely [read the Celluloid
-documentation](http://celluloid.github.com).
-
-DCell exposes all Celluloid actors you've registered directly onto the network.
-The best way to register an actor is by supervising it. Below is an example of
-how to create an actor and register it on the network:
-
-```ruby
-class TimeServer
-  include Celluloid
-
-  def time
-    "The time is: #{Time.now}"
-  end
-end
-```
-
-Now that we've defined the TimeServer, we're going to supervise it and register
-it in the local registry:
-
-```ruby
->> TimeServer.supervise_as :time_server
- => #<Celluloid::Supervisor(TimeServer):0xee4>
-```
-
-Supervising actors means that if they crash, they're automatically restarted
-and registered under the same name. We can access registered actors by using
-Celluloid::Actor#[]:
-
-```ruby
->> Celluloid::Actor[:time_server]
- => #<Celluloid::Actor(TimeServer:0xee8)>
->> Celluloid::Actor[:time_server].time
- => "The time is: 2011-11-10 20:17:48 -0800"
-```
-
-This same actor is now available using the DCell::Node#[] syntax:
-
-```ruby
->> node = DCell.me
- => #<DCell::Node[cryptosphere.local] @addr="tcp://127.0.0.1:1870">
->> node[:time_server].time
- => "The time is: 2011-11-10 20:28:27 -0800"
-```
-
-Globals
--------
-
-DCell provides a registry global for storing configuration data and actors you
-wish to publish globally to the entire cluster:
-
-```ruby
->> actor = Celluloid::Actor[:dcell_server]
- => #<Celluloid::Actor(DCell::Server:0xf2e) @addr="tcp://127.0.0.1:7777">
->> DCell::Global[:sweet_server] = actor
- => #<Celluloid::Actor(DCell::Server:0xf2e) @addr="tcp://127.0.0.1:7777">
->> DCell::Global[:sweet_server]
- => #<Celluloid::Actor(DCell::Server:0xf2e) @addr="tcp://127.0.0.1:7777">
-```
-
-What about DRb?
----------------
-
-Ruby already has a distributed object system as part of its standard library:
-DRb, which stands for Distributed Ruby. What's wrong with DRb? Why do we need
-a new system? DRb has one major drawback: it's inherently synchronous. The
-only thing you can do to an object is to make a method call, which sends a
-remote object a message, executes the method, and returns a response.
+DCell works on Ruby 1.9.3, JRuby 1.6, and Rubinius 2.0.
 
-Under the covers, DCell uses an asynchronous message protocol. As noted in the
-last section, asynchronous messaging allows many more modes of messaging than
-the standard reqeust/response pattern afforded by DRb. DCell also supports the
-Erlang-style approach to fault-tolerance, advocating that actors shouldn't handle
-errors but should crash and restart in a clean state. Linking to actors on remote
-nodes can be used to detect these sorts of errors and have dependent actors
-restart in a clean state.
+DCell requires Ruby 1.9 mode on all interpreters. This works out of the
+box on MRI/YARV, and requires the following flags elsewhere:
 
-By far the biggest difference between DCell and DRb is how the underlying
-Celluloid framework has you think about the problem. Celluloid provides a useful
-concurrent in-process messaging system in its own right without the distributed
-components.
+* JRuby: --1.9 command line option, or JRUBY_OPTS=--1.9 environment variable
+* rbx: -X19 command line option
 
 Copyright
 ---------
 
-Copyright (c) 2011 Tony Arcieri. See LICENSE.txt for further details.
+Copyright (c) 2012 Tony Arcieri. See LICENSE.txt for further details.

data/benchmarks/receiver.rb

@@ -29,8 +29,8 @@ class Progenator
   end
 end
 
-class BenchmarkApplication < Celluloid::Application
-  supervise DCell::Application
+class BenchmarkApplication < Celluloid::Group
+  supervise DCell::Group
   supervise Progenator, :as => :progenator
 end
 

data/dcell.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.version     = DCell::VERSION
   gem.authors     = ["Tony Arcieri"]
   gem.email       = ["tony.arcieri@gmail.com"]
-  gem.homepage    = "http://github.com/tarcieri/dcell"
+  gem.homepage    = "http://github.com/celluloid/dcell"
   gem.summary     = "An asynchronous distributed object framework based on Celluloid"
   gem.description = "DCell is an distributed object framework based on Celluloid built on 0MQ and Zookeeper"
 
@@ -16,13 +16,13 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "celluloid",     "~> 0.9.0"
-  gem.add_dependency "celluloid-zmq", "~> 0.9.0"
-  gem.add_dependency "redis"
-  gem.add_dependency "redis-namespace"
-  gem.add_dependency "moneta"
+  gem.add_runtime_dependency "celluloid",     "~> 0.10.0"
+  gem.add_runtime_dependency "celluloid-zmq", "~> 0.10.0"
+  gem.add_runtime_dependency "reel", "~> 0.0.1"
+  gem.add_runtime_dependency "redis"
+  gem.add_runtime_dependency "redis-namespace"
+  gem.add_runtime_dependency "moneta"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
-  #gem.add_development_dependency "zk"
 end

data/explorer/css/bootstrap-responsive.css

@@ -0,0 +1,686 @@
+/*!
+ * Bootstrap Responsive v2.0.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+.clearfix {
+  *zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+}
+.clearfix:after {
+  clear: both;
+}
+.hide-text {
+  overflow: hidden;
+  text-indent: 100%;
+  white-space: nowrap;
+}
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 28px;
+  /* Make inputs at least the height of their button counterpart */
+
+  /* Makes inputs behave like true block-level elements */
+
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+.visible-phone {
+  display: none;
+}
+.visible-tablet {
+  display: none;
+}
+.visible-desktop {
+  display: block;
+}
+.hidden-phone {
+  display: block;
+}
+.hidden-tablet {
+  display: block;
+}
+.hidden-desktop {
+  display: none;
+}
+@media (max-width: 767px) {
+  .visible-phone {
+    display: block;
+  }
+  .hidden-phone {
+    display: none;
+  }
+  .hidden-desktop {
+    display: block;
+  }
+  .visible-desktop {
+    display: none;
+  }
+}
+@media (min-width: 768px) and (max-width: 979px) {
+  .visible-tablet {
+    display: block;
+  }
+  .hidden-tablet {
+    display: none;
+  }
+  .hidden-desktop {
+    display: block;
+  }
+  .visible-desktop {
+    display: none;
+  }
+}
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 18px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+  .modal {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    right: 10px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade.in {
+    top: auto;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+@media (max-width: 767px) {
+  body {
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+  .navbar-fixed-top {
+    margin-left: -20px;
+    margin-right: -20px;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row {
+    margin-left: 0;
+  }
+  .row > [class*="span"],
+  .row-fluid > [class*="span"] {
+    float: none;
+    display: block;
+    width: auto;
+    margin: 0;
+  }
+  .thumbnails [class*="span"] {
+    width: auto;
+  }
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 28px;
+    /* Make inputs at least the height of their button counterpart */
+
+    /* Makes inputs behave like true block-level elements */
+
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    width: auto;
+  }
+}
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid > [class*="span"] {
+    float: left;
+    margin-left: 2.762430939%;
+  }
+  .row-fluid > [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid > .span12 {
+    width: 99.999999993%;
+  }
+  .row-fluid > .span11 {
+    width: 91.436464082%;
+  }
+  .row-fluid > .span10 {
+    width: 82.87292817100001%;
+  }
+  .row-fluid > .span9 {
+    width: 74.30939226%;
+  }
+  .row-fluid > .span8 {
+    width: 65.74585634900001%;
+  }
+  .row-fluid > .span7 {
+    width: 57.182320438000005%;
+  }
+  .row-fluid > .span6 {
+    width: 48.618784527%;
+  }
+  .row-fluid > .span5 {
+    width: 40.055248616%;
+  }
+  .row-fluid > .span4 {
+    width: 31.491712705%;
+  }
+  .row-fluid > .span3 {
+    width: 22.928176794%;
+  }
+  .row-fluid > .span2 {
+    width: 14.364640883%;
+  }
+  .row-fluid > .span1 {
+    width: 5.801104972%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  input.span12, textarea.span12, .uneditable-input.span12 {
+    width: 714px;
+  }
+  input.span11, textarea.span11, .uneditable-input.span11 {
+    width: 652px;
+  }
+  input.span10, textarea.span10, .uneditable-input.span10 {
+    width: 590px;
+  }
+  input.span9, textarea.span9, .uneditable-input.span9 {
+    width: 528px;
+  }
+  input.span8, textarea.span8, .uneditable-input.span8 {
+    width: 466px;
+  }
+  input.span7, textarea.span7, .uneditable-input.span7 {
+    width: 404px;
+  }
+  input.span6, textarea.span6, .uneditable-input.span6 {
+    width: 342px;
+  }
+  input.span5, textarea.span5, .uneditable-input.span5 {
+    width: 280px;
+  }
+  input.span4, textarea.span4, .uneditable-input.span4 {
+    width: 218px;
+  }
+  input.span3, textarea.span3, .uneditable-input.span3 {
+    width: 156px;
+  }
+  input.span2, textarea.span2, .uneditable-input.span2 {
+    width: 94px;
+  }
+  input.span1, textarea.span1, .uneditable-input.span1 {
+    width: 32px;
+  }
+}
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top {
+    position: static;
+    margin-bottom: 18px;
+  }
+  .navbar-fixed-top .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .navbar .nav-collapse {
+    clear: left;
+  }
+  .navbar .nav {
+    float: none;
+    margin: 0 0 9px;
+  }
+  .navbar .nav > li {
+    float: none;
+  }
+  .navbar .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .navbar .nav > .divider-vertical {
+    display: none;
+  }
+  .navbar .nav .nav-header {
+    color: #999999;
+    text-shadow: none;
+  }
+  .navbar .nav > li > a,
+  .navbar .dropdown-menu a {
+    padding: 6px 15px;
+    font-weight: bold;
+    color: #999999;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+  }
+  .navbar .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .navbar .nav > li > a:hover,
+  .navbar .dropdown-menu a:hover {
+    background-color: #222222;
+  }
+  .navbar .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    float: none;
+    display: block;
+    max-width: none;
+    margin: 0 15px;
+    padding: 0;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+    border-radius: 0;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+  }
+  .navbar .dropdown-menu:before,
+  .navbar .dropdown-menu:after {
+    display: none;
+  }
+  .navbar .dropdown-menu .divider {
+    display: none;
+  }
+  .navbar-form,
+  .navbar-search {
+    float: none;
+    padding: 9px 15px;
+    margin: 9px 0;
+    border-top: 1px solid #222222;
+    border-bottom: 1px solid #222222;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .navbar-static .navbar-inner {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+  .btn-navbar {
+    display: block;
+  }
+  .nav-collapse {
+    overflow: hidden;
+    height: 0;
+  }
+}
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid > [class*="span"] {
+    float: left;
+    margin-left: 2.564102564%;
+  }
+  .row-fluid > [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid > .span12 {
+    width: 100%;
+  }
+  .row-fluid > .span11 {
+    width: 91.45299145300001%;
+  }
+  .row-fluid > .span10 {
+    width: 82.905982906%;
+  }
+  .row-fluid > .span9 {
+    width: 74.358974359%;
+  }
+  .row-fluid > .span8 {
+    width: 65.81196581200001%;
+  }
+  .row-fluid > .span7 {
+    width: 57.264957265%;
+  }
+  .row-fluid > .span6 {
+    width: 48.717948718%;
+  }
+  .row-fluid > .span5 {
+    width: 40.170940171000005%;
+  }
+  .row-fluid > .span4 {
+    width: 31.623931624%;
+  }
+  .row-fluid > .span3 {
+    width: 23.076923077%;
+  }
+  .row-fluid > .span2 {
+    width: 14.529914530000001%;
+  }
+  .row-fluid > .span1 {
+    width: 5.982905983%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  input.span12, textarea.span12, .uneditable-input.span12 {
+    width: 1160px;
+  }
+  input.span11, textarea.span11, .uneditable-input.span11 {
+    width: 1060px;
+  }
+  input.span10, textarea.span10, .uneditable-input.span10 {
+    width: 960px;
+  }
+  input.span9, textarea.span9, .uneditable-input.span9 {
+    width: 860px;
+  }
+  input.span8, textarea.span8, .uneditable-input.span8 {
+    width: 760px;
+  }
+  input.span7, textarea.span7, .uneditable-input.span7 {
+    width: 660px;
+  }
+  input.span6, textarea.span6, .uneditable-input.span6 {
+    width: 560px;
+  }
+  input.span5, textarea.span5, .uneditable-input.span5 {
+    width: 460px;
+  }
+  input.span4, textarea.span4, .uneditable-input.span4 {
+    width: 360px;
+  }
+  input.span3, textarea.span3, .uneditable-input.span3 {
+    width: 260px;
+  }
+  input.span2, textarea.span2, .uneditable-input.span2 {
+    width: 160px;
+  }
+  input.span1, textarea.span1, .uneditable-input.span1 {
+    width: 60px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+}