From 09a6ff6d2c5e3f13287a43f45d0b6ae6e820340b Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 4 Nov 2011 15:41:13 +0700 Subject: [PATCH 001/519] Initial commit --- documentation/website/.gitignore | 1 + documentation/website/Makefile | 48 +++++ documentation/website/README.rst | 54 ++++++ documentation/website/make.bat | 63 +++++++ .../website/source/_static/favicon.ico | Bin 0 -> 1406 bytes .../source/_static/images/dylan-8caae6.png | Bin 0 -> 9107 bytes .../website/source/_templates/placeholder.txt | 0 .../website/source/about/examples/classes.rst | 35 ++++ .../about/examples/everything_value.rst | 39 ++++ .../about/examples/generic_functions.rst | 62 +++++++ .../examples/getters_setters_functions.rst | 66 +++++++ .../source/about/examples/hello_world.rst | 41 +++++ .../about/examples/keyword_arguments.rst | 46 +++++ .../source/about/examples/limited_types.rst | 54 ++++++ .../website/source/about/examples/macros.rst | 38 ++++ .../about/examples/multiple_return_values.rst | 96 ++++++++++ documentation/website/source/about/index.rst | 20 +++ .../website/source/community/index.rst | 59 ++++++ documentation/website/source/conf.py | 170 ++++++++++++++++++ .../website/source/documentation/index.rst | 3 + .../website/source/download/index.rst | 31 ++++ documentation/website/source/index.rst | 31 ++++ documentation/website/source/news/index.rst | 6 + .../website/source/news/recent.rst.inc | 16 ++ 24 files changed, 979 insertions(+) create mode 100644 documentation/website/.gitignore create mode 100644 documentation/website/Makefile create mode 100644 documentation/website/README.rst create mode 100644 documentation/website/make.bat create mode 100644 documentation/website/source/_static/favicon.ico create mode 100644 documentation/website/source/_static/images/dylan-8caae6.png create mode 100644 documentation/website/source/_templates/placeholder.txt create mode 100644 documentation/website/source/about/examples/classes.rst create mode 100644 documentation/website/source/about/examples/everything_value.rst create mode 100644 documentation/website/source/about/examples/generic_functions.rst create mode 100644 documentation/website/source/about/examples/getters_setters_functions.rst create mode 100644 documentation/website/source/about/examples/hello_world.rst create mode 100644 documentation/website/source/about/examples/keyword_arguments.rst create mode 100644 documentation/website/source/about/examples/limited_types.rst create mode 100644 documentation/website/source/about/examples/macros.rst create mode 100644 documentation/website/source/about/examples/multiple_return_values.rst create mode 100644 documentation/website/source/about/index.rst create mode 100644 documentation/website/source/community/index.rst create mode 100644 documentation/website/source/conf.py create mode 100644 documentation/website/source/documentation/index.rst create mode 100644 documentation/website/source/download/index.rst create mode 100644 documentation/website/source/index.rst create mode 100644 documentation/website/source/news/index.rst create mode 100644 documentation/website/source/news/recent.rst.inc diff --git a/documentation/website/.gitignore b/documentation/website/.gitignore new file mode 100644 index 0000000000..378eac25d3 --- /dev/null +++ b/documentation/website/.gitignore @@ -0,0 +1 @@ +build diff --git a/documentation/website/Makefile b/documentation/website/Makefile new file mode 100644 index 0000000000..0526e8eeb8 --- /dev/null +++ b/documentation/website/Makefile @@ -0,0 +1,48 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +BUILDDIR = build + +# Internal variables. +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) source +# the i18n builder cannot share the environment and doctrees with the others +I18NSPHINXOPTS = $(SPHINXOPTS) source + +.PHONY: help clean html gettext changes linkcheck + +all: html + +help: + @echo "Please use \`make ' where is one of" + @echo " html to make standalone HTML files" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + +clean: + -rm -rf $(BUILDDIR)/* + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +gettext: + $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale + @echo + @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + diff --git a/documentation/website/README.rst b/documentation/website/README.rst new file mode 100644 index 0000000000..f2b29e5365 --- /dev/null +++ b/documentation/website/README.rst @@ -0,0 +1,54 @@ +This is an early version of the new Open Dylan website. + +It is built using `Sphinx `_. All content is written using +ReStructured Text with Sphinx extensions. + +Preparation +=========== + +Before building this website, you will need a copy of Sphinx installed. +The easiest way to do this is to get it from the `Python Package Index +`_ or to use ``easy_install``:: + + easy_install -U Sphinx + +Building +======== + +Building the website is easy on a system with ``make``:: + + make + +If you are on Windows, there is a ``make.bat`` as well. It currently requires +that you run it with an argument:: + + make.bat html + +The generated site will be in ``build/html``. + +Link Validation +--------------- + +Sphinx also makes it easy to check that all of the links to external sites +are valid. You can run the link checker by:: + + make linkcheck + +Site Maintenance +================ + +New Binary Release +------------------ + +#. Update the appropriate info on the download page. +#. Add a recent news entry. (See below for notes on that.) + +New News Entry +-------------- + +#. Add it to ``source/news/recent.rst.inc`` +#. If there are too many entries in that file, move some + to ``source/news/index.rst``. +#. Confirm that the site's main page and news page both + look good / correct. + diff --git a/documentation/website/make.bat b/documentation/website/make.bat new file mode 100644 index 0000000000..ceaa3be2d5 --- /dev/null +++ b/documentation/website/make.bat @@ -0,0 +1,63 @@ +@ECHO OFF + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set BUILDDIR=build +set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source +set I18NSPHINXOPTS=%SPHINXOPTS% source + +if "%1" == "" goto help + +if "%1" == "help" ( + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. gettext to make PO message catalogs + echo. changes to make an overview over all changed/added/deprecated items + echo. linkcheck to check all external links for integrity + goto end +) + +if "%1" == "clean" ( + for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i + del /q /s %BUILDDIR%\* + goto end +) + +if "%1" == "html" ( + %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/html. + goto end +) + +if "%1" == "gettext" ( + %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The message catalogs are in %BUILDDIR%/locale. + goto end +) + +if "%1" == "changes" ( + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes + if errorlevel 1 exit /b 1 + echo. + echo.The overview file is in %BUILDDIR%/changes. + goto end +) + +if "%1" == "linkcheck" ( + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck + if errorlevel 1 exit /b 1 + echo. + echo.Link check complete; look for any errors in the above output ^ +or in %BUILDDIR%/linkcheck/output.txt. + goto end +) + +:end diff --git a/documentation/website/source/_static/favicon.ico b/documentation/website/source/_static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..47b927bb6462890978a667b5974602987b51baa2 GIT binary patch literal 1406 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 RU?%_o002ovPDHLkV1f`KxE=ri literal 0 HcmV?d00001 diff --git a/documentation/website/source/_templates/placeholder.txt b/documentation/website/source/_templates/placeholder.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/documentation/website/source/about/examples/classes.rst b/documentation/website/source/about/examples/classes.rst new file mode 100644 index 0000000000..06bd7af886 --- /dev/null +++ b/documentation/website/source/about/examples/classes.rst @@ -0,0 +1,35 @@ +*********************** +Classes & Instantiation +*********************** + +Dylan makes it easy to define classes. You don't normally need to +write constructors or accessor functions, which saves a lot of boring +typing. You can initialize slots (a.k.a. "fields", "member variables", +etc.) by providing a default value or expression in the slot spec and +the caller may override the value using keyword arguments. A small +percentage of classes still need "constructors", which can be defined +by overriding ``initialize``. + +.. code-block:: dylan + + define class () + slot serial-number :: = unique-serial-number(); + slot model-name :: , + required-init-keyword: model:; + slot has-sunroof? :: , + init-keyword: sunroof?:, + init-value: #f; + end class ; + + define variable *unique-serial-number* = 0; + + define function unique-serial-number() => (usn :: ) + let serial = *unique-serial-number*; + *unique-serial-number* := *unique-serial-number* + 1; + serial; + end function; + + define constant $blue-car = make(, model: "Viper"); + define constant $black-car = make(, model: "Town Car", sunroof?: #t); + define constant $red-car = make(, model: "F40", sunroof?: #f); + diff --git a/documentation/website/source/about/examples/everything_value.rst b/documentation/website/source/about/examples/everything_value.rst new file mode 100644 index 0000000000..2ac258b717 --- /dev/null +++ b/documentation/website/source/about/examples/everything_value.rst @@ -0,0 +1,39 @@ +********************* +Everything is a value +********************* + +Every Dylan statement or expression returns a value. Control +constructs and methods generally return the value of the last +expression in their body. + +``if`` returns a value so it may be used in return position: + +.. code-block:: dylan + + format-out("abs(x) = %d", if (x >= 0) x else -x end); + +Dylan methods return the value of the last expression in their body to +be evaluated. If there is no return value declaration for the generic +function then any number of values of type may be returned. +This function returns the string "foo": + +.. code-block:: dylan + + define method foo () + "foo" + end; + +Sometimes you write a function for which there is no useful return +value. In these cases it is sometimes useful (especially for external +APIs) to tell the compiler that no values are returned since it can +then give you warnings when callers expect a value. ``=> ()`` is the +way to say this: + +.. code-block:: dylan + + define method foo () => () + format-out("foo"); + end; + +See also, {{Parameter Lists}} and {{Code Examples}}. + diff --git a/documentation/website/source/about/examples/generic_functions.rst b/documentation/website/source/about/examples/generic_functions.rst new file mode 100644 index 0000000000..c828d818da --- /dev/null +++ b/documentation/website/source/about/examples/generic_functions.rst @@ -0,0 +1,62 @@ +***************** +Generic Functions +***************** + +Methods in Dylan aren't tied directly to a particular class like they are in many other languages. +Instead a method belongs to a generic function (GF). Which method actually gets called is +decided by the types of all of the required arguments passed to the GF. Consider the built-in +{{drm: add}} generic function: + +.. code-block:: dylan + + define open generic add (seq :: , new-element) => (new-seq :: ); + +This says that any method defined on {{drm: add}} must accept two required arguments. +The first argument must be a {{drm: }} and the second can be anything, since +no type was declared for it. The methods must return a single value which is a {{drm: }}. + +Also: + +#. The methods on this GF may not accept any optional (keyword) arguments. +#. The "open" adjective tells the compiler that other libraries may add methods to + this GF. + +If you try to define a method on ``add`` that breaks any of the above rules, you'll +get a warning from the compiler. + +Note that the ``define generic`` form doesn't contain any actual code; it merely +defines an API to which all other methods with the same name must conform. To +define a very general method on ``add`` we write this: + +.. code-block:: dylan + + define method add (seq :: , new-element) => (new-seq :: ) + concatenate-as(type-for-copy(seq), list(new-element), seq) + end; + +Now, let's say you decide it would be good to have a method specifically for +```` because you think it will be more efficient than the default implementation, +even though the default will do the right thing. You could write this: + +.. code-block:: dylan + + define method add (v :: , new-element) => (new-v :: ) + let new-vector = make(, size: v.size + 1); + map-into!(new-vector, identity, v); + new-vector[v.size] := new-element; + new-vector + end; + +(*Note that the above is just an example and isn't intended to be super-efficient.*) + +Now, if you use ``add(#[1, 2, 3], 4)`` the method for ```` will be called +because the first argument is a ````, and if you use ``add(#(1, 2, 3), 4)`` +then the first method will be called because the first argument is a ````, +which is a ```` but is not a ````. + +Very often, the compiler can figure out which method to call and so no run-time +overhead for dispatch is incurred in those cases. (The {{Open Dylan}} IDE has a +tool to show whether method dispatch was optimized.) + +Note that the second method above has a more specific return type. This +can aid in compiler optimization also. diff --git a/documentation/website/source/about/examples/getters_setters_functions.rst b/documentation/website/source/about/examples/getters_setters_functions.rst new file mode 100644 index 0000000000..033679c8ad --- /dev/null +++ b/documentation/website/source/about/examples/getters_setters_functions.rst @@ -0,0 +1,66 @@ +******************************* +Getters & Setters are functions +******************************* + +Many object-oriented languages encourage you to define a get_foo and +set_foo function for each member variable foo. These allow you to +control access to the variables and provide for future extensibility. +For example, set_foo could be modified to keep a table of values of foo. + +Dylan provides for this extensibility without having to write the +accessor functions up front. Consider a simple Dylan class: + +.. code-block:: dylan + + define class () + slot driver, required-init-keyword: driver:; + end; + +This creates two functions, driver and driver-setter. (You can prevent +driver-setter from being defined by using ``constant slot driver ...`` instead.) +Under normal circumstances, these two functions will be inlined and optimized +into direct accesses. + +Dylan provides some handy syntactic sugar to make these functions look +like members of a C structure: + +.. code-block:: dylan + + let car = make(, driver: "Frank"); + + // These two expressions return the same value. + car.driver; + driver(car); + + // These three statements perform the same assignment. + car.driver := "Sally"; + driver(car) := "Sally"; + driver-setter("Sally", car); + +If you later discover that you can't allow direct access to the driver +slot, you can rename the slot and create two explicit functions named +driver and driver-setter to replace it. The following example +maintains a hash table mapping drivers to their cars: + +.. code-block:: dylan + + define constant *driver-to-car-map* = make(); + + define class () + slot %driver, required-init-keyword: driver:; + end; + + define method initialize + (vehicle :: , #key, #all-keys) + *driver-to-car-map*[vehicle.%driver] := vehicle; + end; + + // The name "driver" would be exported as the public API. + define constant driver = %driver; + + define method driver-setter + (driver, vehicle :: ) => (value :: ) + *driver-to-car-map*[driver] := vehicle; + vehicle.%driver := driver; + end; + diff --git a/documentation/website/source/about/examples/hello_world.rst b/documentation/website/source/about/examples/hello_world.rst new file mode 100644 index 0000000000..07d7aebd84 --- /dev/null +++ b/documentation/website/source/about/examples/hello_world.rst @@ -0,0 +1,41 @@ +************* +Hello, World! +************* + +The canonical "Hello World" program in Dylan. + +File library.dylan: + +.. code-block::dylan + + Module: dylan-user + + define library hello + use io, import: { format-out }; + end; + + define module hello + use format-out; + end; + +File hello.dylan: + +.. code-block::dylan + + Module: hello + + format-out("Hello!\n"); + + +**How it works:** + +1. Every Dylan program defines a library and at least one module in + that library, and the simple Hello World program is no exception. + +#. Every source file must have a "Module" header to say which module + its definitions should be in. The library is defined in the pre-existing + "dylan-user" module. + +#. The top level expressions in each source file are executed in order + when the library is loaded, so there is no need for a "main" method + here. diff --git a/documentation/website/source/about/examples/keyword_arguments.rst b/documentation/website/source/about/examples/keyword_arguments.rst new file mode 100644 index 0000000000..ba29c13465 --- /dev/null +++ b/documentation/website/source/about/examples/keyword_arguments.rst @@ -0,0 +1,46 @@ +***************** +Keyword Arguments +***************** + +Keyword arguments are optional arguments that are passed by name. + +Keyword arguments do not take part in method dispatch. That is, they have no +role in determining which method of a generic function is actually called. + +Keyword arguments in method definitions must match the rules spelled out in the +generic function. + +Keyword arguments can be useful when you need to add occasionally-used +parameters to existing functions, similar to the way you can use default +parameter values in languages like C++. + +.. code-block:: dylan + + define function describe-list + (my-list :: , #key verbose?) => () + format(*standard-output*, "{a , size: %d", my-list.size); + if (verbose?) + format(*standard-output*, ", elements:"); + for (item in my-list) + format(*standard-output*, " %=", item); + end for; + end if; + format(*standard-output*, "}"); + end function; + +This method could be invoked in one of several ways. The first specifies no +keyword arguments, and exhibits the default behavior: + +.. code-block:: dylan + + describe-list(#(1, 2, 3)) + // prints "{a , size: 3}" + +Alternatively, the verbose? keyword argument could be used to indicate the +'verbose' behavior was desired: + +.. code-block:: dylan + + describe-list(#(5, 7, 3), verbose?: #t); + // prints "{a , size: 3, elements: 5 7 3}" + diff --git a/documentation/website/source/about/examples/limited_types.rst b/documentation/website/source/about/examples/limited_types.rst new file mode 100644 index 0000000000..5b01bed6e1 --- /dev/null +++ b/documentation/website/source/about/examples/limited_types.rst @@ -0,0 +1,54 @@ +************* +Limited Types +************* + +Limited types provide a way to define new, restricted types based on +existing types in a way that is different from subclassing. For example, +there is no built-in ```` type, but it could be defined as follows: + +.. code-block:: dylan + + define constant = limited(, min: 0, max: 255); + +Dylan compilers can often provide improved error checking and +optimizations for limited types. For example, this code could +generate a compile time error: + +.. code-block:: dylan + + define function add1 (b :: ) => (b2 :: ) b + 1 end; + add1(255); + +The set of limited types that are supported depends on the compiler. + +Collection classes can be limited to containing a specific type of +element: + +.. code-block:: dylan + + define constant = limited(, of: ); + +{{Open Dylan}} will optimize accesses into an ```` defined +as above. + +A Dylan compiler can avoid doing bounds checking or +type checking, and can use an efficient representation of the +vectors of floating point numbers for this code: + +.. code-block:: dylan + + define constant $audio-buffer-size = 2048; + define constant = + limited(, + of: , + size: $audio-buffer-size); + + define function mix-buffers + (input1 :: , input2 :: , + output :: ) + => () + for (i from 0 below $audio-buffer-size) + output[i] = 0.5 * input1[i] + 0.5 * input2[i]; + end; + end; + diff --git a/documentation/website/source/about/examples/macros.rst b/documentation/website/source/about/examples/macros.rst new file mode 100644 index 0000000000..7e3b6a7958 --- /dev/null +++ b/documentation/website/source/about/examples/macros.rst @@ -0,0 +1,38 @@ +****** +Macros +****** + +Dylan macros allow you to create new control constructs and other high-level forms. They can be used to automatically release resources, simplify class creation, or adapt Dylan for a specific problem domain. + +Let's say you find this code a little too verbose: + +.. code-block:: dylan + + if (test()) + f(x) + else + g(x) + end + +and you'd rather be able to write it this way: + +.. code-block:: dylan + + iff(test(), f(x), g(x)) + +You can't just write ``iff`` as a function because then both ``f(x)`` and ``g(x)`` will be evaluated. The following macro will do the trick: + +.. code-block:: dylan + + define macro iff + { iff(?test:expression, ?true:expression, ?false:expression) } + => { if (?test) ?true else ?false end } + end; + +See also: + +* `uncommon-dylan.dylan `_ has a version of the ``iff`` macro that also accepts the syntax ``iff(test(), f(x))``. Other macro examples in that file are ``inc!``, ``dec!``, and ``ignore-errors``. +* The `define table macro `_ in common-dylan is a simple example of making a new top-level "define" form. +* {{drm: Built-In_Macros_and_Special_Definitions, Built-in macros}} -- Many of the basic features of Dylan are implemented as macros. +* The {{drm: Macros}} chapter in the {{drm: Index, DRM}}. + diff --git a/documentation/website/source/about/examples/multiple_return_values.rst b/documentation/website/source/about/examples/multiple_return_values.rst new file mode 100644 index 0000000000..8a85fcf7bd --- /dev/null +++ b/documentation/website/source/about/examples/multiple_return_values.rst @@ -0,0 +1,96 @@ +********************** +Multiple Return Values +********************** + +Any Dylan expression may return multiple values and those values can +be captured by ``let``: + +.. code-block:: dylan + + let (integer, remainder) = round(3.2); + +``integer`` is bound to the ```` value 3 and ``remainder`` is +bound to the ```` value 0.2. + +---- + +Any function may return multiple values by calling the ``values`` +function in return position: + +.. code-block:: dylan + + define function parse-integer + (input :: , start :: ) + => (integer :: , _end :: ) + let index = start; + let integer = 0; + ...code that sets index and integer... + values(integer, index) + end; + +Call it like this: + +.. code-block:: dylan + + let (int, epos) = parse-integer(" 123 ", 1); + +or like this if you don't need the second value: + +.. code-block:: dylan + + let int = parse-integer(" 123 ", 1); + +Note that if you don't declare that the function returns multiple +values then the compiler may not generate code to return them. (One +hopes to receive a nice warning in that case.) Also, if you declare +multiple return values but don't return that many, #f will be returned +in place of the missing values. + +---- + +Sometimes you may have a ```` of known values and want to +bind them to variables temporarily: + +.. code-block:: dylan + + let point = #(100, 200, 300); + let (x, y, z) = apply(values, point); + +---- + +You may bind multiple trailing values to a single variable by using +``#rest``. In the following example ``more`` will be bound to ``#(3, +4, 5)``. + +.. code-block:: dylan + + let (first, second, #rest more) = values(1, 2, 3, 4, 5); + +---- + +Extra values are ignored and missing values are bound to #f: + +.. code-block:: dylan + + let (x, y) = values(1, 2, 3); + // x = 1, y = 2 + + + let (x, y, z) = values(1, 2); + // x = 1, y = 2, z = #f + +---- + +**Notes:** + +* Multiple value returns can be more efficient than returning a tuple, + as some other languages do, because the values can be returned on + the stack without the need to allocate memory for a tuple. +* There are implementation-defined limits on the number of values that + may be returned from a function. +* If you find yourself returning a large number of values (e.g. more + than 2 or 3) you may want to consider returning a single object with + slots instead. A rule of thumb is to think about whether it will be + common for the caller to only use the first value. But as always + there may be some cases where it's valid to ignore this rule. + diff --git a/documentation/website/source/about/index.rst b/documentation/website/source/about/index.rst new file mode 100644 index 0000000000..01aff5d46d --- /dev/null +++ b/documentation/website/source/about/index.rst @@ -0,0 +1,20 @@ +***** +About +***** + + +Examples: + +.. toctree:: + :maxdepth: 1 + + examples/hello_world + examples/everything_value + examples/classes + examples/generic_functions + examples/getters_setters_functions + examples/keyword_arguments + examples/limited_types + examples/macros + examples/multiple_return_values + diff --git a/documentation/website/source/community/index.rst b/documentation/website/source/community/index.rst new file mode 100644 index 0000000000..97071adadc --- /dev/null +++ b/documentation/website/source/community/index.rst @@ -0,0 +1,59 @@ +********* +Community +********* + +Here are some resources for keeping up with what's going on in the Dylan hacker +community... + +The #dylan IRC channel +====================== + +The #dylan channel on Freenode.net is where most of the day-to-day Dylan activity +takes place. Since Dylan hackers are spread around the world (New Zealand, +Germany, East and West coast USA, South America, ...) there's usually someone +online at all times of day. The channel is logged at +http://colabti.org/irclogger/irclogger_logs/dylan so you can always ask a +question and then check the logs for answers later. + +To discuss coding issues you can paste your code to the #dylan channel via +http://paste.lisp.org/new/dylan or any other pastebin site. See previous +pastes here: http://paste.lisp.org/list/dylan + +Newsgroup comp.lang.dylan +========================= + +This is the newsgroup dedicated to the discussion of Dylan. If you have a +question about the Dylan language or about something that will be of interest +to the Dylan community at large this is the preferred place for it. It is one +of the few ways that the world at large can see that there is activity in the +Dylan community and thus aids us in our quest for World Domination. +Announcements should be directed here, as well as to the announce@ list below. + +`comp.lang.dylan `_ can +be browsed and subscribed to using Google Groups if you do not have access +to a news server. + +Mailing Lists +============= + +There are several mailing lists. Which ones you join depends on your level of +interest and involvement: + +`hackers@lists.opendylan.org `_ (`Archives`__) + The public development list. This is a good place to start if you have + a question or would like to contribute. Lurkers are also welcome! + Very low traffic. + +`announce@lists.opendylan.org `_ (`Archives`__) + Find out about new releases! This is an extremely low-traffic list + reserved for announcements. If you subscribe to hackers@, you are on + this list. + +`chatter@lists.opendylan.org `_ (`Archives`__) + This list contains nothing but Git commit messages and Bugzilla output. + It's for developers who want to know everything that's going on. + + +__ https://lists.opendylan.org/pipermail/hackers/ +__ https://lists.opendylan.org/pipermail/announce/ +__ https://lists.opendylan.org/pipermail/chatter/ diff --git a/documentation/website/source/conf.py b/documentation/website/source/conf.py new file mode 100644 index 0000000000..0ee5387cf3 --- /dev/null +++ b/documentation/website/source/conf.py @@ -0,0 +1,170 @@ +# -*- coding: utf-8 -*- +# +# Open Dylan documentation build configuration file, created by +# sphinx-quickstart on Fri Nov 4 12:00:34 2011. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.insert(0, os.path.abspath('.')) + +# -- General configuration ----------------------------------------------------- + +# If your documentation needs a minimal Sphinx version, state it here. +#needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = ['sphinx.ext.intersphinx'] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'Open Dylan' +copyright = u'2011, Dylan Hackers' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '1.0' +# The full version, including alpha/beta/rc tags. +release = '1.0' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = [] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'agogo' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +html_title = 'Open Dylan' + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +html_favicon = '_static/favicon.ico' + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +html_domain_indices = False + +# If false, no index is generated. +html_use_index = False + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +#html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +#html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = None + +# Output file base name for HTML help builder. +htmlhelp_basename = 'OpenDylandoc' + +# Example configuration for intersphinx: refer to the Python standard library. +intersphinx_mapping = {'http://docs.python.org/': None} diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst new file mode 100644 index 0000000000..ae64e8db6c --- /dev/null +++ b/documentation/website/source/documentation/index.rst @@ -0,0 +1,3 @@ +************* +Documentation +************* diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst new file mode 100644 index 0000000000..b81a252b99 --- /dev/null +++ b/documentation/website/source/download/index.rst @@ -0,0 +1,31 @@ +******** +Download +******** + +Binary Releases +=============== + ++--------------------+--------------------+--------------------+-------------+ +| Platform | Version | Date Released | Revision ID | ++====================+====================+====================+=============+ +| Windows (32 bit) | ... | ... | ... | ++--------------------+--------------------+--------------------+-------------+ +| Mac OS X (Intel) | ... | ... | ... | ++--------------------+--------------------+--------------------+-------------+ +| Mac OS X (PowerPC) | ... | ... | ... | ++--------------------+--------------------+--------------------+-------------+ +| Linux (x86) | ... | ... | ... | ++--------------------+--------------------+--------------------+-------------+ +| Linux (x86-64) | ... | ... | ... | ++--------------------+--------------------+--------------------+-------------+ +| FreeBSD (x86) | ... | ... | ... | ++--------------------+--------------------+--------------------+-------------+ +| FreeBSD (x86-64) | ... | ... | ... | ++--------------------+--------------------+--------------------+-------------+ + +Source Code +=========== + +All of our source code is available in the `"dylan-lang" organization on GitHub +`_. + diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst new file mode 100644 index 0000000000..ed5a987958 --- /dev/null +++ b/documentation/website/source/index.rst @@ -0,0 +1,31 @@ +Welcome to Open Dylan! +====================== + + *Dylan is an advanced, object-oriented, dynamic language which + supports rapid program development. When needed, programs can be + optimized for more efficient execution by supplying more type + information to the compiler. Nearly all entities in Dylan + (including functions, classes, and basic data types such as + integers) are first class objects. Additionally Dylan supports + multiple inheritance, polymorphism, multiple dispatch, keyword + arguments, object introspection, macros, and many other advanced + features... --Peter Hinely* + +For more on the background and goals of the Dylan language, see the +excellent `Introduction to the Dylan Reference Manual `_. + +Recent News +=========== + +.. include:: news/recent.rst.inc + +.. toctree:: + :maxdepth: 1 + :hidden: + + About + News + Download + Documentation + Community + diff --git a/documentation/website/source/news/index.rst b/documentation/website/source/news/index.rst new file mode 100644 index 0000000000..9e7b88a60c --- /dev/null +++ b/documentation/website/source/news/index.rst @@ -0,0 +1,6 @@ +**** +News +**** + +.. include:: recent.rst.inc + diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc new file mode 100644 index 0000000000..25d8d14460 --- /dev/null +++ b/documentation/website/source/news/recent.rst.inc @@ -0,0 +1,16 @@ +2011-11-15: + + **New website!** + + As part of recharging Open Dylan development, we've re-done the + website and cleaned up a lot of the old, out-dated material here. + + If you're looking for some of the old material, it can be found + over at ``_. + +2011-11-15: + + **Open Dylan 2011.0.3 released.** + + Put something here. + From 8efac44a9c67db330520a4ac80e942ae10f931d1 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Fri, 4 Nov 2011 20:30:18 -0400 Subject: [PATCH 002/519] easy_install requires sudo --- documentation/website/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/README.rst b/documentation/website/README.rst index f2b29e5365..4fa7988f2e 100644 --- a/documentation/website/README.rst +++ b/documentation/website/README.rst @@ -10,7 +10,7 @@ Before building this website, you will need a copy of Sphinx installed. The easiest way to do this is to get it from the `Python Package Index `_ or to use ``easy_install``:: - easy_install -U Sphinx + sudo easy_install -U Sphinx Building ======== From 4415ae9d96c4d75d9d1ae42a940480c0b6df6ff4 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 9 Nov 2011 23:41:04 +0700 Subject: [PATCH 003/519] Work in progress on a new theme. --- .../source/_themes/opendylan/layout.html | 96 +++++ .../css/bootstrap/1.4.0/bootstrap.min.css | 356 ++++++++++++++++++ .../opendylan/static/js/html5shim/html5.js | 4 + .../source/_themes/opendylan/theme.conf | 2 + documentation/website/source/conf.py | 4 +- 5 files changed, 460 insertions(+), 2 deletions(-) create mode 100644 documentation/website/source/_themes/opendylan/layout.html create mode 100644 documentation/website/source/_themes/opendylan/static/css/bootstrap/1.4.0/bootstrap.min.css create mode 100644 documentation/website/source/_themes/opendylan/static/js/html5shim/html5.js create mode 100644 documentation/website/source/_themes/opendylan/theme.conf diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html new file mode 100644 index 0000000000..f5ca60668e --- /dev/null +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -0,0 +1,96 @@ +{# + opendylan/layout.html + ~~~~~~~~~~~~~~~~~ + + :copyright: Copyright 2011 by the Dylan Hackers. + :license: MIT. +#} +{% extends "basic/layout.html" %} +{% set css_files = css_files + ['_static/css/bootstrap/1.4.0/bootstrap.min.css'] %} + +{% set navigation_bar = [ + ('index', 'Home'), + ('about/index', 'About'), + ('news/index', 'News'), + ('documentation/index', 'Documentation'), + ('community/index', 'Community'), + ('download/index', 'Download'), +] -%} +{% set active_page = pagename|default('index') -%} + +{% block extrahead %} + + +{% endblock %} + +{% block header %} +
+
+
+ Open Dylan + +
+
+
+{% endblock %} + +{% block content %} +
+ {% if pagename == 'index' %} +
+

Open Dylan is ... wonderful and awesome.

+

We'll put a nice image over there on the right.

+ +
+ {% endif %} + {%- block document %} + {{ super() }} + {%- endblock %} +
+
+{% endblock %} + +{% block footer %} +
+
+ {%- if show_source and has_source and sourcename %} + {{ _('Show Source') }} + {%- endif %} +
+ +
+ {%- if show_copyright %} + {%- if hasdoc('copyright') %} + {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {%- else %} + {% trans copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {%- endif %} + {%- endif %} + {%- if last_updated %} + {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %} + {%- endif %} + {%- if show_sphinx %} + {% trans sphinx_version=sphinx_version|e %}Created using Sphinx {{ sphinx_version }}.{% endtrans %} + {%- endif %} +
+
+
+{% endblock %} + +{% block relbar1 %}{% endblock %} +{% block relbar2 %}{% endblock %} diff --git a/documentation/website/source/_themes/opendylan/static/css/bootstrap/1.4.0/bootstrap.min.css b/documentation/website/source/_themes/opendylan/static/css/bootstrap/1.4.0/bootstrap.min.css new file mode 100644 index 0000000000..c8f9e23197 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/css/bootstrap/1.4.0/bootstrap.min.css @@ -0,0 +1,356 @@ +html,body{margin:0;padding:0;} +h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;} +table{border-collapse:collapse;border-spacing:0;} +ol,ul{list-style:none;} +q:before,q:after,blockquote:before,blockquote:after{content:"";} +html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} +a:focus{outline:thin dotted;} +a:hover,a:active{outline:0;} +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} +audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} +audio:not([controls]){display:none;} +sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;} +sup{top:-0.5em;} +sub{bottom:-0.25em;} +img{border:0;-ms-interpolation-mode:bicubic;} +button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;} +button,input{line-height:normal;*overflow:visible;} +button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;} +button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} +input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} +input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;} +textarea{overflow:auto;vertical-align:top;} +body{background-color:#ffffff;margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;} +.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;} +.container:after{clear:both;} +.container-fluid{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;} +.container-fluid:after{clear:both;} +.container-fluid>.sidebar{position:absolute;top:0;left:20px;width:220px;} +.container-fluid>.content{margin-left:240px;} +a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;} +.pull-right{float:right;} +.pull-left{float:left;} +.hide{display:none;} +.show{display:block;} +.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;} +.row:after{clear:both;} +.row>[class*="span"]{display:inline;float:left;margin-left:20px;} +.span1{width:40px;} +.span2{width:100px;} +.span3{width:160px;} +.span4{width:220px;} +.span5{width:280px;} +.span6{width:340px;} +.span7{width:400px;} +.span8{width:460px;} +.span9{width:520px;} +.span10{width:580px;} +.span11{width:640px;} +.span12{width:700px;} +.span13{width:760px;} +.span14{width:820px;} +.span15{width:880px;} +.span16{width:940px;} +.span17{width:1000px;} +.span18{width:1060px;} +.span19{width:1120px;} +.span20{width:1180px;} +.span21{width:1240px;} +.span22{width:1300px;} +.span23{width:1360px;} +.span24{width:1420px;} +.row>.offset1{margin-left:80px;} +.row>.offset2{margin-left:140px;} +.row>.offset3{margin-left:200px;} +.row>.offset4{margin-left:260px;} +.row>.offset5{margin-left:320px;} +.row>.offset6{margin-left:380px;} +.row>.offset7{margin-left:440px;} +.row>.offset8{margin-left:500px;} +.row>.offset9{margin-left:560px;} +.row>.offset10{margin-left:620px;} +.row>.offset11{margin-left:680px;} +.row>.offset12{margin-left:740px;} +.span-one-third{width:300px;} +.span-two-thirds{width:620px;} +.offset-one-third{margin-left:340px;} +.offset-two-thirds{margin-left:660px;} +p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} +h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} +h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} +h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} +h3,h4,h5,h6{line-height:36px;} +h3{font-size:18px;}h3 small{font-size:14px;} +h4{font-size:16px;}h4 small{font-size:12px;} +h5{font-size:14px;} +h6{font-size:13px;color:#bfbfbf;text-transform:uppercase;} +ul,ol{margin:0 0 18px 25px;} +ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} +ul{list-style:disc;} +ol{list-style:decimal;} +li{line-height:18px;color:#808080;} +ul.unstyled{list-style:none;margin-left:0;} +dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;} +dl dt{font-weight:bold;} +dl dd{margin-left:9px;} +hr{margin:20px 0 19px;border:0;border-bottom:1px solid #eee;} +strong{font-style:inherit;font-weight:bold;} +em{font-style:italic;font-weight:inherit;line-height:inherit;} +.muted{color:#bfbfbf;} +blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} +blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} +address{display:block;line-height:18px;margin-bottom:18px;} +code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} +pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;} +form{margin-bottom:18px;} +fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padding-left:150px;font-size:19.5px;line-height:1;color:#404040;*padding:0 0 5px 145px;*line-height:1.5;} +form .clearfix{margin-bottom:18px;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;} +form .clearfix:after{clear:both;} +label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} +label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} +form .input{margin-left:150px;} +input[type=checkbox],input[type=radio]{cursor:pointer;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +select{padding:initial;} +input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;} +input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} +select,input[type=file]{height:27px;*height:auto;line-height:27px;*margin-top:4px;} +select[multiple]{height:inherit;background-color:#ffffff;} +textarea{height:auto;} +.uneditable-input{background-color:#ffffff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} +:-moz-placeholder{color:#bfbfbf;} +::-webkit-input-placeholder{color:#bfbfbf;} +input,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} +input:focus,textarea:focus{outline:0;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} +input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;} +form .clearfix.error>label,form .clearfix.error .help-block,form .clearfix.error .help-inline{color:#b94a48;} +form .clearfix.error input,form .clearfix.error textarea{color:#b94a48;border-color:#ee5f5b;}form .clearfix.error input:focus,form .clearfix.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} +form .clearfix.error .input-prepend .add-on,form .clearfix.error .input-append .add-on{color:#b94a48;background-color:#fce6e6;border-color:#b94a48;} +form .clearfix.warning>label,form .clearfix.warning .help-block,form .clearfix.warning .help-inline{color:#c09853;} +form .clearfix.warning input,form .clearfix.warning textarea{color:#c09853;border-color:#ccae64;}form .clearfix.warning input:focus,form .clearfix.warning textarea:focus{border-color:#be9a3f;-webkit-box-shadow:0 0 6px #e5d6b1;-moz-box-shadow:0 0 6px #e5d6b1;box-shadow:0 0 6px #e5d6b1;} +form .clearfix.warning .input-prepend .add-on,form .clearfix.warning .input-append .add-on{color:#c09853;background-color:#d2b877;border-color:#c09853;} +form .clearfix.success>label,form .clearfix.success .help-block,form .clearfix.success .help-inline{color:#468847;} +form .clearfix.success input,form .clearfix.success textarea{color:#468847;border-color:#57a957;}form .clearfix.success input:focus,form .clearfix.success textarea:focus{border-color:#458845;-webkit-box-shadow:0 0 6px #9acc9a;-moz-box-shadow:0 0 6px #9acc9a;box-shadow:0 0 6px #9acc9a;} +form .clearfix.success .input-prepend .add-on,form .clearfix.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;} +.input-mini,input.mini,textarea.mini,select.mini{width:60px;} +.input-small,input.small,textarea.small,select.small{width:90px;} +.input-medium,input.medium,textarea.medium,select.medium{width:150px;} +.input-large,input.large,textarea.large,select.large{width:210px;} +.input-xlarge,input.xlarge,textarea.xlarge,select.xlarge{width:270px;} +.input-xxlarge,input.xxlarge,textarea.xxlarge,select.xxlarge{width:530px;} +textarea.xxlarge{overflow-y:auto;} +input.span1,textarea.span1{display:inline-block;float:none;width:30px;margin-left:0;} +input.span2,textarea.span2{display:inline-block;float:none;width:90px;margin-left:0;} +input.span3,textarea.span3{display:inline-block;float:none;width:150px;margin-left:0;} +input.span4,textarea.span4{display:inline-block;float:none;width:210px;margin-left:0;} +input.span5,textarea.span5{display:inline-block;float:none;width:270px;margin-left:0;} +input.span6,textarea.span6{display:inline-block;float:none;width:330px;margin-left:0;} +input.span7,textarea.span7{display:inline-block;float:none;width:390px;margin-left:0;} +input.span8,textarea.span8{display:inline-block;float:none;width:450px;margin-left:0;} +input.span9,textarea.span9{display:inline-block;float:none;width:510px;margin-left:0;} +input.span10,textarea.span10{display:inline-block;float:none;width:570px;margin-left:0;} +input.span11,textarea.span11{display:inline-block;float:none;width:630px;margin-left:0;} +input.span12,textarea.span12{display:inline-block;float:none;width:690px;margin-left:0;} +input.span13,textarea.span13{display:inline-block;float:none;width:750px;margin-left:0;} +input.span14,textarea.span14{display:inline-block;float:none;width:810px;margin-left:0;} +input.span15,textarea.span15{display:inline-block;float:none;width:870px;margin-left:0;} +input.span16,textarea.span16{display:inline-block;float:none;width:930px;margin-left:0;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} +.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;} +.help-inline,.help-block{font-size:13px;line-height:18px;color:#bfbfbf;} +.help-inline{padding-left:5px;*position:relative;*top:-5px;} +.help-block{display:block;max-width:600px;} +.inline-inputs{color:#808080;}.inline-inputs span{padding:0 2px 0 1px;} +.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} +.input-prepend .add-on{*margin-top:1px;} +.input-append input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;margin-right:0;margin-left:-1px;} +.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;} +.inputs-list label{display:block;float:none;width:auto;padding:0;margin-left:20px;line-height:18px;text-align:left;white-space:normal;}.inputs-list label strong{color:#808080;} +.inputs-list label small{font-size:11px;font-weight:normal;} +.inputs-list .inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} +.inputs-list:first-child{padding-top:6px;} +.inputs-list li+li{padding-top:2px;} +.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;margin-left:-20px;float:left;} +.form-stacked{padding-left:20px;}.form-stacked fieldset{padding-top:9px;} +.form-stacked legend{padding-left:0;} +.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} +.form-stacked .clearfix{margin-bottom:9px;}.form-stacked .clearfix div.input{margin-left:0;} +.form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} +.form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} +.form-stacked .actions{margin-left:-20px;padding-left:20px;} +table{width:100%;margin-bottom:18px;padding:0;font-size:13px;border-collapse:collapse;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} +table th{padding-top:9px;font-weight:bold;vertical-align:middle;} +table td{vertical-align:top;border-top:1px solid #ddd;} +table tbody th{border-top:1px solid #ddd;vertical-align:top;} +.condensed-table th,.condensed-table td{padding:5px 5px 4px;} +.bordered-table{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td{border-left:1px solid #ddd;} +.bordered-table thead tr:first-child th:first-child,.bordered-table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} +.bordered-table thead tr:first-child th:last-child,.bordered-table tbody tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} +.bordered-table tbody tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} +.bordered-table tbody tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} +table .span1{width:20px;} +table .span2{width:60px;} +table .span3{width:100px;} +table .span4{width:140px;} +table .span5{width:180px;} +table .span6{width:220px;} +table .span7{width:260px;} +table .span8{width:300px;} +table .span9{width:340px;} +table .span10{width:380px;} +table .span11{width:420px;} +table .span12{width:460px;} +table .span13{width:500px;} +table .span14{width:540px;} +table .span15{width:580px;} +table .span16{width:620px;} +.zebra-striped tbody tr:nth-child(odd) td,.zebra-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} +.zebra-striped tbody tr:hover td,.zebra-striped tbody tr:hover th{background-color:#f5f5f5;} +table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} +table .headerSortUp,table .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} +table .header:hover:after{visibility:visible;} +table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +table .blue{color:#049cdb;border-bottom-color:#049cdb;} +table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;} +table .green{color:#46a546;border-bottom-color:#46a546;} +table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;} +table .red{color:#9d261d;border-bottom-color:#9d261d;} +table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;} +table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;} +table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;} +table .orange{color:#f89406;border-bottom-color:#f89406;} +table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} +table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} +table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} +.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.topbar h3 a:hover,.topbar .brand:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} +.topbar h3{position:relative;} +.topbar h3 a,.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} +.topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;} +.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} +.topbar form.pull-right{float:right;} +.topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;} +.topbar input::-webkit-input-placeholder{color:#e6e6e6;} +.topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} +.topbar input:focus,.topbar input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.topbar-inner,.topbar .fill{background-color:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +.topbar div>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar div>ul>li,.nav>li{display:block;float:left;} +.topbar div>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar div>ul a:hover,.nav a:hover{color:#ffffff;text-decoration:none;} +.topbar div>ul .active>a,.nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} +.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .menu-dropdown,.nav.secondary-nav .menu-dropdown,.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;border:0;} +.topbar div>ul a.menu:hover,.nav a.menu:hover,.topbar div>ul li.open .menu,.nav li.open .menu,.topbar div>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar div>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} +.topbar div>ul .menu-dropdown,.nav .menu-dropdown,.topbar div>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar div>ul .menu-dropdown a.menu,.nav .menu-dropdown a.menu,.topbar div>ul .dropdown-menu a.menu,.nav .dropdown-menu a.menu,.topbar div>ul .menu-dropdown .dropdown-toggle,.nav .menu-dropdown .dropdown-toggle,.topbar div>ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.topbar div>ul .menu-dropdown a.menu.open,.nav .menu-dropdown a.menu.open,.topbar div>ul .dropdown-menu a.menu.open,.nav .dropdown-menu a.menu.open,.topbar div>ul .menu-dropdown .dropdown-toggle.open,.nav .menu-dropdown .dropdown-toggle.open,.topbar div>ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} +.topbar div>ul .menu-dropdown li a,.nav .menu-dropdown li a,.topbar div>ul .dropdown-menu li a,.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.topbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.topbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#ffffff;} +.topbar div>ul .menu-dropdown .active a,.nav .menu-dropdown .active a,.topbar div>ul .dropdown-menu .active a,.nav .dropdown-menu .active a{color:#ffffff;} +.topbar div>ul .menu-dropdown .divider,.nav .menu-dropdown .divider,.topbar div>ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;} +.topbar ul .menu-dropdown li a,.topbar ul .dropdown-menu li a{padding:4px 15px;} +li.menu,.dropdown{position:relative;} +a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} +.menu-dropdown,.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.menu-dropdown li,.dropdown-menu li{float:none;display:block;background-color:none;} +.menu-dropdown .divider,.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} +.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover,.topbar .dropdown-menu a.hover,.dropdown-menu a.hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} +.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} +.open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.dropdown.open .dropdown-menu{display:block;} +.tabs,.pills{margin:0 0 18px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;} +.tabs:after,.pills:after{clear:both;} +.tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} +.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:34px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} +.tabs .active>a,.tabs .active>a:hover{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} +.tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} +.tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} +.tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} +.pills a{margin:5px 3px 5px 0;padding:0 15px;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} +.pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} +.pills-vertical>li{float:none;} +.tab-content>.tab-pane,.pill-content>.pill-pane,.tab-content>div,.pill-content>div{display:none;} +.tab-content>.active,.pill-content>.active{display:block;} +.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} +.breadcrumb .divider{padding:0 5px;color:#bfbfbf;} +.breadcrumb .active a{color:#404040;} +.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit p{font-size:18px;font-weight:200;line-height:27px;} +footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} +.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} +.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} +.btn .close,.alert-message .close{font-family:Arial,sans-serif;line-height:18px;} +.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.btn:focus{outline:1px dotted #666;} +.btn.primary{color:#ffffff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.active,.btn :active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn.large{font-size:15px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.btn.small{padding:7px 9px 7px;font-size:11px;} +:root .alert-message,:root .btn{border-radius:0 \0;} +button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} +.close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=25);-khtml-opacity:0.25;-moz-opacity:0.25;opacity:0.25;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} +.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{margin-top:1px;*margin-top:0;} +.alert-message a{font-weight:bold;color:#404040;} +.alert-message.danger p a,.alert-message.error p a,.alert-message.success p a,.alert-message.info p a{color:#ffffff;} +.alert-message h5{line-height:18px;} +.alert-message p{margin-bottom:0;} +.alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} +.alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} +.alert-message.block-message{background-image:none;background-color:#fdf5d9;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message ul,.alert-message.block-message p{margin-right:30px;} +.alert-message.block-message ul{margin-bottom:0;} +.alert-message.block-message li{color:#404040;} +.alert-message.block-message .alert-actions{margin-top:5px;} +.alert-message.block-message.error,.alert-message.block-message.success,.alert-message.block-message.info{color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;} +.alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;} +.alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} +.alert-message.block-message.danger p a,.alert-message.block-message.error p a,.alert-message.block-message.success p a,.alert-message.block-message.info p a{color:#404040;} +.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} +.pagination li{display:inline;} +.pagination a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;} +.pagination a:hover,.pagination .active a{background-color:#c7eefe;} +.pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;} +.pagination .next a{border:0;} +.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;} +.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} +.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} +.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} +.modal.fade.in{top:50%;} +.modal-header{border-bottom:1px solid #eee;padding:5px 15px;} +.modal-body{padding:15px;} +.modal-body form{margin-bottom:0;} +.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;} +.modal-footer:after{clear:both;} +.modal-footer .btn{float:right;margin-left:5px;} +.modal .popover,.modal .twipsy{z-index:12000;} +.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} +.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.twipsy-inner{padding:3px 8px;background-color:#000000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.twipsy-arrow{position:absolute;width:0;height:0;} +.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.popover .arrow{position:absolute;width:0;height:0;} +.popover .inner{background:#000000;background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} +.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} +.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} +.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;white-space:nowrap;background-color:#bfbfbf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} +.label.warning{background-color:#f89406;} +.label.success{background-color:#46a546;} +.label.notice{background-color:#62cffc;} +.media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;content:"";zoom:1;} +.media-grid:after{clear:both;} +.media-grid li{display:inline;} +.media-grid a{float:left;padding:4px;margin:0 0 18px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;} +.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} diff --git a/documentation/website/source/_themes/opendylan/static/js/html5shim/html5.js b/documentation/website/source/_themes/opendylan/static/js/html5shim/html5.js new file mode 100644 index 0000000000..cbb52a0dee --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/js/html5shim/html5.js @@ -0,0 +1,4 @@ +// iepp v2.1pre @jon_neal & @aFarkas github.com/aFarkas/iepp +// html5shiv @rem remysharp.com/html5-enabling-script +// Dual licensed under the MIT or GPL Version 2 licenses +/*@cc_on(function(a,b){function r(a){var b=-1;while(++b v documentation". From 6214f29d914869e4aa31693d336b91adbd39b36b Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 9 Nov 2011 23:41:24 +0700 Subject: [PATCH 004/519] Point to the old documentation for now so that there's content. --- .../website/source/documentation/index.rst | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index ae64e8db6c..5b2ff74013 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -1,3 +1,76 @@ ************* Documentation ************* + +Online Books +============ + +`Dylan Reference Manual +`_ (`Errata +`_) + + The official definition of the Dylan language and standard library. + +`Dylan Programming +`_ + + A good Dylan tutorial by several Harlequin employees. + +Guides +====== + +`Getting Started with Open Dylan +`_ + + Describes Open Dylan's interactive development environment. + +`Building Applications Using DUIM +`_ + + Describes how to use DUIM (Dylan User Interface Manager), + the portable window programming toolkit. + +`Developing Component Software with CORBA +`_ + + A tutorial and reference for CORBA interoperability using the Functional Developer ORB. + +References +========== + +`Common Dylan and Functional Extensions library reference +`_ + + Describes the Open Dylan implementation of the Dylan language, a + common set of Dylan libraries, and a library interchange mechanism. + The common libraries provide many language extensions, a threads + interface, and object finalization. + +`System and I/O library reference +`_ + + Describes Open Dylan's printing and output formatting modules, + a streams module, a sockets module, and modules providing an + interface to operating system features such as the file system, + time and date information, and the host machine environment. + +`DUIM library reference +`_ + + Describes the libraries forming DUIM (Dylan User Interface Manager), + the portable window programming toolkit. It complements + Building Applications Using DUIM. + +`C FFI and Win32 library reference +`_ + + Describes a foreign function interface library for interoperation + with C programs, and several libraries providing a low-level interface + to the Microsoft Win32 API. + +`OLE, COM, ActiveX and DBMS library reference +`_ + + Describes high and low level interfaces to COM, OLE, and + ActiveX component technology, and generic DBMS support, through + SQL with an ODBC backend. From 8826ca396797c3f184b65f25e4fa04909d652645 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 10 Nov 2011 00:02:07 +0700 Subject: [PATCH 005/519] Add scrollspy support to the topbar. --- .../source/_themes/opendylan/layout.html | 3 +- .../static/js/bootstrap-scrollspy.js | 107 ++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 documentation/website/source/_themes/opendylan/static/js/bootstrap-scrollspy.js diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index f5ca60668e..1a98189c57 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -7,6 +7,7 @@ #} {% extends "basic/layout.html" %} {% set css_files = css_files + ['_static/css/bootstrap/1.4.0/bootstrap.min.css'] %} +{% set script_files = script_files + ['_static/js/bootstrap-scrollspy.js'] %} {% set navigation_bar = [ ('index', 'Home'), @@ -30,7 +31,7 @@ {% endblock %} {% block header %} -
+
Open Dylan diff --git a/documentation/website/source/_themes/opendylan/static/js/bootstrap-scrollspy.js b/documentation/website/source/_themes/opendylan/static/js/bootstrap-scrollspy.js new file mode 100644 index 0000000000..29f7dd5740 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/js/bootstrap-scrollspy.js @@ -0,0 +1,107 @@ +/* ============================================================= + * bootstrap-scrollspy.js v1.4.0 + * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * ============================================================= + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================== */ + + +!function ( $ ) { + + "use strict" + + var $window = $(window) + + function ScrollSpy( topbar, selector ) { + var processScroll = $.proxy(this.processScroll, this) + this.$topbar = $(topbar) + this.selector = selector || 'li > a' + this.refresh() + this.$topbar.delegate(this.selector, 'click', processScroll) + $window.scroll(processScroll) + this.processScroll() + } + + ScrollSpy.prototype = { + + refresh: function () { + this.targets = this.$topbar.find(this.selector).map(function () { + var href = $(this).attr('href') + return /^#\w/.test(href) && $(href).length ? href : null + }) + + this.offsets = $.map(this.targets, function (id) { + return $(id).offset().top + }) + } + + , processScroll: function () { + var scrollTop = $window.scrollTop() + 10 + , offsets = this.offsets + , targets = this.targets + , activeTarget = this.activeTarget + , i + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activateButton( targets[i] ) + } + } + + , activateButton: function (target) { + this.activeTarget = target + + this.$topbar + .find(this.selector).parent('.active') + .removeClass('active') + + this.$topbar + .find(this.selector + '[href="' + target + '"]') + .parent('li') + .addClass('active') + } + + } + + /* SCROLLSPY PLUGIN DEFINITION + * =========================== */ + + $.fn.scrollSpy = function( options ) { + var scrollspy = this.data('scrollspy') + + if (!scrollspy) { + return this.each(function () { + $(this).data('scrollspy', new ScrollSpy( this, options )) + }) + } + + if ( options === true ) { + return scrollspy + } + + if ( typeof options == 'string' ) { + scrollspy[options]() + } + + return this + } + + $(document).ready(function () { + $('body').scrollSpy('[data-scrollspy] li > a') + }) + +}( window.jQuery || window.ender ); From 8dc26fa55503598a68b705cbd7cd76c90ca4e3e4 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 10 Nov 2011 22:20:30 +0700 Subject: [PATCH 006/519] Add a logo next to "Open Dylan" in the top bar. --- .../website/source/_themes/opendylan/layout.html | 5 +++++ .../opendylan/static/images/dylan-squares.png | Bin 0 -> 1803 bytes 2 files changed, 5 insertions(+) create mode 100644 documentation/website/source/_themes/opendylan/static/images/dylan-squares.png diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index 1a98189c57..731fcb7cc9 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -27,6 +27,10 @@ body { padding-top: 50px; } + .topbar .logo { + float: left; + padding: 5px 5px; + } {% endblock %} @@ -34,6 +38,7 @@
+ Open Dylan
-

-
+ +

- -

+

+
diff --git a/documentation/website/sphinx-extensions b/documentation/website/sphinx-extensions index cf0d61ae6f..94150b116c 160000 --- a/documentation/website/sphinx-extensions +++ b/documentation/website/sphinx-extensions @@ -1 +1 @@ -Subproject commit cf0d61ae6fd6963d90bec2e43fd60862edca6f19 +Subproject commit 94150b116c601edf83093aeb4b736de7c3de8291 From a25cf959dca6ef776ce9d2321b8d828054748856 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 23 Nov 2011 07:46:39 +0700 Subject: [PATCH 047/519] Switch to HTML5 doctype. --- documentation/website/source/_themes/opendylan/layout.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index 6e5fba7d7b..b3c44b9f7f 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -6,6 +6,9 @@ :license: MIT. #} {% extends "basic/layout.html" %} +{% block doctype %} + +{% endblock %} {% set css_files = css_files + ['_static/opendylan.org/css/bootstrap/1.4.0/bootstrap.min.css', '_static/opendylan.org/css/opendylan.css'] -%} {% set script_files = script_files + ['_static/opendylan.org/js/bootstrap-scrollspy.js', From cd951865f648f5cc56c8029b3ae008edf187f813 Mon Sep 17 00:00:00 2001 From: Hannes Date: Tue, 22 Nov 2011 19:56:18 -0500 Subject: [PATCH 048/519] update submodule --- documentation/website/sphinx-extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/sphinx-extensions b/documentation/website/sphinx-extensions index 94150b116c..cf0d61ae6f 160000 --- a/documentation/website/sphinx-extensions +++ b/documentation/website/sphinx-extensions @@ -1 +1 @@ -Subproject commit 94150b116c601edf83093aeb4b736de7c3de8291 +Subproject commit cf0d61ae6fd6963d90bec2e43fd60862edca6f19 From 2c930f1dd1f9115ff6aaf6200bbeb1725a62ab0c Mon Sep 17 00:00:00 2001 From: Hannes Date: Sun, 27 Nov 2011 15:11:54 -0500 Subject: [PATCH 049/519] update publications site to include links to individual bib files --- .../_static/documentation/bachrach1999.bib | 6 +++ .../_static/documentation/bachrach2000.bib | 6 +++ .../_static/documentation/barrett1996.bib | 34 +++++++++++++++ .../_static/documentation/dumas1995.bib | 17 ++++++++ .../source/_static/documentation/kidd2001.bib | 8 ++++ .../_static/documentation/mehnert2007.bib | 17 ++++++++ .../_static/documentation/mehnert2009.bib | 8 ++++ .../_static/documentation/mehnert2010.bib | 17 ++++++++ .../_static/documentation/publications.bib | 11 ++++- .../source/documentation/publications.rst | 43 +++++++++++++++---- 10 files changed, 158 insertions(+), 9 deletions(-) create mode 100644 documentation/website/source/_static/documentation/bachrach1999.bib create mode 100644 documentation/website/source/_static/documentation/bachrach2000.bib create mode 100644 documentation/website/source/_static/documentation/barrett1996.bib create mode 100644 documentation/website/source/_static/documentation/dumas1995.bib create mode 100644 documentation/website/source/_static/documentation/kidd2001.bib create mode 100644 documentation/website/source/_static/documentation/mehnert2007.bib create mode 100644 documentation/website/source/_static/documentation/mehnert2009.bib create mode 100644 documentation/website/source/_static/documentation/mehnert2010.bib diff --git a/documentation/website/source/_static/documentation/bachrach1999.bib b/documentation/website/source/_static/documentation/bachrach1999.bib new file mode 100644 index 0000000000..0ec4868343 --- /dev/null +++ b/documentation/website/source/_static/documentation/bachrach1999.bib @@ -0,0 +1,6 @@ +@techreport{Bachrach:1999, + author = {Bachrach, Jonathan and Playford, Keith}, + title = {D-Expressions: Lisp Power, Dylan Style}, + year = {1999}, + source = {http://people.csail.mit.edu/jrb/Projects/dexprs.pdf}, +} diff --git a/documentation/website/source/_static/documentation/bachrach2000.bib b/documentation/website/source/_static/documentation/bachrach2000.bib new file mode 100644 index 0000000000..086a49f66c --- /dev/null +++ b/documentation/website/source/_static/documentation/bachrach2000.bib @@ -0,0 +1,6 @@ +@techreport{Bachrach:2000, + author = {Bachrach, Jonathan and Burke, Glemm}, + title = {Partial Dispatch: Optimizing Dynamically-Dispatched Multimethod Calls with Compile-Time Types and Runtime Feedback}, + year = {2000}, + source = {http://people.csail.mit.edu/jrb/Projects/pd.pdf}, +} diff --git a/documentation/website/source/_static/documentation/barrett1996.bib b/documentation/website/source/_static/documentation/barrett1996.bib new file mode 100644 index 0000000000..298be12c99 --- /dev/null +++ b/documentation/website/source/_static/documentation/barrett1996.bib @@ -0,0 +1,34 @@ +@article{Barrett:1996:MSL:236338.236343, + author = {Barrett, Kim and Cassels, Bob and Haahr, Paul and Moon, David A. and Playford, Keith and Withington, P. Tucker}, + title = {A monotonic superclass linearization for Dylan}, + journal = {SIGPLAN Not.}, + volume = {31}, + issue = {10}, + month = {October}, + year = {1996}, + issn = {0362-1340}, + pages = {69--82}, + numpages = {14}, + url = {http://doi.acm.org/10.1145/236338.236343}, + doi = {http://doi.acm.org/10.1145/236338.236343}, + acmid = {236343}, + publisher = {ACM}, + address = {New York, NY, USA}, +} + +@inproceedings{Barrett:1996:MSL:236337.236343, + author = {Barrett, Kim and Cassels, Bob and Haahr, Paul and Moon, David A. and Playford, Keith and Withington, P. Tucker}, + title = {A monotonic superclass linearization for Dylan}, + booktitle = {Proceedings of the 11th ACM SIGPLAN conference on Object-oriented programming, systems, languages, and applications}, + series = {OOPSLA '96}, + year = {1996}, + isbn = {0-89791-788-X}, + location = {San Jose, California, United States}, + pages = {69--82}, + numpages = {14}, + url = {http://doi.acm.org/10.1145/236337.236343}, + doi = {http://doi.acm.org/10.1145/236337.236343}, + acmid = {236343}, + publisher = {ACM}, + address = {New York, NY, USA}, +} diff --git a/documentation/website/source/_static/documentation/dumas1995.bib b/documentation/website/source/_static/documentation/dumas1995.bib new file mode 100644 index 0000000000..302117c967 --- /dev/null +++ b/documentation/website/source/_static/documentation/dumas1995.bib @@ -0,0 +1,17 @@ +@article{Dumas:1995:DWP:203241.203253, + author = {Dumas, Joseph and Parsons, Paige}, + title = {Discovering the way programmers think about new programming environments}, + journal = {Commun. ACM}, + volume = {38}, + issue = {6}, + month = {June}, + year = {1995}, + issn = {0001-0782}, + pages = {45--56}, + numpages = {12}, + url = {http://doi.acm.org/10.1145/203241.203253}, + doi = {http://doi.acm.org/10.1145/203241.203253}, + acmid = {203253}, + publisher = {ACM}, + address = {New York, NY, USA}, +} \ No newline at end of file diff --git a/documentation/website/source/_static/documentation/kidd2001.bib b/documentation/website/source/_static/documentation/kidd2001.bib new file mode 100644 index 0000000000..71297ed4ee --- /dev/null +++ b/documentation/website/source/_static/documentation/kidd2001.bib @@ -0,0 +1,8 @@ +@techreport{Kidd:2001:ECG:867862, + author = {Kidd, Eric}, + title = {Efficient Compression of Generic Function Dispatch Tables}, + year = {2001}, + source = {http://www.ncstrl.org:8900/ncstrl/servlet/search?formname=detail\&id=oai%3Ancstrlh%3Adartmouthcs%3Ancstrl.dartmouthcs%2F%2FTR2001-404}, + publisher = {Dartmouth College}, + address = {Hanover, NH, USA}, +} diff --git a/documentation/website/source/_static/documentation/mehnert2007.bib b/documentation/website/source/_static/documentation/mehnert2007.bib new file mode 100644 index 0000000000..b8cfbf739f --- /dev/null +++ b/documentation/website/source/_static/documentation/mehnert2007.bib @@ -0,0 +1,17 @@ +@inproceedings{Mehnert:2007:DLM:1622123.1622148, + author = {Mehnert, Hannes and Bogk, Andreas}, + title = {A domain-specific language for manipulation of binary data in Dylan}, + booktitle = {Proceedings of the 2007 International Lisp Conference}, + series = {ILC '07}, + year = {2009}, + isbn = {978-1-59593-618-9}, + location = {Cambridge, United Kingdom}, + pages = {22:1--22:8}, + articleno = {22}, + numpages = {8}, + url = {http://doi.acm.org/10.1145/1622123.1622148}, + doi = {http://doi.acm.org/10.1145/1622123.1622148}, + acmid = {1622148}, + publisher = {ACM}, + address = {New York, NY, USA}, +} diff --git a/documentation/website/source/_static/documentation/mehnert2009.bib b/documentation/website/source/_static/documentation/mehnert2009.bib new file mode 100644 index 0000000000..9cca0cd829 --- /dev/null +++ b/documentation/website/source/_static/documentation/mehnert2009.bib @@ -0,0 +1,8 @@ +@inproceedings{Mehnert:2009, + author = {Mehnert, Hannes}, + title = {Automatically generated type-safe GTK+ binding for Dylan}, + booktitle = {Proceedings of the 2009 International Lisp Conference}, + series = {ILC '09}, + year = {2009}, + location = {Cambridge, MA, USA}, +} diff --git a/documentation/website/source/_static/documentation/mehnert2010.bib b/documentation/website/source/_static/documentation/mehnert2010.bib new file mode 100644 index 0000000000..57fa55898e --- /dev/null +++ b/documentation/website/source/_static/documentation/mehnert2010.bib @@ -0,0 +1,17 @@ +@inproceedings{Mehnert:2010:EDT:1869643.1869645, + author = {Mehnert, Hannes}, + title = {Extending Dylan's type system for better type inference and error detection}, + booktitle = {Proceedings of the 2010 international conference on Lisp}, + series = {ILC '10}, + year = {2010}, + isbn = {978-1-4503-0470-2}, + location = {Reno/Tahoe, Nevada, USA}, + pages = {1--10}, + numpages = {10}, + url = {http://doi.acm.org/10.1145/1869643.1869645}, + doi = {http://doi.acm.org/10.1145/1869643.1869645}, + acmid = {1869645}, + publisher = {ACM}, + address = {New York, NY, USA}, + keywords = {compilers, dylan, dynamic typing, generic functions, gradual typing, lisp, multimethods, multiple dispatch, object-orientation, static typing, type inference}, +} diff --git a/documentation/website/source/_static/documentation/publications.bib b/documentation/website/source/_static/documentation/publications.bib index 5dca1e198b..a52567fcd9 100644 --- a/documentation/website/source/_static/documentation/publications.bib +++ b/documentation/website/source/_static/documentation/publications.bib @@ -14,7 +14,16 @@ @inproceedings{Mehnert:2010:EDT:1869643.1869645 publisher = {ACM}, address = {New York, NY, USA}, keywords = {compilers, dylan, dynamic typing, generic functions, gradual typing, lisp, multimethods, multiple dispatch, object-orientation, static typing, type inference}, -} +} + +@inproceedings{Mehnert:2009, + author = {Mehnert, Hannes}, + title = {Automatically generated type-safe GTK+ binding for Dylan}, + booktitle = {Proceedings of the 2009 International Lisp Conference}, + series = {ILC '09}, + year = {2009}, + location = {Cambridge, MA, USA}, +} @inproceedings{Mehnert:2007:DLM:1622123.1622148, author = {Mehnert, Hannes and Bogk, Andreas}, diff --git a/documentation/website/source/documentation/publications.rst b/documentation/website/source/documentation/publications.rst index f49173c1b1..f6219d41f0 100644 --- a/documentation/website/source/documentation/publications.rst +++ b/documentation/website/source/documentation/publications.rst @@ -2,7 +2,11 @@ Publications about Dylan ************************ -`Extending Dylan's type system for better type inference and error detection - Hannes Mehnert - ILC 2010 `_ +**Extending Dylan's type system for better type inference and error +detection** +(by Hannes Mehnert at ILC 2010 +`pdf `__ +`bib <../_static/documentation/mehnert2010.bib>`__) Whereas dynamic typing enables rapid prototyping and easy experimentation, static typing provides early error detection and @@ -23,7 +27,10 @@ Publications about Dylan https://dl.acm.org/citation.cfm?id=1869643.1869645 -`Automatically generated type-safe GTK+ binding for Dylan - Hannes Mehnert - ILC 2009 `_ +**Automatically generated type-safe GTK+ binding for Dylan** +(by Hannes Mehnert at ILC 2009 +`pdf `__ +`bib <../_static/documentation/mehnert2009.bib>`__) We present an automated way to get language bindings for GTK+ for Dylan, an object-oriented functional programming language related @@ -33,7 +40,10 @@ Publications about Dylan is type-safe, no up- and downcasts are needed. -`A domain-specific language for manipulation of binary data in Dylan - Hannes Mehnert and Andreas Bogk - ILC 2007 `_ +**A domain-specific language for manipulation of binary data in Dylan** +(by Hannes Mehnert and Andreas Bogk at ILC 2007 +`pdf `__ +`bib <../_static/documentation/mehnert2007.bib>`__) We present a domain specific language for manipulation of binary data, or structured byte sequences, as they appear in everyday @@ -46,7 +56,10 @@ Publications about Dylan https://dl.acm.org/citation.cfm?id=1622123.1622148 -`Efficient Compression of Generic Function Dispatch Tables - Eric Kidd - Technical Report Dartmouth College Hanover, NH, USA ©2001 `_ +**Efficient Compression of Generic Function Dispatch Tables** +(by Eric Kidd - Technical Report Dartmouth College 2001 +`pdf `__ +`bib <../_static/documentation/kidd2001.bib>`__) A generic function is similar to an overloaded operator, but provides a way to select an appropriate behavior at run-time @@ -62,7 +75,10 @@ Publications about Dylan https://dl.acm.org/citation.cfm?id=867862 -`Partial Dispatch: Optimizing Dynamically-Dispatched Multimethod Calls with Compile-Time Types and Runtime Feedback - Jonathan Bachrach and Glenn Burke - Technical Report 2000 `_ +**Partial Dispatch: Optimizing Dynamically-Dispatched Multimethod Calls with Compile-Time Types and Runtime Feedback** +(by Jonathan Bachrach and Glenn Burke - Technical Report 2000 +`pdf `__ +`bib <../_static/documentation/bachrach2000.bib>`__) We presented an approach to gaining back complete class hierarchy information by delaying the construction of dispatch caches until @@ -79,7 +95,10 @@ Publications about Dylan components, multi-threaded runtime, incremental development, “pay as you go philosophy”, and interoperability with standard tools. -`D-Expressions: Lisp Power, Dylan Style - Jonathan Bachrach and Keith Playford - Technical Report 1999 `_ +**D-Expressions: Lisp Power, Dylan Style** +(by Jonathan Bachrach and Keith Playford - Technical Report 1999 +`pdf `__ +`bib <../_static/documentation/bachrach1999.bib>`__) This paper aims to demonstrate that it is possible for a language with a rich, conventional syntax to provide Lisp-style macro power @@ -90,7 +109,11 @@ Publications about Dylan syntax, the approach taken to describe and represent that syntax is distinctly Lisp-like in philosophy. -`A Monotonic Superclass Linearization for Dylan - Kim Barrett and Bob Cassels and Paul Haahr and David A. Moon and Keith Playford and P. Tucker Withington - OOPSLA 1996 `_ +**A Monotonic Superclass Linearization for Dylan** +(by Kim Barrett and Bob Cassels and Paul Haahr and David A. Moon and +Keith Playford and P. Tucker Withington at OOPSLA 1996 +`html `__ +`bib <../_static/documentation/barrett1996.bib>`__) Object-oriented languages with multiple inheritance and automatic conflict resolution typically use a linearization of superclasses @@ -110,7 +133,10 @@ Publications about Dylan https://dl.acm.org/citation.cfm?id=236337.236343 -`Discovering the way programmers think about new programming environments - Joseph Dumas and Paige Parsons - Communications of the ACM June 1995 `_ +**Discovering the way programmers think about new programming environments** +(by Joseph Dumas and Paige Parsons - Communications of the ACM June +1995 +`bib <../_static/documentation/dumas1995.bib>`__) An interesting usability study of a prototype development environment for the Dylan programming language is presented @@ -121,6 +147,7 @@ Publications about Dylan how effectively the prototype conveys these innovations to Dylan developers is also given, followed by some proposed improvements. + https://dl.acm.org/citation.cfm?id=203253 `Bibliography in bibtex format <../_static/documentation/publications.bib>`_ From 09be9e88619aac3897a6c038f5881cba7a31ca4f Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 1 Dec 2011 21:00:23 +0700 Subject: [PATCH 050/519] Update notice about upcoming releases to indicate first half of December rather than end of November. --- documentation/website/source/download/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index 3b69fb9b4a..d0481d1114 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -6,7 +6,7 @@ Binary Releases =============== .. warning:: These builds are quite old. We're working hard to have new builds posted - soon, hopefully by the end of November, 2011. + soon, within the first half of December, 2011. Open Dylan IDE -------------- From 5f7fa50b16b5e1e28d3f81ea6cdeb2ceef9e3d87 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 1 Dec 2011 21:03:30 +0700 Subject: [PATCH 051/519] Link to the new Jenkins instance. --- documentation/website/source/download/index.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index d0481d1114..f8a9344962 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -62,6 +62,8 @@ Source Code All of our source code is available in the `"dylan-lang" organization on GitHub `_. +We also have a `continuous build server `_. + .. _Windows (32 bit): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-win32-r12284.exe .. _Mac OS X (Intel): http://opendylan.org/downloads/opendylan/1.0beta4/opendylan-1.0beta4-x86-darwin.tar.bz2 From a9cd0c9e13fa0af5c65ca4263b1db13c66b27947 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 9 Dec 2011 14:33:06 -0500 Subject: [PATCH 052/519] Remove mention of bugzilla --- documentation/website/source/community/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/community/index.rst b/documentation/website/source/community/index.rst index 8f69d20f6b..ccc47bb936 100644 --- a/documentation/website/source/community/index.rst +++ b/documentation/website/source/community/index.rst @@ -56,7 +56,7 @@ interest and involvement: this list. `chatter@lists.opendylan.org `_ (`Archives`__) - This list contains nothing but Git commit messages and Bugzilla output. + This list contains nothing but Git commit messages. It's for developers who want to know everything that's going on. From f57d075e1646a022f968e30700f773de2b370379 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sat, 10 Dec 2011 02:32:57 -0500 Subject: [PATCH 053/519] Download links and announcement for new release: 2011.1 --- .../website/source/download/index.rst | 22 +-- .../source/news/2011/12/10/new_release.rst | 186 ++++++++++++++++++ .../website/source/news/recent.rst.inc | 7 + 3 files changed, 204 insertions(+), 11 deletions(-) create mode 100644 documentation/website/source/news/2011/12/10/new_release.rst diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index f8a9344962..2c66af1d3a 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -25,14 +25,14 @@ or the current .NET platform SDK installed. +-----------------------+--------------------+--------------------+-------------+ | Platform | Version | Date Released | Revision ID | +=======================+====================+====================+=============+ - | `Windows (32 bit)`_ | 1.0beta5 | June 21, 2009 | ... | + | `Windows (32 bit)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | +-----------------------+--------------------+--------------------+-------------+ Open Dylan Command Line Tools ----------------------------- The README file inside the tarball describes installation and basic -usage. The easiest way is extracting the tarball in /usr/local. The +usage. The easiest way is extracting the tarball in /opt. The Linux platform should have binutils installed, in order to allow linking. Note that these versions only have a command-line compiler and no IDE. @@ -43,15 +43,15 @@ and no IDE. +-----------------------+--------------------+--------------------+-------------+ | Platform | Version | Date Released | Revision ID | +=======================+====================+====================+=============+ - | `Mac OS X (Intel)`_ | 1.0beta4 | April 29, 2007 | ... | + | `Mac OS X (Intel)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | +-----------------------+--------------------+--------------------+-------------+ - | `Mac OS X (PowerPC)`_ | 1.0beta4 | July 10, 2007 | ... | + | `Mac OS X (PowerPC)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | +-----------------------+--------------------+--------------------+-------------+ - | `Linux (x86)`_ | 1.0beta5 | January 16, 2008 | ... | + | `Linux (x86)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | +-----------------------+--------------------+--------------------+-------------+ | `Linux (x86-64)`_ | 1.0beta5 | January 16, 2009 | ... | +-----------------------+--------------------+--------------------+-------------+ - | `FreeBSD (x86)`_ | 1.0beta4 | April 29, 2007 | ... | + | `FreeBSD (x86)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | +-----------------------+--------------------+--------------------+-------------+ | `FreeBSD (x86-64)`_ | 1.0beta5 | November 27, 2008 | ... | +-----------------------+--------------------+--------------------+-------------+ @@ -65,10 +65,10 @@ All of our source code is available in the `"dylan-lang" organization on GitHub We also have a `continuous build server `_. -.. _Windows (32 bit): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-win32-r12284.exe -.. _Mac OS X (Intel): http://opendylan.org/downloads/opendylan/1.0beta4/opendylan-1.0beta4-x86-darwin.tar.bz2 -.. _Mac OS X (PowerPC): http://opendylan.org/downloads/opendylan/1.0beta4/opendylan-1.0beta4-ppc-darwin.dmg -.. _Linux (x86): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-x86-linux.tar.bz2 +.. _Windows (32 bit): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-win32.exe +.. _Mac OS X (Intel): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-darwin.tar.bz2 +.. _Mac OS X (PowerPC): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-ppc-darwin.tar.bz2 +.. _Linux (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-linux.tar.bz2 .. _Linux (x86-64): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-x86_64-linux.tar.bz2 -.. _FreeBSD (x86): http://opendylan.org/downloads/opendylan/1.0beta4/opendylan-1.0beta4-x86-FreeBSD6.tar.bz2 +.. _FreeBSD (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-FreeBSD.tar.bz2 .. _FreeBSD (x86-64): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-r11990-amd64-FreeBSD7.tar.bz2 diff --git a/documentation/website/source/news/2011/12/10/new_release.rst b/documentation/website/source/news/2011/12/10/new_release.rst new file mode 100644 index 0000000000..a523b98e64 --- /dev/null +++ b/documentation/website/source/news/2011/12/10/new_release.rst @@ -0,0 +1,186 @@ +:Author: Hannes Mehnert +:Date: 2011-12-10 02:00:00 + +Dear Dylan Hacker, +================== + +It is a pleasure for us to finally announce a release of Open Dylan. + +The last release with an announcement was beta4, in April 2007. Since +then we have decided to use another versioning scheme: $year.$count; +this release version is 2011.1. We will be doing more regular +releases and are already hard at work on 2012.1 for next month! + +One of the most important changes from the last four years is that the +remaining rights holders of Functional Objects (the original +developers of what became Open Dylan) agreed to re-license all of +their code for the compiler and runtime libraries under the MIT +license. + +We have also moved to GitHub: + + https://github.com/dylan-lang/ + +Another big effort was made to decrease the size of the code base in +order to improve its maintainability. In this release, compared to +(the unannounced) beta5, we removed about 1/3 of the code base, from +1,200,000 lines of code down to 850,000 (according to +https://www.ohloh.net/p/open-dylan). + +This is the first joint release on all major platforms: + +- Windows (32-bit only, this is the only platform with the IDE right now, native back-end) +- Mac OS X (32-bit, Intel (10.6+) and PPC (10.5) using the C back-end) +- Linux (32-bit (with the native back-end) and 64-bit (with the C back-end)) +- FreeBSD (32-bit only, native back-end) + +The C back-end currently does not support multi-threaded programs. + +We also developed a SLIME (http://common-lisp.net/project/slime/) +back-end, so you can develop in Emacs and get cross references, M-. +and arguments. + +The library functional-dylan has been phased out. It was mainly +importing and exporting dylan and common-dylan. Use dylan or +common-dylan as appropriate. + +The release also includes several bug fixes and improves error +reporting. However, many bugs and issues with error reporting +remain. Please report problems that you have in our issue tracker: + + https://github.com/dylan-lang/opendylan/issues + +You can get it from our website, http://opendylan.org/download/ . +On Windows there is an installer, on UNIX systems unpack into /opt. + + +Now follows a more detailed list of changes: + +Notable compiler changes +======================== + +The command-line compiler is now called dylan-compiler instead of +minimal-console-compiler (or opendylan). + +The 'remove build products' command has been renamed to 'clean', which +is more common and intuitive. + +We fixed the error reporting in several ways: cleanup handlers are +called correctly now (no "Attempting to build during another build!" +anymore). Also, when an error is caused, the reporting does not error. +Additionally warnings and errors from subprojects are now reported +(rather than only put into the log file). + +We support output of internal debug messages via a dylan-compiler +argument (internal-debug, set to a list of debug-targets, like +project-manager, linker,...). Additionally Harp, DFM and assembler +output of the compiler can be written to the build directory (via +harp, dfm, assembler command-line flags). + +The dylan-compiler supports -version and -shortversion flags. + +In Deuce, a buffer which is modified is now marked with an asterisk. + +On application shutdown, a list of closures is called, which can be +registered via register-application-exit-function. Also the GC is +properly shut down. + +The build system both on UNIX and Windows has lots of improvements and +is even less code. There is no longer support to checkout code via +CVS, though. + +The runtime lives in dylan-support.o, which is linked into libdylan, +rather than a _glue.o which was emitted for every application. The +system library contains offsets into C structures (like stat) for all +major platforms, including 64-bit versions. + +The function closure-size no longer lives in dfmc-execution, but in +dfmc-flow-graph. The library dfmc-execution was removed. + + +Library Improvements +==================== + +We consolidated file and standard-io under the same buffered +file-accessor. We also improved the run-application function, which +now can spawn asynchronous processes, redirect standard-input, +standard-output and standard-error, set the working directory and +environment variables. + +If write is interrupted (by EINTR), we call write again until it has +written all bytes. + +The function join now works on an empty sequence. + +The function position takes start and end keyword parameters, and its +performance was improved. + +A new function, integer-length, is now in common-dylan. + +The function directory-contents now returns the contents of the +directory. + +We now support a with-input-from-string macro in the streams module. + +A new library, ssl-network, wraps openssl and integrates into the +already existing network library. + +The element-setter for the forward-iteration-protocol of + has been fixed. + +Shift operations on machine words are inlined now. + +The class contains a slot with the error-code. + +Testworks has been vastly improved, and improved test suites are +provided for the Dylan library, common-dylan and jam. + + +Mac OS X +======== + +The support on Mac OS X improved immensely; the code which retrieves +the path to the running application now uses _NSGetExecutablePath. +Also, setting environment variables is now supported on Mac OS X. The +system library is renamed on Mac OS X to odsystem to prevent +interfering with the built-in System library. + + +Back-ends +========= + +In the native back-end we pass integer and floating point exceptions +to the Dylan runtime on Linux and FreeBSD platforms. + +In the C back-end we emit volatile for all the variables inside of a +bind-exit block which need to be volatile. + +We defer the back-end selection to the end of the compilation of the +compiler to reduce the compilation time for compiler hackers. + + +Removed code +============ + +The majority of the removed code was not used, on the one hand code +for the LispWorks emulator, on the other hand (half-finished) support +for outdated platforms: namely a native PPC backend, a half-finished +Java backend; Mac OS (Classic), IRIX, SunOS, Solaris and OSF3 platform +support. + +It also included the separation in three disjoint releases, basic, +enhanced and enterprise - which was useful back when the compiler was +developed commercially, but is no longer. + +The amount of applications for the command-line compiler has been +decreased from eight to four, namely dylan-compiler, dylan-environment +(including execution and debugging) and dylan-*-with-tools, which +includes the tools interface (remote debugging, scepter, OLE). + +Also, the old pentium-dw (DylanWorks) application was removed since it +is no longer used and is unnecesary.. + +We unified the dfmc-shell/command-shell and +environment-commands/commands libraries, which are the interactive +shell. (Previously the otherwise obsolete dfmc-shell was used in the +interactor). diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index b61671b5a5..827fe19607 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,4 +1,11 @@ +**New release: 2011.1** +*2011-12-10* + +We just released Open Dylan 2011.1 + +:doc:`Read more... ` + **New Documentation** *2011-11-22* From 0bfa7a726ed82e1939ca6d64e90760666a2026e8 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sat, 10 Dec 2011 02:46:48 -0500 Subject: [PATCH 054/519] Remove 'outdated builds' warning, as noted by aglynn on IRC --- documentation/website/source/download/index.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index 2c66af1d3a..96488436b2 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -5,9 +5,6 @@ Download Binary Releases =============== -.. warning:: These builds are quite old. We're working hard to have new builds posted - soon, within the first half of December, 2011. - Open Dylan IDE -------------- From 4f31509187a93b2ca3a668e7b1eadb4cfdc5e6b2 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sat, 10 Dec 2011 03:37:36 -0500 Subject: [PATCH 055/519] Add a proper title, which shows up in RSS --- documentation/website/source/news/2011/12/10/new_release.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/news/2011/12/10/new_release.rst b/documentation/website/source/news/2011/12/10/new_release.rst index a523b98e64..31ff37f53f 100644 --- a/documentation/website/source/news/2011/12/10/new_release.rst +++ b/documentation/website/source/news/2011/12/10/new_release.rst @@ -1,8 +1,10 @@ :Author: Hannes Mehnert :Date: 2011-12-10 02:00:00 +Open Dylan 2011.1 released +========================== + Dear Dylan Hacker, -================== It is a pleasure for us to finally announce a release of Open Dylan. From 75903c7d465394a905c7011a95e24c187d718a1f Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sat, 10 Dec 2011 22:17:58 -0500 Subject: [PATCH 056/519] Add links to branching model and note about commit messages --- documentation/website/source/community/index.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/website/source/community/index.rst b/documentation/website/source/community/index.rst index ccc47bb936..7b87ed3e22 100644 --- a/documentation/website/source/community/index.rst +++ b/documentation/website/source/community/index.rst @@ -10,6 +10,8 @@ Development - `All of our repositories on GitHub `_ - `Open bugs for Open Dylan `_ +- We use `Vincent Driessen's branching model `_, supported by `gitflow `_ +- We also emphasize `this note about git commit messages `_ The #dylan IRC channel ====================== From e4fd27b2046a3ee787e3e2e757e77f7f72be00e7 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sat, 10 Dec 2011 22:18:36 -0500 Subject: [PATCH 057/519] Add links to x86_64-linux 2011.1 release --- documentation/website/source/download/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index 96488436b2..b673406ca3 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -46,7 +46,7 @@ and no IDE. +-----------------------+--------------------+--------------------+-------------+ | `Linux (x86)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | +-----------------------+--------------------+--------------------+-------------+ - | `Linux (x86-64)`_ | 1.0beta5 | January 16, 2009 | ... | + | `Linux (x86-64)`_ | 2011.1 | December 11, 2011 | 23f8ab5878 | +-----------------------+--------------------+--------------------+-------------+ | `FreeBSD (x86)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | +-----------------------+--------------------+--------------------+-------------+ @@ -66,6 +66,6 @@ We also have a `continuous build server `_. .. _Mac OS X (Intel): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-darwin.tar.bz2 .. _Mac OS X (PowerPC): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-ppc-darwin.tar.bz2 .. _Linux (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-linux.tar.bz2 -.. _Linux (x86-64): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-x86_64-linux.tar.bz2 +.. _Linux (x86-64): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86_64-linux.tar.bz2 .. _FreeBSD (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-FreeBSD.tar.bz2 .. _FreeBSD (x86-64): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-r11990-amd64-FreeBSD7.tar.bz2 From 0ef93149a90127510799f48d940a3489e6b30d6b Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sun, 11 Dec 2011 00:50:54 -0500 Subject: [PATCH 058/519] Link to contribution chapter in Hacker's guide --- documentation/website/source/community/index.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/documentation/website/source/community/index.rst b/documentation/website/source/community/index.rst index 7b87ed3e22..c260768061 100644 --- a/documentation/website/source/community/index.rst +++ b/documentation/website/source/community/index.rst @@ -10,8 +10,7 @@ Development - `All of our repositories on GitHub `_ - `Open bugs for Open Dylan `_ -- We use `Vincent Driessen's branching model `_, supported by `gitflow `_ -- We also emphasize `this note about git commit messages `_ +- `How to contribute `_ The #dylan IRC channel ====================== From 8da3179a13e24dcd8e7bf660770702ba3b2462f5 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sun, 11 Dec 2011 20:04:30 +0700 Subject: [PATCH 059/519] Add warning about running 32 bit OD on 64 bit Windows. This came up in a thread on reddit.com/r/programming. --- documentation/website/source/download/index.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index b673406ca3..d8db6550b0 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -12,6 +12,11 @@ Open Dylan IDE to use the command line tools. The Windows IDE installer also includes the command line tools. +.. warning:: The 32 bit version of Open Dylan does NOT work on 64 bit Windows. + There is no workaround at this time, unfortunately. We hope to resolve this + in an upcoming release. + :class: alert-message warning + For installation, double-click on the installer, and follow instructions. You need to have either the PellesC linker or the linker of VC++ 6.0, 7.0 or the current .NET platform SDK installed. From 09cdf4082985992a5242585786c1bc2871239a0a Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 11 Dec 2011 10:30:50 -0500 Subject: [PATCH 060/519] Remove unnecessary parens around comparison ops. --- .../website/source/documentation/cheatsheet.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/website/source/documentation/cheatsheet.rst b/documentation/website/source/documentation/cheatsheet.rst index d2746e2cd5..c19486cf58 100644 --- a/documentation/website/source/documentation/cheatsheet.rst +++ b/documentation/website/source/documentation/cheatsheet.rst @@ -88,12 +88,12 @@ Operators +=============+====================================+====================+ | Equality & | .. code-block:: dylan | * :drm:`<` | | Comparison | | * :drm:`>` | -| | (a < b) // a less than b? | * :drm:`=` | -| | (a > b) // a greater than b? | * :drm:`~=` | -| | (a = b) // a equal to b? | * :drm:`==` | -| | (a ~= b) // a not equal b | * :drm:`~==` | -| | (a == b) // a identical to b | | -| | (a ~== b) // a not identical to b | | +| | a < b // a less than b? | * :drm:`=` | +| | a > b // a greater than b? | * :drm:`~=` | +| | a = b // a equal to b? | * :drm:`==` | +| | a ~= b // a not equal b | * :drm:`~==` | +| | a == b // a identical to b | | +| | a ~== b // a not identical to b | | | | ~a // logical negation | | +-------------+------------------------------------+--------------------+ | Arithmetic | .. code-block:: dylan | * :drm:`+` | From 2408e45710af374a2f656d6444a4afac96b8e27c Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 11 Dec 2011 19:47:11 -0500 Subject: [PATCH 061/519] Added string formatting and some changes to collections. --- .../source/documentation/cheatsheet.rst | 98 +++++++++++++------ 1 file changed, 69 insertions(+), 29 deletions(-) diff --git a/documentation/website/source/documentation/cheatsheet.rst b/documentation/website/source/documentation/cheatsheet.rst index c19486cf58..4d294b4c30 100644 --- a/documentation/website/source/documentation/cheatsheet.rst +++ b/documentation/website/source/documentation/cheatsheet.rst @@ -28,11 +28,15 @@ Literals +----------------+----------------------------------------+---------------------------+ | Strings | .. code-block:: dylan | | | | | * :drm:`` | -| | 'a' // A character | * :drm:`` | +| | 'a' // A character | | | | "Hello" // A simple string | | | | "Hello\n" // An escape sequence | | -| | #"hello" // A symbol, unique string | | -| | hello: // A symbol, keyword | | ++----------------+----------------------------------------+---------------------------+ +| Symbols | .. code-block:: dylan | * :drm:`` | +| | | | +| | #"hello" // A symbol | | +| | #"HELLO" // The same symbol | | +| | hello: // Again, in keyword syntax | | +----------------+----------------------------------------+---------------------------+ | Collections | .. code-block:: dylan | * :drm:`` | | | | * :drm:`` | @@ -83,29 +87,65 @@ Naming Conventions Operators ========= -+-------------+------------------------------------+--------------------+ -| Class | Dylan Syntax | Learn More... | -+=============+====================================+====================+ -| Equality & | .. code-block:: dylan | * :drm:`<` | -| Comparison | | * :drm:`>` | -| | a < b // a less than b? | * :drm:`=` | -| | a > b // a greater than b? | * :drm:`~=` | -| | a = b // a equal to b? | * :drm:`==` | -| | a ~= b // a not equal b | * :drm:`~==` | -| | a == b // a identical to b | | -| | a ~== b // a not identical to b | | -| | ~a // logical negation | | -+-------------+------------------------------------+--------------------+ -| Arithmetic | .. code-block:: dylan | * :drm:`+` | -| | | * :drm:`*` | -| | a + b // add a and b | * :drm:`-` | -| | a * b // mulitply a and b | * :drm:`/` | -| | a - b // subtract b from a | * :drm:`modulo` | -| | a / b // divide a by b | * :drm:`negative` | -| | modulo(a, b) // modulus of a by b | | -| | negative(a) // negative of a | | -+-------------+------------------------------------+--------------------+ -| Collection | .. code-block:: dylan | * :drm:`empty?` | -| | | | -| | my-list.empty? // is this empty? | | -+-------------+------------------------------------+--------------------+ ++--------------------+---------------------------------------+--------------------------+ +| Class | Dylan Syntax | Learn More... | ++====================+=======================================+==========================+ +| Equality & | .. code-block:: dylan | * :drm:`<` | +| Comparison | | * :drm:`>` | +| | a < b // a less than b? | * :drm:`=` | +| | a > b // a greater than b? | * :drm:`~=` | +| | a = b // a equal to b? | * :drm:`==` | +| | a ~= b // a not equal b | * :drm:`~==` | +| | a == b // a identical to b | | +| | a ~== b // a not identical to b | | +| | ~a // logical negation | | ++--------------------+---------------------------------------+--------------------------+ +| Arithmetic | .. code-block:: dylan | * :drm:`+` | +| | | * :drm:`*` | +| | a + b // add a and b | * :drm:`-` | +| | a * b // mulitply a and b | * :drm:`/` | +| | a - b // subtract b from a | * :drm:`modulo` | +| | a / b // divide a by b | * :drm:`negative` | +| | modulo(a, b) // modulus of a by b | | +| | negative(a) // negative of a | | ++--------------------+---------------------------------------+--------------------------+ +| :drm:`Collections` | .. code-block:: dylan | * :drm:`` | +| | | | +| | c[k] // elem. k of col. c | * :drm:`element` | +| | c[k] := x // set elem. k of col. c | * :drm:`element-setter` | +| | c.empty? // is c empty? | * :drm:`empty?` | +| | c.size // how big is c? | * :drm:`size` | ++--------------------+---------------------------------------+--------------------------+ +| Sequence | .. code-block:: dylan | * :drm:`` | +| | | | +| | add(c, x) // add x to copy of c | * :drm:`add` | +| | remove(c, x) // rem x from copy of c | * :drm:`remove` | +| | sort(c) // copy of c, sorted | * :drm:`sort` | +| | reverse(c) // copy of c, reversed | * :drm:`reverse` | ++--------------------+---------------------------------------+--------------------------+ + + +String Formatting +================= + ++-------------+------------------+-----------------------+ +| Directive | Argument Type | Description | ++=============+==================+=======================+ +| %d | | decimal number | ++-------------+------------------+-----------------------+ +| %b | | binary number | ++-------------+------------------+-----------------------+ +| %o | | octal number | ++-------------+------------------+-----------------------+ +| %x | | hexadecimal number | ++-------------+------------------+-----------------------+ +| %c | | character, no quotes | ++-------------+------------------+-----------------------+ +| %s | | string, no quotes | ++-------------+------------------+-----------------------+ +| %s | | condition message | ++-------------+------------------+-----------------------+ +| %= | | any object | ++-------------+------------------+-----------------------+ +| %% | None | literal % | ++-------------+------------------+-----------------------+ From 8be50ef80a7b70960b40e977b98b4869ae9c6b0f Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 11 Dec 2011 20:35:40 -0500 Subject: [PATCH 062/519] Added TOC entry for String Formatting. --- documentation/website/source/documentation/cheatsheet.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/website/source/documentation/cheatsheet.rst b/documentation/website/source/documentation/cheatsheet.rst index 4d294b4c30..3db17403e9 100644 --- a/documentation/website/source/documentation/cheatsheet.rst +++ b/documentation/website/source/documentation/cheatsheet.rst @@ -5,6 +5,7 @@ Dylan Cheat Sheet * `Literals`_ * `Naming Conventions`_ * `Operators`_ +* `String Formatting`_ Literals ======== From ffa196f3b398b14b065c2b5290b66722099f06aa Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 12 Dec 2011 11:18:57 +0700 Subject: [PATCH 063/519] Fix warning about unfinished emphasis by escaping '*'. --- documentation/website/source/news/2011/12/10/new_release.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/news/2011/12/10/new_release.rst b/documentation/website/source/news/2011/12/10/new_release.rst index 31ff37f53f..6db283a19e 100644 --- a/documentation/website/source/news/2011/12/10/new_release.rst +++ b/documentation/website/source/news/2011/12/10/new_release.rst @@ -176,7 +176,7 @@ developed commercially, but is no longer. The amount of applications for the command-line compiler has been decreased from eight to four, namely dylan-compiler, dylan-environment -(including execution and debugging) and dylan-*-with-tools, which +(including execution and debugging) and dylan-\*-with-tools, which includes the tools interface (remote debugging, scepter, OLE). Also, the old pentium-dw (DylanWorks) application was removed since it From 9b12ea10a89cd869eca9096ccd3d830d2411de25 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 12 Dec 2011 11:26:40 +0700 Subject: [PATCH 064/519] Link to the newly added Intro to Dylan. --- documentation/website/source/documentation/index.rst | 6 ++++++ documentation/website/source/index.rst | 3 +++ 2 files changed, 9 insertions(+) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index 7b7348c220..f9b9de388a 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -19,6 +19,12 @@ Online Books Guides ====== +`An Introduction to Dylan `_ + + This tutorial is written primarily for those with solid programming + experience in C++ or another object-oriented static language. It + provides a gentler introduction to Dylan than does the DRM. + `Dylan Cheat Sheet `_ A cheat sheet to get you started with the basics of Dylan syntax. diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 47743e1d3f..5b596989f1 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -4,6 +4,9 @@ Welcome to Open Dylan! For more on the background and goals of the Dylan language, see the excellent :drm:`Introduction to the Dylan Reference Manual `. +For an introduction to the basic concepts of the language, see our +`introduction to Dylan `_. + Recent News =========== From 44caebf205e413dc7ae87efe829de875ccc6f927 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 12 Dec 2011 15:06:33 +0700 Subject: [PATCH 065/519] Cheet -> Cheat --- documentation/website/source/_themes/opendylan/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index b3c44b9f7f..eef76776ff 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -20,7 +20,7 @@ ('documentation/index', 'Documentation', [ ('http://opendylan.org/books/drm/', true, 'Language Specification'), ('documentation/index', false, 'Guides & References'), - ('documentation/cheatsheet', false, 'Cheet Sheet') + ('documentation/cheatsheet', false, 'Cheat Sheet') ]), ('community/index', 'Community', []), ('download/index', 'Download', []), From 0b928ec1fef7834ae778ec7833521452b56471f3 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 12 Dec 2011 23:23:21 -0500 Subject: [PATCH 066/519] Add news item about dswank, including screencast --- .../news/2011/12/12/dswank-screenshot.png | Bin 0 -> 44218 bytes .../website/source/news/2011/12/12/dswank.rst | 64 ++++++++++++++++++ .../website/source/news/recent.rst.inc | 8 +++ 3 files changed, 72 insertions(+) create mode 100644 documentation/website/source/news/2011/12/12/dswank-screenshot.png create mode 100644 documentation/website/source/news/2011/12/12/dswank.rst diff --git a/documentation/website/source/news/2011/12/12/dswank-screenshot.png b/documentation/website/source/news/2011/12/12/dswank-screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..1ae91258cfc7051b26231accac97d7b7885ec4ca GIT binary patch literal 44218 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 literal 0 HcmV?d00001 diff --git a/documentation/website/source/news/2011/12/12/dswank.rst b/documentation/website/source/news/2011/12/12/dswank.rst new file mode 100644 index 0000000000..36e708cac9 --- /dev/null +++ b/documentation/website/source/news/2011/12/12/dswank.rst @@ -0,0 +1,64 @@ +:Author: Hannes Mehnert +:Date: 2011-12-12 23:30:00 + +Development inside of Emacs using SLIME +======================================= + +We have implemented a Dylan backend for SLIME using the Open Dylan +environment-protocols API to ease development of Dylan code on UNIX. +At present, cross references, locating definitions, retrieving +argument lists, compiling, warning reports and a class browser are +implemented. + +.. figure:: dswank-screenshot.png + :align: center + +.. raw:: html + +
+ +When successfully installed, just run M-x slime to get a shell. This +is the same as the dylan-compiler shell, you can also use the same +commands. + +When you program and hit '(' or ',' or ' ', you get the argument list +of the method you are calling. + +M-x slime-dylan-browse-superclasses will show the superclass hierarchy +of the current class. M-x slime-dylan-browse-subclasses displays the +subclass hierarchy. + ++-------------------+------------------------------------------+ +| Keyboard shortcut | Effect | ++===================+==========================================+ +|M-x slime |start slime | ++-------------------+------------------------------------------+ +| , change-package | select project (in the repl buffer) | ++-------------------+------------------------------------------+ +| M-. | jump to definition | ++-------------------+------------------------------------------+ +| M-, | jump backwards | ++-------------------+------------------------------------------+ +| C-c C-k | compile project | ++-------------------+------------------------------------------+ +| C-c C-w C-a | who specializes? | ++-------------------+------------------------------------------+ +| C-c C-w C-r | who references? | ++-------------------+------------------------------------------+ +| C-c C-w C-b | who binds? | ++-------------------+------------------------------------------+ +| C-c C-w C-c | who calls? | ++-------------------+------------------------------------------+ + +Dswank uses the Open Dylan project registry, so make sure +OPEN_DYLAN_USER_REGISTRIES is set properly before starting Emacs. + + +Installation +============ + +You need the following pieces: + + * `SLIME `_ - since the CVS is a moving target, this is a safe version to use (February 2011 snapshot) + * `dylan-mode `_, and extend your ~/.emacs as documented in README) + * dswank itself is shipped with the 2011.1 release diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index 827fe19607..2688968767 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,4 +1,12 @@ +**Dswank - a SLIME back-end** +*2011-12-12* + +We developed a back-end for SLIME, the superior lisp interaction +mode for emacs. + +:doc:`Read more... ` + **New release: 2011.1** *2011-12-10* From a49169f293b91db2cf3641d412beec22b3090fb8 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Tue, 13 Dec 2011 16:13:22 -0500 Subject: [PATCH 067/519] Add links to pdf versions --- documentation/website/source/documentation/index.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index f9b9de388a..c44cdee97c 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -20,6 +20,7 @@ Guides ====== `An Introduction to Dylan `_ +[`pdf `__] This tutorial is written primarily for those with solid programming experience in C++ or another object-oriented static language. It @@ -31,15 +32,18 @@ Guides `Getting Started with Open Dylan `_ +[`pdf `__] Describes Open Dylan's interactive development environment. `Dylan Style Guide `_ +[`pdf `__] Notes and thoughts on how to format your Dylan code. `Building Applications Using DUIM `_ +[`pdf `__] Describes how to use DUIM (Dylan User Interface Manager), the portable window programming toolkit. @@ -51,6 +55,7 @@ Guides `Open Dylan Hacker's Guide `_ +[`pdf `__] A work in progress to help out people who are hacking on Open Dylan itself. @@ -65,6 +70,7 @@ References `Common Dylan and Functional Extensions library reference `_ +[`pdf `__] Describes the Open Dylan implementation of the Dylan language, a common set of Dylan libraries, and a library interchange mechanism. @@ -73,6 +79,7 @@ References `System and I/O library reference `_ +[`pdf `__] Describes Open Dylan's printing and output formatting modules, a streams module, a sockets module, and modules providing an @@ -88,6 +95,7 @@ References `C FFI and Win32 library reference `_ +[`pdf `__] Describes a foreign function interface library for interoperation with C programs, and several libraries providing a low-level interface From 5b81d52bc81c9ef258ae53826276810720c6daff Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 14 Dec 2011 10:30:43 +0700 Subject: [PATCH 068/519] Move COM / CORBA docs to out-dated section. --- .../website/source/documentation/index.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index c44cdee97c..ceab3cf7a1 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -48,11 +48,6 @@ Guides Describes how to use DUIM (Dylan User Interface Manager), the portable window programming toolkit. -`Developing Component Software with CORBA -`_ - - A tutorial and reference for CORBA interoperability using the Functional Developer ORB. - `Open Dylan Hacker's Guide `_ [`pdf `__] @@ -101,6 +96,14 @@ References with C programs, and several libraries providing a low-level interface to the Microsoft Win32 API. +Old, Out of Date Documentation +============================== + +`Developing Component Software with CORBA +`_ + + A tutorial and reference for CORBA interoperability using the Open Dylan ORB. + `OLE, COM, ActiveX and DBMS library reference `_ From 2eb6b2acc59c86d50b4eb7d3511ddfa2fc52f7f2 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 14 Dec 2011 10:47:06 +0700 Subject: [PATCH 069/519] Link to the new versions of the docs where they exist. Links to the old versions are retained as 'old HTML'. --- .../website/source/documentation/index.rst | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index ceab3cf7a1..a7e71054ec 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -30,9 +30,9 @@ Guides A cheat sheet to get you started with the basics of Dylan syntax. -`Getting Started with Open Dylan -`_ +`Getting Started with Open Dylan `_ [`pdf `__] +[`old HTML `__] Describes Open Dylan's interactive development environment. @@ -41,15 +41,14 @@ Guides Notes and thoughts on how to format your Dylan code. -`Building Applications Using DUIM -`_ +`Building Applications Using DUIM `_ [`pdf `__] +[`old HTML `__] Describes how to use DUIM (Dylan User Interface Manager), the portable window programming toolkit. -`Open Dylan Hacker's Guide -`_ +`Open Dylan Hacker's Guide `_ [`pdf `__] A work in progress to help out people who are hacking on Open Dylan itself. @@ -63,18 +62,18 @@ Publications References ========== -`Common Dylan and Functional Extensions library reference -`_ +`Common Dylan and Functional Extensions library reference `_ [`pdf `__] +[`old HTML `__] Describes the Open Dylan implementation of the Dylan language, a common set of Dylan libraries, and a library interchange mechanism. The common libraries provide many language extensions, a threads interface, and object finalization. -`System and I/O library reference -`_ +`System and I/O library reference `_ [`pdf `__] +[`old HTML `__] Describes Open Dylan's printing and output formatting modules, a streams module, a sockets module, and modules providing an @@ -88,9 +87,9 @@ References the portable window programming toolkit. It complements Building Applications Using DUIM. -`C FFI and Win32 library reference -`_ +`C FFI and Win32 library reference `_ [`pdf `__] +[`old HTML `__] Describes a foreign function interface library for interoperation with C programs, and several libraries providing a low-level interface From 23146df526727174f2f6acd8eacbee7d3f3345aa Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 14 Dec 2011 10:48:05 +0700 Subject: [PATCH 070/519] Remove reference to 'Functional Extensions'. --- documentation/website/source/documentation/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index a7e71054ec..2ec26eac6c 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -62,7 +62,7 @@ Publications References ========== -`Common Dylan and Functional Extensions library reference `_ +`Common Dylan library reference `_ [`pdf `__] [`old HTML `__] From f0d55101cbc84c1c9667e3c9cbd806bd75a2596d Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 14 Dec 2011 11:05:10 +0700 Subject: [PATCH 071/519] Renamed directory. --- documentation/website/source/documentation/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index 2ec26eac6c..cdf5a21050 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -71,8 +71,8 @@ References The common libraries provide many language extensions, a threads interface, and object finalization. -`System and I/O library reference `_ -[`pdf `__] +`System and I/O library reference `_ +[`pdf `__] [`old HTML `__] Describes Open Dylan's printing and output formatting modules, From 038f5fb00f58e4d96ca159d263a18e6698bafea5 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 14 Dec 2011 11:14:00 +0700 Subject: [PATCH 072/519] Add warning about documentation being in the middle of updating. --- documentation/website/source/documentation/index.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index cdf5a21050..ee781b52d6 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -2,6 +2,12 @@ Documentation ************* +.. warning:: We are in the process of converting over to a new documentation + publishing system. Some documents are not entirely correct yet. We've + retained links to the 'Old HTML' where relevant. These will be going away + in the near future. + :class: alert-message warning + Online Books ============ From 056606431c503f00a33987a945cea9b37964fdc8 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 15 Dec 2011 15:22:04 +0700 Subject: [PATCH 073/519] Experiment with a new layout for the documentation page. --- .../website/source/documentation/index.rst | 124 +++++++++++++----- 1 file changed, 94 insertions(+), 30 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index ee781b52d6..a9ae59f3f7 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -8,22 +8,20 @@ Documentation in the near future. :class: alert-message warning -Online Books -============ +.. raw:: html -`Dylan Reference Manual -`_ (`Errata -`_) + From 3dc82fd835e6d9b88a8be7a0d589af7adc3099fc Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 15 Dec 2011 15:58:30 +0700 Subject: [PATCH 074/519] No more dropdown menu for the documentation section. --- .../source/_themes/opendylan/layout.html | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index eef76776ff..37c781b289 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -11,19 +11,14 @@ {% endblock %} {% set css_files = css_files + ['_static/opendylan.org/css/bootstrap/1.4.0/bootstrap.min.css', '_static/opendylan.org/css/opendylan.css'] -%} -{% set script_files = script_files + ['_static/opendylan.org/js/bootstrap-scrollspy.js', - '_static/opendylan.org/js/bootstrap-dropdown.js'] -%} +{% set script_files = script_files + ['_static/opendylan.org/js/bootstrap-scrollspy.js'] -%} {% set navigation_bar = [ - ('index', 'Home', []), - ('about/index', 'About', []), - ('news/index', 'News', []), - ('documentation/index', 'Documentation', [ - ('http://opendylan.org/books/drm/', true, 'Language Specification'), - ('documentation/index', false, 'Guides & References'), - ('documentation/cheatsheet', false, 'Cheat Sheet') - ]), - ('community/index', 'Community', []), - ('download/index', 'Download', []), + ('index', 'Home'), + ('about/index', 'About'), + ('news/index', 'News'), + ('documentation/index', 'Documentation'), + ('community/index', 'Community'), + ('download/index', 'Download'), ] -%} {% set active_page = pagename|default('index') -%} @@ -42,22 +37,8 @@ Open Dylan
From 2a4c723aa3c18bb23f453992c83fb901b5aafcbb Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 15 Dec 2011 20:08:28 +0700 Subject: [PATCH 075/519] Add Paul Haahr's 1995 essay 'Procedural Dylan' with his permission. --- .../articles/procedural-dylan/1-distance.rst | 226 ++++++++ .../articles/procedural-dylan/2-quadratic.rst | 235 ++++++++ .../procedural-dylan/3-dot-product.rst | 524 ++++++++++++++++++ .../articles/procedural-dylan/index.rst | 29 + documentation/website/source/index.rst | 1 + documentation/website/source/news/index.rst | 29 +- 6 files changed, 1041 insertions(+), 3 deletions(-) create mode 100644 documentation/website/source/articles/procedural-dylan/1-distance.rst create mode 100644 documentation/website/source/articles/procedural-dylan/2-quadratic.rst create mode 100644 documentation/website/source/articles/procedural-dylan/3-dot-product.rst create mode 100644 documentation/website/source/articles/procedural-dylan/index.rst diff --git a/documentation/website/source/articles/procedural-dylan/1-distance.rst b/documentation/website/source/articles/procedural-dylan/1-distance.rst new file mode 100644 index 0000000000..65dcab076b --- /dev/null +++ b/documentation/website/source/articles/procedural-dylan/1-distance.rst @@ -0,0 +1,226 @@ +A Simple Function: Distance +--------------------------- + +To get the flavor of the language, let us first consider a few simple +Pascal subroutines and their equivalents in Dylan. Here we have a Pascal +function for calculating the distance between two points in a two +dimensional plane, using the Pythagorean theorem: + +.. code-block:: pascal + + function distance(x1: real; y1: real; x2: real; y2: real): real; + begin + distance := sqrt((x2-x1) * (x2-x1) + (y2-y1) * (y2-y1)) + end; + +and here's an equivalent function in Dylan: + +.. code-block:: dylan + + define method distance (x1 :: , y1 :: , x2 :: , y2 :: ) + => distance :: ; + sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)) + end method distance; + +Let's first look at the syntactic differences between the two functions. +First, Pascal introduces the definition with the keyword ``function`` +where Dylan uses the phrase ``define method``. ``Define`` is used in +Dylan when defining all *module variables*, which are the equivalent of +program variables, types, functions, and procedures in Pascal. We'll see +later why Dylan calls this function a *method*; for now, it is useful to +think of methods in Dylan as the same as functions in Pascal. + +The next thing to notice is that Dylan uses the double colon symbol +(``::``) to separate variables from their types; we'll see later that a +single colon is used for another purpose, which is why the double colon +is used in type declarations. Also note that the Dylan program has a +space between the variable name and the double colon. + +The next important difference between the two examples is that the name +of the type, ``real``, is enclosed in "angle brackets" (the less-than +and greater-than signs) in the Dylan version. The reason for this is +that, unlike in Pascal, types and variables live in the same *name +space* in Dylan. For example, in Pascal, one can have a type named +``list`` and a variable named ``list`` at the same time, and the meaning +of the identifier ``list`` refers to one or the other depending on +context. In Dylan, there isn't always enough context to know whether +something is a type or value -- and, in fact, types *are* values in +Dylan -- so a convention is used to separate types from non-types in +order to avoid confusion and name clashes. That convention is putting +angle brackets around the names of types. (C programmers face a similar +problem, and at least two distinct conventions have evolved: using +identifiers with the first letter capitalized or with a suffix of ``_t`` +for type names.) + +The convention for type names brings up another difference between Dylan +and Pascal: What characters are legal in names? Pascal, C, and many +traditional languages restrict the set of characters allowed in names to +the letters, digits, and perhaps a few graphical characters, such as the +underscore or dollar sign. Dylan is more flexible: all those characters +are legal, but so are many graphical characters, such as hyphens, +asterisks, question marks, exclamation marks, and, as we have seen, the +greater-than and less-than signs. The general rule is that a Dylan +identifier can't start with a digit and should contain at least one +letter, but any characters that don't otherwise have special meaning are +allowed. + +This flexibility does come at some cost: because the character set for +variable names overlaps with the character set for operators, we need to +put spaces between variable names and operators. For example, +``x2 - x1`` is two two-character long variables separated by the minus +operator and means the same thing as it does in Pascal, but ``x2-x1`` is +a single five-character long variable name in Dylan. This may seem +confusing or awkward at first to programmers not used to putting space +between variables and operators, but it adds flexibility in the choice +of names. + +Now back to the example function. In Pascal, the return type of the +function is declared with a colon, just like the type of a variable, +where Dylan uses an arrow (``=>``) combined with what looks like a +variable declaration. The return description for our function says that +the function returns the distance, and that the result has the type +````. The name used in a return description is for documentation +purposes only. Upon reflection, one might come to the conclusion that +the name is unnecessary as documentation, since the function name should +describe the meaning of the return value. Later, we'll see a reason why +Dylan puts the name in the result. + +Let's skip the contents of the function body of the function for a +moment, and notice that Pascal surrounds the body with the words +``begin`` and ``end``. Dylan is similar, except that the word ``begin`` +is omitted. All methods must have bodies, so where it begins is +implicit: right after the declaration of parameters and return values. +The word ``method`` and the name of the method are repeated after the +word ``end``; both ``method`` and the name are optional after the +``end``, but I personally prefer to put them in, so I've done that here. +Individual styles vary, and people who think that the words after +``end`` clutter the program are free to leave them out. + +Now, let's look at the bodies of the functions. Aside from the spaces +separating the operators from the variable names in the Dylan version, +there is one major difference. In Pascal, the pseudo-variable with the +same name as the function, ``distance``, is assigned the value to return +from the function. In Dylan, on the other hand, the body is treated as +an expression, and the value of that expression is returned by the +function. If that body contains multiple statements or expressions +separated by semicolons, the function returns whatever the last +expression returns. (C is different from both Dylan and Pascal in this +regard: it uses the ``return`` statement to both return the value and +exit immediately from the function.) + +The last important detail to notice is that, aside from the issue of +spaces, the expression used to calculate the distance is the same in +both Dylan and Pascal. + +-------------- + +In Pascal, the programmer has to declare types for all variables, +parameters, and functions. In Dylan, type declarations may be omitted; +if no type is declared for a variable, any value may be used. Similarly, +the description of what a method returns may be left out. Thus a more +concise version of distance would be: + +.. code-block:: dylan + + define method distance (x1, y1, x2, y2) + sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)) + end method distance; + +When used with four real numbers, this distance function produces the +same result as the original. But this version will work just as well on +integers. (In fact, the original version also works on integers, because +the type ```` is a *subtype* of ````; that is, all +integers are also reals, which matches our mathematical intuition. The +type ```` in Dylan corresponds more directly with Pascal's +``real`` type.) + +Since any value can be used as an argument to distance, what happens if +we use something which doesn't make sense, like +``distance(0, 0, 3, "four")``? The function starts as normal, but when +it tries to subtract ``0`` from ``"four"``, the program stops with an +error, since it makes no sense to subtract a number from a string. If +we had used the original version of the distance function, we would have +gotten the error when we tried to call distance. + +For now, we'll omit most type declarations in our Dylan examples. Later, +we'll see some of the reasons for using them other than catching errors. + +-------------- + +Looking back at the distance function, we see that the subtraction +``x2 - x1`` is done twice in order to multiple the result by itself; the +same is then done for the y values. To reduce the work that the function +does, we can store the results of the subtractions in local variables. +(Many compilers will do this kind of optimization -- known as *common +subexpression elimination* -- without requiring the code to be +rewritten.) In Pascal, that might look like: + +.. code-block:: pascal + + function distance(x1: real; y1: real; x2: real; y2: real): real; + var + deltaX, deltaY: real; + begin + deltaX := x2 - x1; + deltaY := y2 - y1; + distance := sqrt(deltaX * deltaX + deltaY * deltaY) + end; + +which could be written in Dylan as + +.. code-block:: dylan + + define method distance (x1, y1, x2, y2) + let delta-x = x2 - x1; + let delta-y = y2 - y1; + sqrt(delta-x * delta-x + delta-y * delta-y) + end method distance; + +First, we see that where Pascal puts the definition of the local +variables in a separate section of the function definition, Dylan puts +them in the body. Next, we see that the definition of the local +variables includes the initialization. In general, when you define a +variable in Dylan, you give it a value at the same time -- in this way, +you do not have to worry about initialized variables. + +Also notice that where, in Pascal, ``mixedCaseNames`` are often used to +separate words in long identifiers, Dylan conventionally uses +``hyphen-separated-names``. + +-------------- + +Another way to rewrite the distance function to only do the +subtractions once would be to abstract out the squaring operation as a +local function. In Pascal, this would look like: + +.. code-block:: pascal + + function distance(x1: real; y1: real; x2: real; y2: real): real; + function square(n: real): real; + begin + square := n * n + end; + begin + distance := sqrt(square(x2 - x1) + square(y2 - y1)) + end; + +which could be written in Dylan as + +.. code-block:: dylan + + define method distance (x1, y1, x2, y2) + local method square (n :: ) + n * n + end method square; + sqrt(square(x2 - x1) + square(y2 - y1)) + end method distance; + +Like local variables created with ``let``, local methods can appear +anywhere inside a body. + +-------------- + +`Next -- Conditions and Multiple Values: The Quadratic +Formula <2-quadratic.html>`_ + +Copyright © 1995 Paul Haahr. All rights reserved. diff --git a/documentation/website/source/articles/procedural-dylan/2-quadratic.rst b/documentation/website/source/articles/procedural-dylan/2-quadratic.rst new file mode 100644 index 0000000000..93f9565667 --- /dev/null +++ b/documentation/website/source/articles/procedural-dylan/2-quadratic.rst @@ -0,0 +1,235 @@ +Conditions and Multiple Values: The Quadratic Formula +----------------------------------------------------- + +Now we'll look at a slightly more complex function, one which finds the +roots of a quadratic equation. A Pascal version of such a function might +be: + +.. code-block:: pascal + + (* Solve quadratic equation, putting roots in root1 and root2 + and returning the number of roots found. *) + function solveQuadratic(a, b, c: real; var root1, root2: real): int; + var + discriminant: real; + sqrtDiscriminant: real; + begin + discriminant := b * b - 4.0 * a * c; + if discriminant < 0.0 then + solveQuadratic := 0 + else if discriminant = 0.0 then + begin + solveQuadratic := 1; + root1 := -b/(2.0 * a) + end + else + begin + solveQuadratic := 2; + sqrtDiscriminant := sqrt(discriminant); + root1 := (-b + sqrtDiscriminant)/(2.0 * a); + root2 := (-b - sqrtDiscriminant)/(2.0 * a) + end + end; + +There are a few things to note here. The first is the interface to the +function: since we want to return up to two separate numbers, but maybe +zero or one in the degenerate cases, we can't just use the normal +paradigm of returning the result, because Pascal lets functions accept +many values, but return only one. To work around this restriction, we +return an integer indicating how many roots there were, and use ``var`` +parameters (also known as *call by reference parameters*) to pass the +actual results from the function back to its caller. In order for this +mechanism to work, the function which calls ``solveQuadratic`` must +define two variables for receiving the results. The caller also has to +be careful not to use the variable ``root2`` if there was only one root +returned. Other approaches, such as returning a record containing the +roots and the number of roots found, are also possible. + +There are several other things worth mentioning. The local variable +``sqrtDiscriminant`` is defined for the entire function, even though it +is only used in the body of the second ``else`` clause. Because Pascal +is strongly typed and does not allow operations between integers and +real numbers, we have to write all the constants, even though they are +integers, as real numbers in decimal notation. Finally, we see that the +body of the first ``if`` clause does not have a ``begin`` and ``end`` +because it is a single statement. + +-------------- + +A Dylan function for the same operation would have a different +interface, at very least because Dylan does not have ``var`` +parameters. Here's one approach: + +.. code-block:: dylan + + // Solve quadratic equation, returning the roots + define method solve-quadratic(a, b, c) => (root1, root2); + let discriminant = b * b - 4 * a * c; + if (discriminant < 0) + values() + elseif (discriminant = 0) + values(- b / (2 * a)) + else + let sqrt-discriminant = sqrt(discriminant); + values((- b + sqrt-discriminant) / (2 * a), + (- b - sqrt-discriminant) / (2 * a)) + end if + end method solve-quadratic; + +The first thing we notice is the notation for comments. Dylan has two +forms of comments. The sequence ``//`` introduces a comment that +continues to the end of the line; all the intervening text is ignored by +the language. The sequence ``/*`` introduces a block comment that +encloses all the text up to a ``*/``; the enclosed text is ignored +except that pairs of ``/*`` and ``*/`` inside the comment are matched, +so block comments nest. The nesting property of block comments means +that it is safe to use ``/*`` and ``*/`` to comment out code even if +that code contains block comments. (Dylan shares this comment convention +with C++, except that in C++, block comments don't nest.) + +The most significant difference between this function and the Pascal +version is what it returns. For the Dylan function, the comment says +"returning the roots," and that is what it does. In Pascal, C, Fortran, +and, in fact, most programming languages, a function can take an +arbitrary number of arguments but the number of values returned can be +only zero or one. (In Pascal, a function returning no values is called a +procedure.) In Dylan, functions can return as many values as are +appropriate for the task at hand, just as they can accept as many +arguments as make sense. + +How does a function return multiple values? We saw earlier that a +function returns the value of the last expression that makes up its +body. There is a built-in function named values which returns all of its +arguments. By calling values as the last statement of a body, the +arguments passed to values are used as the value of the body. For +example, the following method could be used to return the sine and +cosine of an angle: + +.. code-block:: dylan + + define method sincos (angle) => (sin :: , cos :: ); + values(sin(angle), cos(angle)) + end method sincos; + +To use both values returned returned by ``sincos``, one uses a special +form of ``let`` which is said to *accept multiple values*: + +.. code-block:: dylan + + let (s, c) = sincos(theta); + ... + +Inside the body of the let, the variable s will hold the sine of theta +and c the cosine. Note, by the way, the return declaration for +``sincos`` indicates that the method returns two real numbers. The +reason that names are used in return declarations is to document which +value is which in the case of multiple-value returning functions. + +As a special but typical case, when you are calling a function that +returns more than one value and you are only interested in the first +value, you don't have to bind the values with let, you can just use the +function as an expression. In fact, there is no difference between +calling a function that returns one value and calling a function that +returns multiple values if you only want the first value returned. + +Let's return to our quadratic equation solver. To see what the function +returns, we have to look for the last expression in the body. In this +case, the last statement is an ``if`` statement. In Dylan, an ``if`` +statement is an expression and can be used anywhere a value is expected. +The value of an if statement is the value of the body of the branch that +is taken. For example, in the simple case of: + +.. code-block:: dylan + + if (even?(n)) + "even" + else + "odd" + end if + +If the number ``n`` is even, the value of the if statement is the string +``"even"``; otherwise, the value is the string ``"odd"``. Incidentally, +Dylan is classified as an "expression language" because all statements +can return values and be used as expressions. + +In Pascal and C, one can construct a series of tests by putting if +statements in the ``else`` clause of another ``if`` statement. In Dylan +``elseif`` is one word and not two, and the ``elseif`` branch is +actually part of the if statement. There can be any number of ``elseif`` +clauses between the ``if`` clause and the optional ``else`` clause. + +In ``solve-quadratic``, the last statement of every branch of the ``if`` +statement is a call to ``values``. If the first test is true, ``values`` +is called with no arguments, so the function returns no values. If the +test for the ``elseif`` clause is true, the function returns one value, +the single root. (In this case, the call to values is unnecessary, but +it is useful as documentation to contrast with the cases where zero and +two values are returned.) Finally, if there are two roots, both are +returned. + +How is this function used? In particular, how does a caller determine +how many roots were found? If a caller is expecting more results than a +function returns, all the variables for which no value was returned are +given the false value. So, for example, we could write a function to +count the number of roots as + +.. code-block:: dylan + + define method number-of-quadratic-roots(a, b, c) + let (r1, r2) = solve-quadratic(a, b, c); + if (r2) + 2 + elseif (r1) + 1 + else + 0 + end if + end method number-of-quadratic-roots; + +-------------- + +Before we leave this example behind, let's look at another way to write +it in Dylan, keeping the same interface: + +.. code-block:: dylan + + // Solve quadratic equation, returning the roots + define method solve-quadratic(a, b, c) => (root1, root2); + let discriminant = b * b - 4 * a * c; + case + negative?(discriminant) => + values(); + zero?(discriminant) => + values(- b / (2 * a)); + otherwise => + let sqrt-discriminant = sqrt(discriminant); + values((- b + sqrt-discriminant) / (2 * a), + (- b - sqrt-discriminant) / (2 * a)) + end case + end method solve-quadratic; + +There are two differences here. First, the ``if`` statement has been +rewritten as a ``case`` statement. A ``case`` statement contains a +series of tests and bodies, separated by the arrow symbol. The tests are +checked in order and the clause that corresponds to the first test which +evaluates to true is run, and the value of that clause is used as the +result of the whole statement. The last test in a ``case`` statement may +be ``otherwise``: the ``otherwise`` clause is used if none of the tests +are true. ``Case`` statements are often easier to read than long chains +of ``elseif`` statements, but choosing one or the other is simply a matter +of personal style. + +Also, the tests have been changed from explicit comparisons with zero to +calls to function which do those tests. There is no real difference +between writing ``x < 0`` and ``negative?(x)``, but sometimes one form +is clearer than the other. A function which returns a boolean value is +called a *predicate* in Dylan, and, by convention, the names of +predicates end in question marks, as we can see from ``negative?`` and +``zero?``. + +-------------- + +`Back -- A Simple Function: Distance <1-distance.html>`_ + `Next -- Iteration and Sequences: Dot Product <3-dot-product.html>`_ + +Copyright © 1995 Paul Haahr. All rights reserved. diff --git a/documentation/website/source/articles/procedural-dylan/3-dot-product.rst b/documentation/website/source/articles/procedural-dylan/3-dot-product.rst new file mode 100644 index 0000000000..e54de6624a --- /dev/null +++ b/documentation/website/source/articles/procedural-dylan/3-dot-product.rst @@ -0,0 +1,524 @@ +Iteration and Sequences: Dot Product +------------------------------------ + +The next function we'll look at calculates the inner product, or *dot +product*, of two one-dimensional arrays of numbers. This is defined as +the sum of the pairwise products of numbers from the arrays. As an added +complication, we'll not fix the length of the arrays, so our Pascal +version will use conformant arrays, a late addition to the language. + +.. code-block:: pascal + + function dotProduct(x: array[xlo..xhi: integer] of real, + y: array[ylo..yhi: integer] of real): real; + var + i: integer; + sum: real; + begin + if (xhi - xlo <> yhi - ylo) + error("dotProduct: arrays of different lengths"); + sum := 0.0; + for i := xlo to xhi do + sum := sum + x[i] * y[i - xlo + ylo]; + dotProduct := sum + end; + +Because a dot product only makes sense for arrays of the same length, we +need to check that the arrays have the same length before proceeding. +Since Pascal has no built-in error-handling facilities, we've invented a +minimal interface -- a procedure named ``error`` which takes a string +description of the error -- that has to be implemented on every +different system using non-standard facilities. + +There is one other complication worth mentioning here. Since the two +arrays can have different lower bounds and the loop index ``i`` starts +at the value for the array ``x``, it has to be adjusted before being +used as a subscript for ``y``. + +-------------- + +Our first Dylan version of this function uses a while loop: + +.. code-block:: dylan + + define method dot-product (x, y) + if (size(x) ~= size(y)) + error("dot-product: arrays of different lengths") + end if; + let sum = 0; + let i = 0; + while (i < size(x)) + sum := sum + x[i] * y[i] + end while; + sum + end method dot-product; + +Let's first look at the syntactic differences. Other than using ``~=`` +for the "is not equal to" relationship, Dylan is very similar to Pascal +for the operations needed in this function. The operator ``:=`` is used +for assignment to an existing variable (as opposed to ``=``, which is +used for setting the initial value for a variable created with ``let``) +and the notation *array*``[``*index*``]`` is used for subscripting. As +with ``if``, the ``while`` statement is always ended with ``end``, and +no explicit ``begin`` is needed. + +The main difference between these two functions is in how they +manipulate the arrays. When declaring an array in Pascal, a programmer +specifies both the lower and upper bound; these bounds can be integers, +characters, or enumerated types. In this regard, Dylan is less flexible +than Pascal: arrays are always indexed with increasing integers starting +at zero. (Many other languages, such as C, share this restriction. +Fortran is similar, but it starts all arrays at one.) + +In standard Pascal, the length of all arrays must be known ahead of +time. The one exception to this is the conformant array feature of ISO +Pascal, where the bounds of the array are treated as an extra set of +parameters to a function which accepts an array as an argument. In +Dylan, all arrays carry with them their length, so we only have to +specify the size of an array when it is not already known, such as when +the array is first created. The function ``size`` is used to obtain the +length of the array. For any array ``a``, the valid indexes of the array +are from ``0`` to ``size(a) - 1``; that is, ``size(a)`` elements, +starting at zero. + +One more thing to note is that, in Pascal, we had to invent the +``error`` procedure and say that it is implemented in some +platform-dependent way. Our Dylan version also calls a function named +``error``, but this function is a part of the Dylan language. The full +behavior of ``error`` is rather complicated and beyond the scope of this +tutorial -- Dylan has a powerful exception handling and recovery +mechanism for dealing with and possibly correcting errors discovered +while a program is running -- but if you're running the program in a +debugger, a call to error will generally result in the debugger stopping +the program and reporting the message. + +-------------- + +The original Pascal version of this function used a ``for`` loop, which +has a direct equivalent in Dylan, as we see in this version of the +function: + +.. code-block:: dylan + + define method dot-product (x, y) + unless (size(x) = size(y)) + error("dot-product: arrays of different lengths") + end unless; + let sum = 0; + for (i :: from 0 to size(x) - 1) + sum := sum + x[i] * y[i] + end for; + sum + end method dot-product; + +We've changed the error check at the beginning of the function from an +``if`` statement to an ``unless``, which executes its body if the +condition is false. Sometimes, often with error checks, it is clearer to +write a conditional with ``unless`` than with an ``if`` that tests the +opposite condition. Note that there is no ``else`` clause for +``unless``; if you need to do one thing if something is true and another +if it is false, use ``if`` or ``case``. + +The ``for`` loop in Dylan takes several forms, one of which we see +above, which is called a *numeric for clause*. The syntax of ``for`` in +Dylan is similar to the ``while`` statement, except instead of a +condition inside parentheses, we have a clause that describes the loop. +A numeric for clause counts from a number to some other. In this case, +the for-clause counts from zero to one less than the size of the array. +The syntax of the clause is straightforward: + + ``variable from initial-value to bounding-value`` + +As in Pascal's ``for`` statement and unlike the ``while`` loop, the +initial value and the bounding value are evaluated exactly once, before +the first iteration of the loop. + +Unlike the Pascal ``for`` loop, Dylan's ``for`` defines the loop +variable -- ``i`` in this example -- as part of its job. That is, no +declaration of ``i`` outside the loop is needed or used. This also means +that the loop variable can't be used outside the body of the loop. (I +included a type declaration for ``i`` above, just to show that one could +be used; typically, it would be omitted.) + +-------------- + +The for loop above is not very typical Dylan code. If written first in +Dylan, it might look more like this, taking advantage of a few +constructs that don't correspond directly to ones in Pascal: + +.. code-block:: dylan + + define method dot-product (x, y) + let sum = 0; + for (i from 0 below x.size) + sum := sum + x[i] * y[i] + finally + sum + end for + end method dot-product; + +(We've eliminated the error check at the beginning of the function from +this and future versions, not because it is unnecessary, but because it +would stay the same -- there is no need to repeat it.) + +We see here a slight variation on numeric iteration. The word ``to`` in +the iteration clause has been changed to ``below``. While ``to`` means +all values between the initial value through, and including, the final +value, ``below`` means all those values from the initial value that are +less than, but not equal to, the bounding value. + +In addition to what we've seen here, numeric iteration clauses can use +the ``by`` keyword, which introduces an amount to count by, as in +Pascal. The ``by`` phrase can be omitted, as we've seen, in which case +the value is incremented by one each time through the loop. Also, we can +identify the ending condition with ``above``, the opposite of ``below``, +which means the loop runs while the values are greater than the bound. +The ending condition can even be omitted, which leaves a (potentially) +infinite loop -- something other than finishing the numeric iteration +would have to happen to terminate the loop. + +The value specified by ``below`` in the loop is also a new construct, +``x.size``. This is a Dylan shorthand for calling a function of one +argument. That is, *expression``.``function-name* is the same thing as +*function-name``(``expression``)``*. So the expression here is exactly +the same as ``size(x)``, just written somewhat differently. (The +hecklers in the audience might observe that it isn't much of a +shorthand: just one fewer character.) + +Pascal and C programmers, among others, are used to using the syntax +*expression*``.``*name* for referring to fields of a compound object +like a record. It makes sense to wonder why this notation was chosen for +something else in Dylan, especially when that something else -- calling +functions -- already had a perfectly reasonable syntax. The reason is +that calling a function in Dylan is the only way to access fields in +compound objects; we'll see more of this later. + +The last thing to note about this version of the function is that the +``for`` statement is the last one in the function, so the value returned +by ``dot-product`` is the value of the ``for``. What value does the loop +return? Normally, there is no meaningful value to return from a loop, so +an arbitrary one -- the false value -- was picked in Dylan. But +sometimes it's useful to return a value from a loop, and that's what the +``finally`` clause is for. After the ``for`` loop is done, all the +statements in the ``finally`` clause -- here it's just one expression -- +are evaluated, and the value of the last is returned. One detail worth +knowing is that the statements after ``finally`` are still part of the +``for`` statement, so the variable from the numeric iteration clause can +still be used. + +-------------- + +All our versions of ``dot-product`` so far have worked in basically the +same way: step through the arrays by counting from 0 to one less than +the size of the array, and doing something with each element in the +array. This is all we use the variable ``i`` for, and it's pretty common +that loop variables are used in this way. Dylan provides a very +convenient way of doing this kind of iteration, using what's known as a +*collection iteration clause*: + +.. code-block:: dylan + + define method dot-product (x, y) + let sum = 0; + for (xi in x, yi in y) + sum := sum + xi * yi + finally + sum + end for + end method dot-product; + +Here we've done away with the numeric iteration clause, and replaced it +with two collection iteration clauses. Note that a ``for`` loop may have +an arbitrary number of iteration clauses, and when any of them +completes, the loop is done. The iteration clause *variable* ``in`` +*expression*, where the expression is an array, means execute the loop +for each element in the array, from first to last, setting the variable +to each value in succession. Thus the first time the loop executes, +``xi`` holds the value ``x[0]`` and ``yi`` holds ``y[0]``; the second +time through, ``xi`` holds ``x[1]`` and ``yi`` holds ``y[1]``; and so +on. + +The use of multiple iteration clauses in a ``for`` is relatively common. +Note that a single loop can mix numeric and collection iteration clause, +along with a third form, general iteration, which we'll see later. The +important thing to realize is that the loop ends when *any* of the +clauses causes it to end. + +Again, we haven't declared types for the parameters ``x`` and ``y`` and +have just referred to them as arrays. This is inaccurate in two ways. +The first, and more minor, is that one-dimensional arrays are referred +to as *vectors* in Dylan. While the code will work on multi-dimensional +arrays, it doesn't really make mathematical sense except for vectors -- +there is no dot product of an array of two or more dimensions. + +The more important reason that describing the arguments to +``dot-product`` as arrays is wrong is that this function will work for +other types of arguments as well. Dylan has several different types +known collectively as *sequences*, all of which share several +properties: they hold a collection of objects which are numbered from +zero. Vectors are one kind of sequence; others are strings, linked +lists, ranges of numbers, and queues. The subscripting notation using +``[]``, the ``size`` function, and collection iteration clauses -- among +many other operations -- may be used with all sequences. + +Sequences are just one kind of *collection* in Dylan. A collection is a +kind of object which can hold other objects. The most commonly used +collection which isn't a sequence is a *table*, which is Dylan's +built-in version of a hash table. Where sequences use integers starting +at zero as indexes, tables can use any object. + +Collections are used extensively by most Dylan programs. This should not +be a surprise to people who know Pascal: many complex data structures in +Pascal programs are collections of other objects, usually built up from +arrays, linked lists, etc. One major difference is that where Pascal +only defines the array type, in Dylan there are a variety of existing +collection types to use. Moreover, there is powerful set of operations +predefined on collections and sequences; we'll see two of these in our +next version of ``dot-product``. + +Another aspect of collections is that users can define their own +collection types. Again, this is no surprise. What is different from +Pascal is that, when programmers follow a few rules when creating a new +kind of collection, it can be used with any of the predefined functions +that operate on collections. We'll see more about this in a later +section. + +Turning back to the example at hand, there is one more thing to +understand about using collection iteration clauses instead of numeric +iteration and indexing: the performance impact of the choice. When we +used numeric iteration, to calculate the dot-product we had to evaluate +``x[i]`` and ``y[i]`` each time through the loop. For vectors this makes +perfect sense, as indexing into a vector is an efficient operation. But +if ``x`` is a linked list, for example, finding ``x[i]`` requires +stepping through the first ``i - 1`` elements of the list, which makes +evaluating ``x[i]`` inside the loop an expensive operation. In more +precise terms, it changes the computational complexity of the function +from *O(n)* for vectors to *O(n^2)* for lists, where *n* is the length +of the arguments. + +On the other hand, collection iteration is designed to be efficient when +possible. For both linked lists and arrays, iterating through the +collection takes time proportional to the length of the list, so the +version of ``dot-product`` which uses collection iteration has *O(n)* +complexity for both vectors and lists. In general, one should use +collection iteration when iterating over the elements of a collection +without concern for what their index values are. + +-------------- + +Now let's take a look at a very different version of ``dot-product``, +this time using two built-in collection operations, ``reduce`` and +``map``: + +.. code-block:: dylan + + define method dot-product (x, y) + local method add(a, b) + a + b + end method add; + local method multiply(m, n) + m * n + end method mul; + let x*y-sequence = map(multiply, x, y); + reduce(add, 0, x*y-sequence) + end method dot-product; + +The thing to note about this function is that there is no explicit +iteration clause. Instead, the iteration is done by the built-in +functions. + +Let's carefully step through what this function does. First, it defines +two local functions -- ``add`` and ``mul`` -- which, respectively, add +and multiply their arguments. It then calls the function ``map``. +``Map`` is what is known as a *higher-order function*, which means it is +a function that takes a function as an argument. ``Map`` creates a new +collection from the results of calling a function on each element of one +or more existing collections. The first argument to ``map`` is the +function to use; all the other arguments are collections to draw +elements from. In this case, we've applied ``map`` to the function +``multiply`` and the two sequences which were arguments, so it produces +a sequence that has ``x[0] * y[0]`` as its first element, +``x[1] * y[1]`` as its second, and so on. (The resulting sequence is +only as long as the shorter of the original sequences. If one is longer, +only the elements which have corresponding members in the shorter +sequence are used. As above, we'll assume that the sequences are of the +same length.) + +The result of map, a sequence of the products of the elements of ``x`` +and ``y`` is then attached to the local variable named ``x*y-sequence``. +There's nothing special about the use of the asterisk in this name -- +it's just one of the characters which is legal in Dylan as part of a +name -- but sometimes it is convenient to name a variable with a +mathematical expression. + +Next, we call the function ``reduce``, which is also a higher-order +function. Where ``map`` applies a function to the elements of one or +more collections to produce a new collection, ``reduce`` combines the +elements of a collection with a function to produce a single value. +``Reduce`` takes three arguments: a function, an initial value, and a +collection. It keeps track of the result value, which starts off as the +initial value argument. For each element of the collection, it computes +the result of the function called with the value of the result so far +and the current element, and uses that as the next value of the result. +When every element of the collection has been seen, the value that has +been computed so far is retuned. + +In our call to ``reduce``, the function used for combining values is +``add``, which sums two numbers, and the initial value is ``0``, which +is the identity for addition. Therefore, this call to ``reduce`` +produces the sum of the members of a collection. In this case, the +collection being summed contains the products of the elements of the +arguments, so the result is the dot product. + +However, there is a potential drawback to using this approach for +implementing ``dot-product``: it might be less efficient than a version +that directly used a loop. The reason is that memory might have to be +allocated for the intermediary result ``x*y-sequence``, and allocating +that memory takes some time, as does freeing it when it is no longer in +use. (Dylan uses *garbage collection*, also known as *automatic storage +reclamation*, to free memory that isn't being used anymore, but whether +the programmer or the system does it, freeing the memory does take some +time. A full discussion of garbage collection is beyond the scope of +this essay.) So we potentially have a bigger (more memory) and slower +(more time) program. A very clever compiler could eliminate this use of +extra memory, perhaps by inlining the functions and rewriting them +internally as loops, but programmers concerned with efficiency probably +shouldn't count on such an optimization unless they know their compiler +very well. + +By the way, there is nothing special about higher-order functions: +anyone can write them. Here, for example, is a portable version of +``reduce``, which could be used if it wasn't already part of the +language: + +.. code-block:: dylan + + define method reduce + (function :: , initial, collection :: ) + => value; + let result = initial; + for (element in collection) + result := function(result, element) + finally + result + end for + end method reduce; + +This implementation is a direct translation into Dylan of the +description given above. For once, I've given types for the arguments, +because that's how the types are specified by the language definition. +The major difference from other functions we've seen so far is an +argument, ``function``, is used as a function, inside the ``for`` loop; +that works just as one might expect it to. + +-------------- + +The previous version of ``dot-product`` used three locally-bound +identifiers (``add``, ``multiply``, and ``x*y-sequence``) that were only +used once. As in Pascal, if an expression is used only once, there is no +need to associate it with a name. Unlike Pascal, though, functions in +Dylan are expressions, and can be created anonymously, that is, without +names. So we can rewrite ``dot-product`` as: + +.. code-block:: dylan + + define method dot-product (x, y) + reduce(method (a, b) a + b end, + 0, map(method (m, n) m * n end, x, y)) + end method dot-product; + +In this version of ``dot-product``, the function we use as the first +argument to ``reduce`` is the expression: + +.. code-block:: dylan + + method (a, b) + a + b + end + +This expression creates a method -- with exactly the same meaning as the +``add`` method from our previous version -- but doesn't give it a name. +Nonetheless, this method can be used anywhere ``add`` could have been. +Similarly, ``multiply`` has been changed to another anonymous method. + +We also eliminated the variable ``x*y-sequence``, substituting the +``map`` expression for it in the call to ``reduce``. The meaning of the +function hasn't changed, however, so the potential inefficiency of +allocating extra memory for the result of ``map`` remains. + +The full syntax for an anonymous method is + +.. code-block:: dylan + + method (arguments ...) => results ...; + body + end method + +and, as with all other methods, the description of the results and the +word ``method`` after ``end`` can be omitted. Since it doesn't have a +name, there is no name to put after the ``end method``. + +-------------- + +These examples of ``map`` and ``reduce`` have been somewhat artificial +in order to introduce the use of higher-order functions. A version of +``dot-product`` in Dylan would more likely be written as: + +.. code-block:: dylan + + define method dot-product (x, y) + reduce(\+, 0, map(\*, x, y)) + end method dot-product; + +In the previous two examples, we created a function which took two +arguments and added them. The first time it was named ``add``; the +second, it was anonymous and passed as the first argument to ``reduce``. +In fact, there is no real need to create such a function, because one +already exists: it's called ``+``. + +Because ``+`` is normally used as an operator in traditional arithmetic +notation, it is easy to forget that it's a function. In Pascal and C, in +fact, operators like ``+`` have different rules from functions and can't +just be used like any other function, but in Dylan they can. To avoid +syntactic confusion with ``+`` used as an operator, when, for example, +we refer to the function name in order to pass it as an argument to +another function we have to precede it with a backslash, as above. + +This function has the same result as the previous two, but we have +avoided introducing the intermediate functions and let ``map`` and +``reduce`` call ``*`` and ``+`` directly. + +This version of ``dot-product`` is very concise and, for a programmer +used to ``map`` and ``reduce``, easy to read. There are some very common +idioms in Dylan built around these and other operators. For example, +there is no built-in function to sum a sequence: ``reduce`` obviates the +need for it. + +The use of higher-order functions is usually associated with the +*functional* style of programming, which is identified with languages +such as Standard ML, Haskell, and some dialects of Lisp, notably Scheme. +In Dylan it is often convenient to use this style for parts of programs +-- often those dealing with operations on collections, as we've seen -- +and use other styles, such as object-oriented or procedural, in other +parts. One of the goals for Dylan is to support multiple styles, because +there is no one single, "right" way to structure a program. The +functional style is a useful one, and is well supported in Dylan; we'll +see more of it later. + +On the other hand, it is possible to take this approach to extremes and +write large, complicated expressions with no named intermediate values. +While some people enjoy writing large blocks of code that way, the +result is often an unreadable program. APL, another language which makes +pervasive use of higher-order functions, is often criticized for +encouraging a "write-only" programming style, with very complex +expressions. Introducing a few named values with ``let`` or splitting +one method into several that calculate different parts of a result can +often turn a large, hard-to-follow expression into something more +readable and maintainable. + +-------------- + +`Back -- Conditions and Multiple Values: The Quadratic +Formula <2-quadratic.html>`_ + +Copyright © 1995 Paul Haahr. All rights reserved. diff --git a/documentation/website/source/articles/procedural-dylan/index.rst b/documentation/website/source/articles/procedural-dylan/index.rst new file mode 100644 index 0000000000..e812937174 --- /dev/null +++ b/documentation/website/source/articles/procedural-dylan/index.rst @@ -0,0 +1,29 @@ +Procedural Dylan +================ + +or How to write Pascal programs in Dylan +---------------------------------------- + +Dylan is promoted as an object-oriented, dynamic language, but it also +offers a rich set of constructs for programming in other styles. This +essay explores Dylan from the perspective of a programmer used to +traditional procedural languages, such as Pascal or C, who may want to +use the facilities offered by Dylan development environments without +changing programming style or thinking in a different way. Also, some +features of Dylan which mesh well with the procedural programming style +but have no direct analogs in Pascal or C may make an appropriate +addition to one's bag of tricks. + +This essay is intended to be used as a tutorial introduction and not as +a complete reference work. To avoid bogging down the discussion, much +has been omitted and some details have been ignored. For more complete +information, see the `Dylan Reference Manual `__. + +.. toctree:: + :titlesonly: + + 1-distance + 2-quadratic + 3-dot-product + +Copyright © 1995 Paul Haahr. All rights reserved. diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 5b596989f1..69072e7861 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -18,5 +18,6 @@ Recent News :glob: */* + articles/*/* news/*/*/*/* diff --git a/documentation/website/source/news/index.rst b/documentation/website/source/news/index.rst index 9e7b88a60c..52d6d7c2df 100644 --- a/documentation/website/source/news/index.rst +++ b/documentation/website/source/news/index.rst @@ -1,6 +1,29 @@ -**** -News -**** +*************** +News & Articles +*************** + +.. raw:: html + +
+
+ +

News

.. include:: recent.rst.inc +.. raw:: html + +
+
+ +

Articles

+ +`Procedural Dylan <../articles/procedural-dylan/index.html>`_ by Paul Haahr. + + This essay explores Dylan from the perspective of a programmer used to + traditional procedural languages, such as Pascal or C. + +.. raw:: html + +
+
From 06a5e49e0c3c6692655aeb15e8cb759df9291bd6 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 15 Dec 2011 20:23:39 +0700 Subject: [PATCH 076/519] Fix some formatting errors in 'Procedural Dylan'. --- .../source/articles/procedural-dylan/2-quadratic.rst | 3 +-- .../source/articles/procedural-dylan/3-dot-product.rst | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/documentation/website/source/articles/procedural-dylan/2-quadratic.rst b/documentation/website/source/articles/procedural-dylan/2-quadratic.rst index 93f9565667..a1e6545db2 100644 --- a/documentation/website/source/articles/procedural-dylan/2-quadratic.rst +++ b/documentation/website/source/articles/procedural-dylan/2-quadratic.rst @@ -229,7 +229,6 @@ predicates end in question marks, as we can see from ``negative?`` and -------------- -`Back -- A Simple Function: Distance <1-distance.html>`_ - `Next -- Iteration and Sequences: Dot Product <3-dot-product.html>`_ +`Back -- A Simple Function: Distance <1-distance.html>`_ | `Next -- Iteration and Sequences: Dot Product <3-dot-product.html>`_ Copyright © 1995 Paul Haahr. All rights reserved. diff --git a/documentation/website/source/articles/procedural-dylan/3-dot-product.rst b/documentation/website/source/articles/procedural-dylan/3-dot-product.rst index e54de6624a..c5e4834e24 100644 --- a/documentation/website/source/articles/procedural-dylan/3-dot-product.rst +++ b/documentation/website/source/articles/procedural-dylan/3-dot-product.rst @@ -58,7 +58,7 @@ for the "is not equal to" relationship, Dylan is very similar to Pascal for the operations needed in this function. The operator ``:=`` is used for assignment to an existing variable (as opposed to ``=``, which is used for setting the initial value for a variable created with ``let``) -and the notation *array*``[``*index*``]`` is used for subscripting. As +and the notation ``*array*[*index*]`` is used for subscripting. As with ``if``, the ``while`` statement is always ended with ``end``, and no explicit ``begin`` is needed. @@ -179,14 +179,14 @@ would have to happen to terminate the loop. The value specified by ``below`` in the loop is also a new construct, ``x.size``. This is a Dylan shorthand for calling a function of one -argument. That is, *expression``.``function-name* is the same thing as -*function-name``(``expression``)``*. So the expression here is exactly +argument. That is, ``expression.function-name`` is the same thing as +``function-name(expression)``. So the expression here is exactly the same as ``size(x)``, just written somewhat differently. (The hecklers in the audience might observe that it isn't much of a shorthand: just one fewer character.) Pascal and C programmers, among others, are used to using the syntax -*expression*``.``*name* for referring to fields of a compound object +``expression.name`` for referring to fields of a compound object like a record. It makes sense to wonder why this notation was chosen for something else in Dylan, especially when that something else -- calling functions -- already had a perfectly reasonable syntax. The reason is From ba1064f3927e24bbe173adcf94353ee844763313 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 15 Dec 2011 20:23:57 +0700 Subject: [PATCH 077/519] Add link to Procedural Dylan. --- .../website/source/documentation/index.rst | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index a9ae59f3f7..b2c2b3f56d 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -74,9 +74,20 @@ Documentation

Featured articles and blog postings.

+

Learning Dylan

+ +`Procedural Dylan <../articles/procedural-dylan/index.html>`_ by Paul Haahr. + + This essay explores Dylan from the perspective of a programmer used to + traditional procedural languages, such as Pascal or C. + +.. raw:: html +

Tools

-* `Development inside emacs using SLIME <../news/2011/12/12/dswank.html>`_ +`Development inside emacs using SLIME <../news/2011/12/12/dswank.html>`_ + + An exciting look at using SLIME and emacs for Dylan development. .. raw:: html From b05e00dd4b3f62f663143b9668d8334951e947c9 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 15 Dec 2011 20:24:42 +0700 Subject: [PATCH 078/519] Move the style guide link. --- documentation/website/source/documentation/index.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index b2c2b3f56d..876a20aafc 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -34,11 +34,6 @@ Documentation A good, book length Dylan tutorial by several Harlequin employees. -`Dylan Style Guide `_ -[`pdf `__] - - Notes and thoughts on how to format your Dylan code. - `Getting Started with Open Dylan `_ [`pdf `__] [`old HTML `__] @@ -156,6 +151,12 @@ Documentation A work in progress to help out people who are hacking on Open Dylan itself. +`Dylan Style Guide `_ +[`pdf `__] + + Notes and thoughts on how to format your Dylan code. This is the style + guide that we aspire to adhere to in the Open Dylan sources. + .. raw:: html
From 78d512ded68f887599b4eeacd33ff80d522218d5 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 12 Dec 2011 00:09:01 -0500 Subject: [PATCH 079/519] Minor tweaks to cheatsheet. --- .../source/documentation/cheatsheet.rst | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/documentation/website/source/documentation/cheatsheet.rst b/documentation/website/source/documentation/cheatsheet.rst index 3db17403e9..7f79045eb1 100644 --- a/documentation/website/source/documentation/cheatsheet.rst +++ b/documentation/website/source/documentation/cheatsheet.rst @@ -29,7 +29,7 @@ Literals +----------------+----------------------------------------+---------------------------+ | Strings | .. code-block:: dylan | | | | | * :drm:`` | -| | 'a' // A character | | +| | 'a' // A character | * :drm:`` | | | "Hello" // A simple string | | | | "Hello\n" // An escape sequence | | +----------------+----------------------------------------+---------------------------+ @@ -49,6 +49,8 @@ Literals Naming Conventions ================== +These are *conventions* only; they have no semantic value to the compiler. + +-------------+-------------------------+--------------------------+ | Classes | Class names begin / end | .. code-block:: dylan | | | with angle brackets | | @@ -69,20 +71,18 @@ Naming Conventions | | ``let``. | | +-------------+-------------------------+--------------------------+ | Predicate | Predicate functions | .. code-block:: dylan | -| Functions | return true / false | | -| | values. They end in | even? | -| | ``?``. | instance? | +| Functions | return #t or #f. They | | +| | end in ``?``. | even? | +| | | instance? | +-------------+-------------------------+--------------------------+ -| Getters & | Getters return a value | .. code-block:: dylan | -| Setters | while setters allow you | | -| | modify that value. The | window.size := 3 | -| | compiler uses this | size-setter(3, window) | +| Getters & | Getters read a value | .. code-block:: dylan | +| Setters | while setters write a | | +| | value. Setter functions| window.size := 3 | +| | end in ``-setter``. | size-setter(3, window) | +| | The compiler uses this | | | | convention to find the | | | | function to call for | | | | ``:=``. | | -| | | | -| | Setter functions end | | -| | in ``-setter``. | | +-------------+-------------------------+--------------------------+ Operators From b2968f2d58be46c7316592a05f787a3d8321ee7b Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Thu, 15 Dec 2011 09:15:06 -0500 Subject: [PATCH 080/519] Tweak to string formatting table. --- documentation/website/source/documentation/cheatsheet.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/website/source/documentation/cheatsheet.rst b/documentation/website/source/documentation/cheatsheet.rst index 7f79045eb1..84adab5546 100644 --- a/documentation/website/source/documentation/cheatsheet.rst +++ b/documentation/website/source/documentation/cheatsheet.rst @@ -129,6 +129,8 @@ Operators String Formatting ================= +Example: ``format(stream, "%s:%d", host, port)`` + +-------------+------------------+-----------------------+ | Directive | Argument Type | Description | +=============+==================+=======================+ @@ -142,11 +144,9 @@ String Formatting +-------------+------------------+-----------------------+ | %c | | character, no quotes | +-------------+------------------+-----------------------+ -| %s | | string, no quotes | -+-------------+------------------+-----------------------+ -| %s | | condition message | +| %s | | "pretty" format | +-------------+------------------+-----------------------+ -| %= | | any object | +| %= | | "unique" format | +-------------+------------------+-----------------------+ | %% | None | literal % | +-------------+------------------+-----------------------+ From e296f69724460557f4ecf19dc7846216d8307f66 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 09:58:03 +0700 Subject: [PATCH 081/519] Remove unused files. --- documentation/website/source/documentation/glossary.rst | 3 --- documentation/website/source/documentation/styleguide.rst | 3 --- documentation/website/source/documentation/tutorials.rst | 0 3 files changed, 6 deletions(-) delete mode 100644 documentation/website/source/documentation/glossary.rst delete mode 100644 documentation/website/source/documentation/styleguide.rst delete mode 100644 documentation/website/source/documentation/tutorials.rst diff --git a/documentation/website/source/documentation/glossary.rst b/documentation/website/source/documentation/glossary.rst deleted file mode 100644 index af8e510a06..0000000000 --- a/documentation/website/source/documentation/glossary.rst +++ /dev/null @@ -1,3 +0,0 @@ -******** -Glossary -******** diff --git a/documentation/website/source/documentation/styleguide.rst b/documentation/website/source/documentation/styleguide.rst deleted file mode 100644 index 828eb64e42..0000000000 --- a/documentation/website/source/documentation/styleguide.rst +++ /dev/null @@ -1,3 +0,0 @@ -*********** -Style Guide -*********** diff --git a/documentation/website/source/documentation/tutorials.rst b/documentation/website/source/documentation/tutorials.rst deleted file mode 100644 index e69de29bb2..0000000000 From 652604fe940ff54791803a2aac98480df9152b7b Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 10:54:56 +0700 Subject: [PATCH 082/519] Begin to re-organize the main page of the website. --- documentation/website/source/index.rst | 39 ++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 69072e7861..5d566bec75 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -1,17 +1,44 @@ Welcome to Open Dylan! ====================== -For more on the background and goals of the Dylan language, see the -excellent :drm:`Introduction to the Dylan Reference Manual `. +.. raw:: html + +
+
-For an introduction to the basic concepts of the language, see our -`introduction to Dylan `_. +

Recent News

-Recent News -=========== +
+

Keep up to date by subscribing to our RSS + Feed or joining our + mailing lists.

+
.. include:: news/recent.rst.inc +.. raw:: html + +
+
+ +

Get Started

+ +
+

Just getting started with Open Dylan? We recommend that + you read the Introduction to + Dylan to get a feel for the language. After that, you can broaden + your knowledge with the Dylan Programming + book.

+
+ +For more on the background and goals of the Dylan language, see the +excellent :drm:`Introduction to the Dylan Reference Manual `. + +.. raw:: html + +
+
+ .. toctree:: :maxdepth: 1 :hidden: From 067ba684c9b56d28163d4be592824d6b76f99970 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 11:00:57 +0700 Subject: [PATCH 083/519] Move the hero box out of the theme and into the index page. --- .../source/_themes/opendylan/layout.html | 17 ----------------- documentation/website/source/index.rst | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index 37c781b289..f7660e36a5 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -56,23 +56,6 @@ {% block content %}
- {% if pagename == 'index' -%} -
-

Dylan is an advanced, object-oriented, dynamic language which - supports rapid program development. When needed, programs can be - optimized for more efficient execution by supplying more type - information to the compiler. Nearly all entities in Dylan - (including functions, classes, and basic data types such as - integers) are first class objects. Additionally Dylan supports - multiple inheritance, polymorphism, multiple dispatch, keyword - arguments, object introspection, macros, and many other advanced - features... --Peter Hinely

- -
- {% endif -%} {%- block document %} {{ super() }} {%- endblock %} diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 5d566bec75..6f5c63a15b 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -3,6 +3,22 @@ Welcome to Open Dylan! .. raw:: html +
+

Dylan is an advanced, object-oriented, dynamic language which + supports rapid program development. When needed, programs can be + optimized for more efficient execution by supplying more type + information to the compiler. Nearly all entities in Dylan + (including functions, classes, and basic data types such as + integers) are first class objects. Additionally Dylan supports + multiple inheritance, polymorphism, multiple dispatch, keyword + arguments, object introspection, macros, and many other advanced + features... --Peter Hinely

+ +
+
From e3a8e0369bc95a48f75289a2c9837d928d9c12f0 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 11:03:53 +0700 Subject: [PATCH 084/519] Add icon for RSS feed. --- .../website/source/_static/feed-icon-14x14.png | Bin 0 -> 689 bytes documentation/website/source/index.rst | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 documentation/website/source/_static/feed-icon-14x14.png diff --git a/documentation/website/source/_static/feed-icon-14x14.png b/documentation/website/source/_static/feed-icon-14x14.png new file mode 100644 index 0000000000000000000000000000000000000000..b3c949d2244f2c0c81d65e74719af2a1b56d06a3 GIT binary patch literal 689 zcmV;i0#5yjP)(tky!*UETcH-TCU7SrqEjJM#?B`_A)!p7(kFf9-P@=@15kkTkGK zgFusyy#KECqZzRdBLb=P?$(kUP;>kYTDeG&{|a+iOiRbI6nbQ)j#7bOf>iF=C+|_py<&Fo1F5cC*iEM?zZGC{ejNg4LWYp=S$L6Qaby6y zp$+F`250{%tU{Lg$5*ROH}y!1UKJS4*xqd7P(Y3JQF?lrnf?yerr%&6yGXLG1ur*B z{$&R1@Oj)yl@%rY5rh?j(j10Yz_DBs`AKFU_QnB;)(aqQmGi&ieOS|21^NP9UMpa< zU&p!f6RZ6Owp^X!EXA=0SbN&h?CrQK%Q3(=YBqqHD^9ZUM0Hxt-6-KT;>lf@j?Z+v zHm(}`>85I&E<7e}oz?6UwjAogowzGO8kSN7+2`b^$Az9L{K5*ko87EV45LT-`_##3 z>d3AGh@>=mbg34|6}+-gT9N+6Dr@44VEl44O&{&|w=qpbzC#iWMKa?5)>tI+KLQK@ Xq0QFqn(9Yl00000NkvXXu0mjfZ8t

Keep up to date by subscribing to our RSS - Feed or joining our - mailing lists.

+ Feed or + joining our mailing + lists.

.. include:: news/recent.rst.inc From b480bf2efffd2dde331c6122495aa3e5fce4f0b4 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 11:04:29 +0700 Subject: [PATCH 085/519] Fix broken link. --- documentation/website/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 2af1c699c9..332fc4d32f 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -27,7 +27,7 @@ Welcome to Open Dylan!

Keep up to date by subscribing to our RSS Feed or - joining our mailing + joining our mailing lists.

From 968d33b0f2d82286c3ed12550ff76f82aed7fb1e Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 11:09:24 +0700 Subject: [PATCH 086/519] Link to the mailman UI rather than just a request email address. --- documentation/website/source/community/index.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/documentation/website/source/community/index.rst b/documentation/website/source/community/index.rst index c260768061..b3c3844504 100644 --- a/documentation/website/source/community/index.rst +++ b/documentation/website/source/community/index.rst @@ -46,23 +46,25 @@ Mailing Lists There are several mailing lists. Which ones you join depends on your level of interest and involvement: -`hackers@lists.opendylan.org `_ (`Archives`__) +`hackers@lists.opendylan.org`__ (`Archives`__) The public development list. This is a good place to start if you have a question or would like to contribute. Lurkers are also welcome! Very low traffic. -`announce@lists.opendylan.org `_ (`Archives`__) +`announce@lists.opendylan.org`__ (`Archives`__) Find out about new releases! This is an extremely low-traffic list reserved for announcements. If you subscribe to hackers@, you are on this list. -`chatter@lists.opendylan.org `_ (`Archives`__) +`chatter@lists.opendylan.org`__ (`Archives`__) This list contains nothing but Git commit messages. It's for developers who want to know everything that's going on. - +__ https://lists.opendylan.org/mailman/listinfo/hackers __ https://lists.opendylan.org/pipermail/hackers/ +__ https://lists.opendylan.org/mailman/listinfo/announce __ https://lists.opendylan.org/pipermail/announce/ +__ https://lists.opendylan.org/mailman/listinfo/chatter __ https://lists.opendylan.org/pipermail/chatter/ Social Media From 84ffe1ab1b65d4fb79a28826c9b38c3cf45c827d Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 11:31:35 +0700 Subject: [PATCH 087/519] Improve formatting a bit. --- .../website/source/news/2011/12/12/dswank.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/documentation/website/source/news/2011/12/12/dswank.rst b/documentation/website/source/news/2011/12/12/dswank.rst index 36e708cac9..d1029844c9 100644 --- a/documentation/website/source/news/2011/12/12/dswank.rst +++ b/documentation/website/source/news/2011/12/12/dswank.rst @@ -17,15 +17,15 @@ implemented.
-When successfully installed, just run M-x slime to get a shell. This -is the same as the dylan-compiler shell, you can also use the same -commands. +When successfully installed, just run ``M-x slime`` to get a shell. +This is the same as the dylan-compiler shell, you can also use the +same commands. -When you program and hit '(' or ',' or ' ', you get the argument list -of the method you are calling. +When you program and hit ``(`` or ``,`` or ``(space)``, you get the +argument list of the method you are calling. -M-x slime-dylan-browse-superclasses will show the superclass hierarchy -of the current class. M-x slime-dylan-browse-subclasses displays the +``M-x slime-dylan-browse-superclasses`` will show the superclass hierarchy +of the current class. ``M-x slime-dylan-browse-subclasses`` displays the subclass hierarchy. +-------------------+------------------------------------------+ @@ -51,7 +51,7 @@ subclass hierarchy. +-------------------+------------------------------------------+ Dswank uses the Open Dylan project registry, so make sure -OPEN_DYLAN_USER_REGISTRIES is set properly before starting Emacs. +``OPEN_DYLAN_USER_REGISTRIES`` is set properly before starting Emacs. Installation @@ -60,5 +60,5 @@ Installation You need the following pieces: * `SLIME `_ - since the CVS is a moving target, this is a safe version to use (February 2011 snapshot) - * `dylan-mode `_, and extend your ~/.emacs as documented in README) + * `dylan-mode `_, and extend your ``~/.emacs`` as documented in README) * dswank itself is shipped with the 2011.1 release From c7c50a85632ad57ee0977d7ce9e6b0869e54830f Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 11:35:50 +0700 Subject: [PATCH 088/519] Add button to go to news page. --- documentation/website/source/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 332fc4d32f..42443fdf5e 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -35,6 +35,7 @@ Welcome to Open Dylan! .. raw:: html +
All news »
From f0ec78b5701a1f9a85c790a5839769b4eb128321 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 11:36:11 +0700 Subject: [PATCH 089/519] Improved recent news blurbs. --- .../website/source/news/recent.rst.inc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index 2688968767..b04b8c16a7 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -3,23 +3,32 @@ *2011-12-12* We developed a back-end for SLIME, the superior lisp interaction -mode for emacs. +mode for emacs. Now, you can browse the class hierarchy, get +argument lists, locate definitions, compile, view warnings and +more, all from within emacs! :doc:`Read more... ` **New release: 2011.1** *2011-12-10* -We just released Open Dylan 2011.1 +We just released Open Dylan 2011.1. This release is our first +since moving to GitHub and relicensing under a more liberal +license. It brings many bugfixes, inmproved platform support +and new features. :doc:`Read more... ` **New Documentation** *2011-11-22* -We're revitalizing our documentation. +We're revitalizing our documentation and moving to a new +publishing system. We'll soon be able to provide our +documentation in PDF and ePub as well as HTML, with it +looking much better and being more maintainable than +in the past. -:doc:`More... ` +:doc:`Read more... ` **Welcome to the New Website!** *2011-11-22* From d17dce2800c6f1b41b15d919c7a0282ecb5d70ab Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 17 Dec 2011 21:04:24 +0700 Subject: [PATCH 090/519] Adding Dustin's "Dylan Macro System" article rescued from the wiki. --- .../articles/macro-system/auxiliary-rules.rst | 388 ++++++++++++++++++ .../macro-system/background-overview.rst | 133 ++++++ .../source/articles/macro-system/faq-tips.rst | 123 ++++++ .../source/articles/macro-system/hygiene.rst | 127 ++++++ .../source/articles/macro-system/index.rst | 26 ++ .../articles/macro-system/macro-types.rst | 138 +++++++ .../macro-system/pattern-variables.rst | 296 +++++++++++++ .../source/articles/macro-system/patterns.rst | 165 ++++++++ .../articles/macro-system/substitutions.rst | 152 +++++++ 9 files changed, 1548 insertions(+) create mode 100644 documentation/website/source/articles/macro-system/auxiliary-rules.rst create mode 100644 documentation/website/source/articles/macro-system/background-overview.rst create mode 100644 documentation/website/source/articles/macro-system/faq-tips.rst create mode 100644 documentation/website/source/articles/macro-system/hygiene.rst create mode 100644 documentation/website/source/articles/macro-system/index.rst create mode 100644 documentation/website/source/articles/macro-system/macro-types.rst create mode 100644 documentation/website/source/articles/macro-system/pattern-variables.rst create mode 100644 documentation/website/source/articles/macro-system/patterns.rst create mode 100644 documentation/website/source/articles/macro-system/substitutions.rst diff --git a/documentation/website/source/articles/macro-system/auxiliary-rules.rst b/documentation/website/source/articles/macro-system/auxiliary-rules.rst new file mode 100644 index 0000000000..500860ff93 --- /dev/null +++ b/documentation/website/source/articles/macro-system/auxiliary-rules.rst @@ -0,0 +1,388 @@ +.. default-role:: samp +.. highlight:: dylan +.. _auxiliary-rules: + + +****************************** +Auxiliary Rules and Expansions +****************************** + +Auxiliary rules transform the code fragment contained in a pattern variable +before it is substituted into a template. + +Auxiliary rule sets follow the syntax described in `patterns`:ref: and have the +behaviors described on that page. They do not have the special elements like +`define` or `{modifiers}` shown in `macro-types`:ref:, but the macro type does +place certain *de facto* restrictions on what can appear in auxiliary rule +patterns: + +- `end` cannot usefully appear in patterns of a body-style definition macro or + a statement macro unless it is enclosed in bracketing characters. +- `;` cannot usefully appear in patterns of a list-style definition macro + unless enclosed in bracketing characters. + +An auxiliary rule set comes into play when a pattern variable matches a code +fragment and that pattern variable is named the same as the auxiliary rule set. +Usually, the pattern variable is a wildcard variable written without a +constraint, but the pattern variable can use any of the forms described in +`patterns`:ref:, including the `#key` and `??{name}:{constraint}` forms. + +After the pattern variable matches and is set to a code fragment, that code +fragment is matched against the rules of the auxiliary rule set. If a rule's +pattern matches the code fragment, that rule's template is expanded and replaces +the code fragment contained by the pattern variable. If no rules match the code +fragment, macro expansion fails. + +If the pattern variable named the same as the rule set is a ``??``-style pattern +variable, the process is similar, except each code fragment in the pattern +variable is individually matched and transformed by the auxiliary rules. + + +Expansion examples +================== + +Consider a macro [ver1]_ that makes it easier to generate version numbers. The +macro is called by [ver1-call]_ and expands to [ver1-exp]_. + +The `?type` pattern variable in line 1 of the macro definition matches ``alpha`` +in the call. After the variable matches, the `type:` auxiliary rule set in lines +4–7 rewrite the contents of the pattern variable according to the matching rule +in line 5. The matching rule expands to the string `"a"`, which replaces the +contents of the pattern variable. In the main rule's template (line 3), the +pattern variable (now containing `"a"` instead of `alpha`) is substituted into +the expansion. + +---------- + +.. [ver1] *Version macro* + + .. code-block:: dylan + :linenos: + + define macro version + { version(?number:expression, ?type:name) } + => { set-version(?number ?type) } + type: + { alpha } => { "a" } + { beta } => { "b" } + { release } => { } + end macro + +.. [ver1-call] *Macro call* + + .. code-block:: dylan + + version("1.2", alpha) + +.. [ver1-exp] *Macro expansion* + + .. code-block:: dylan + + set-version("1.2" "a") + +---------- + +Effect of constraints +--------------------- + +Now consider if the auxiliary rules were rewritten as [ver2]_. This macro might +be intended to create a version number like `"1.0a1"` if called by [ver2-call]_. +However, the macro will never succeed. `?type` in line 2 is constrained to +always be a simple name. None of the patterns in the `type:` auxiliary rule set +match a simple name (they all expect commas), so the macro expansion will fail. + +---------- + +.. [ver2] *Version macro 2* + + .. code-block:: dylan + :linenos: + :emphasize-lines: 5-7 + + define macro version + { version(?number:expression, ?type:name) } + => { set-version(?number ?type) } + type: + { alpha, ?n:expression } => { "a" ?n } + { beta, ?n:expression } => { "b" ?n } + { release, ?n:expression } => { } + end macro + +.. [ver2-call] *Macro call* + + .. code-block:: dylan + + version("1.0", alpha, "1") + +---------- + +Missing code fragments +---------------------- + +An auxiliary rule set can match against a missing code fragment. Consider the +following code which calls [ver1]_: + +.. code-block:: dylan + + version("1.0") + +With this macro call, the `?number` pattern variable would +contain `"1.0"` and `?type` would be empty, as described in +`final-items`:ref:. The macro would fail to match this code +fragment, since the `name`` constraint of the `?type` variable does not match +a missing code fragment. + +If we changed the macro definition to include a wildcard constraint [ver3]_, the +macro would still fail to match the code fragment because the `type:` +auxiliary rule set does not have a pattern that matches a missing code fragment. +We would also have to add that rule [ver4]_. + +---------- + +.. [ver3] *Macro with wildcard* + + .. code-block:: dylan + :linenos: + :emphasize-lines: 2 + + define macro version + { version(?number:expression, ?type:*) } + => { set-version(?number ?type) } + type: + { alpha } => { "a" } + { beta } => { "b" } + { release } => { } + end macro + +.. [ver4] *Macro with wildcard and empty pattern* + + .. code-block:: dylan + :linenos: + :emphasize-lines: 2,8 + + define macro version + { version(?number:expression, ?type:*) } + => { set-version(?number ?type) } + type: + { alpha } => { "a" } + { beta } => { "b" } + { release } => { } + { } => { } + end macro + +---------- + +Final exam +---------- + +Now suppose we wanted to support the syntax [ver5-call]_. This macro should +expand to [ver5-exp]_ to generate a version number like "1.042a". The macro +could be defined by the code [ver5]_. There are several interesting aspects to +this version of the macro that I would like to point out. + +Required and optional properties +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The macro call must include the `major:` property, but the `rev:` and `type:` +properties are optional. `rev:` is optional because it is a ``??``-type pattern +variable, and `type:` is optional because the pattern variable includes a +default value. + +If the macro call did not include any `rev:` properties, the substitution for +`??rev, ...` would be empty. This would cause the comma after `"."` in line 3 to +vanish. If the macro call did not include `type:`, the substitution for +``?type`` in line 3 would be empty because the defaulted pattern variable +matches the pattern of the auxiliary rule in line 12, and the template for that +rule is empty. Because `?type` in line 3 would be empty, the comma after `??rev, +...` would vanish. + +Property symbols +^^^^^^^^^^^^^^^^ + +The `major:`, `rev:`, and `type:` auxiliary rule sets do not include the actual +`major:`, `rev:`, or `type:` symbols found in the macro call. This is because +``#key``-type pattern variables contain only the value parts of properties, not +the symbol parts. + +``??`` and ``?`` pattern variables +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The main rule and the `major:` auxiliary rule set both contain a pattern +variable named `rev`, though it is `??rev:expression` in the main rule (line 2) +and `?rev` in the auxiliary rule (line 5). Both pattern variables are +transformed by the `rev:` auxiliary rule in line 7 because both pattern +variables have the name "rev", but they are transformed differently because of +the different natures of the two pattern variables. + +In line 5, `?rev` is equivalent to `?rev:*`. The code fragment matched by that +wildcard is the code fragment contained by the pattern variable `?major` in line +2. This code fragment will be an expression, which will be matched and +transformed by the `rev:` rule and will replace `?major` in line 3. + +The `?rev` pattern variable in line 5 is a simple pattern variable that contains +only one code fragment. The `rev:` rule in line 7 transforms that fragment as +you would expect. + +However, the `??rev` pattern variable in line 2 is a `??`-type pattern variable +containing has zero or more code fragments, so the `rev:` rule transforms each +individually. The `??rev, ...` substitution in line 3 then joins each of the +transformed code fragments with a comma and includes the entire collection in +the macro expansion. + +Empty ``??`` pattern variables +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In line 2, the `?type` variable has a default. If the macro call +does not contain a `type:` property, the default provides a code fragment to +match against the `type:` auxiliary rule set. + +In contrast, the `??rev` variable does not have a default. If the call does not +include any `rev:` properties then the pattern variable will not contain a code +fragment. Since the `rev:` rule does not include an empty pattern, you might +expect the macro to fail. + +But the macro still works. The `rev:` rule will be applied to each code fragment +in `??rev` individually because it is a ``??``-type pattern variable. Since +there are no code fragments in `??rev`, the `rev:` is not even applied once, so +its lack of an empty pattern is irrelevant. + +---------- + +.. [ver5-call] *Complex syntax call* + + .. code-block:: dylan + + version(major: 1, rev: 0, rev: 4, rev: 2, type: alpha) + +.. [ver5-exp] *Complex expansion* + + .. code-block:: dylan + + set-version(concatenate("1", ".", "0", 4", "2", "a")) + +.. [ver5] *Complex macro definition* + + .. code-block:: dylan + :linenos: + + define macro version + { version(#key ?major:expression, ??rev:expression, ?type:name = none) } + => { set-version(concatenate(?major, ".", ??rev, ..., ?type)) } + major: + { ?rev } => { ?rev } + rev: + { ?:expression } => { format-to-string("%s", ?expression) } + type: + { alpha } => { "a" } + { beta } => { "b" } + { release } => { } + { none } => { } + end macro + +---------- + +Recursive expansion +=================== + +Any pattern variable named the same as an auxiliary rule is processed by that +rule. That includes pattern variables in the auxiliary rule itself. This +recursive behavior is useful for processing lists of items. + +The `...` pattern variable and substitution syntaxes draw attention to a +recursive rule. Using that syntax, the macros [rec1]_ and [rec2]_ are +equivalent. But I feel there is a good argument for avoiding that syntax for +clarity's sake. + +Tracing a call of the macro [rec1-call]_ shows how macro recursion works. + +1. The main rule pattern matches. ``?steps`` is set to ``north 5, east 3, south + 1, east 2``. +#. The contents of ``?steps`` is rewritten by the *steps* auxiliary rule set. + + a. The "north" rule is matched against ``north 5, east 3, south 1, east 2``. + The pattern is a comma-separated pattern, which matches the code fragment. + The word ``north`` and the token ``5`` match. As described in + `final-items`:ref:, the ``?steps`` pattern variable belonging to this + pattern-match operation is set to ``east 3, south 1, east 2``. + #. The contents of this rule's ``?steps`` variable is rewritten by the *steps* + auxiliary rule set. + + i. The "north," "south," and "west" rules fail to match against ``east 3, + south 1, east 2``. + #. The "east" rule matches and the ``?steps`` pattern variable of this + pattern-match operation (different from any other ``?steps`` variable + being dealt with) is set to ``south 1, east 2``. + #. ``?steps`` is rewritten by another pass through the *steps* rule set. + + 1. The "south" rule matches and its ``?steps`` is set to ``east 2``. + #. ``?steps`` is rewritten. + + a. The "north," "south," and "west" rules fail to match. + #. The "east" rule is matched against ``east 2``. The word ``east`` and + the token ``2`` match. The code fragment does not contain a comma, but + the pattern matches the code fragment without the comma per + `final-items`:ref:. The ``?steps`` pattern variable will contain an + empty code fragment. + #. Even though ``?steps`` contains an empty code fragment, it is still + rewritten by the *steps* auxiliary rule set. + + i. The "north," "south," "west," and "east" rules fail to match against + an empty code fragment. + #. The empty pattern matches. Its expansion is an empty fragment. + + #. The ``?steps`` pattern variable of the "east" rule is set to the + expansion of the auxiliary rule set, i.e., an empty fragment. + #. The rule's expansion is therefore ``x := x + 2``. + + #. The ``?steps`` pattern variable of the "south" rule is set to ``x := x + + 2``. + #. The rule's expansion is therefore ``y := y + 1; x := x + 2``. + + #. The ``?steps`` pattern variable of the "east" rule is set to ``y := y + 1; + x := x + 2``. + #. The rule's expansion is therefore ``x := x + 3; y := y + 1; x := x + 2`` + +…and so on. The key ideas to note are: + +- The rule set has to have a non-recursing rule (in this case, ``{ } => { }``) +- Each rule's matching and expansion has its own ``?token`` and ``?steps`` + pattern variable. + +---------- + +.. [rec1] *Recursive macro* + + .. code-block:: dylan + :linenos: + + define macro path + { path(?steps) } => { let x = 0; let y = 0; ?steps; values(x, y) } + steps: + { north ?:token, ?steps:* } => { y := y - ?token; ?steps } + { south ?:token, ?steps:* } => { y := y + ?token; ?steps } + { west ?:token, ?steps:* } => { x := x - ?token; ?steps } + { east ?:token, ?steps:* } => { x := x + ?token; ?steps } + { } => { } + end macro + +.. [rec2] *Recursive macro with ellipses* + + .. code-block:: dylan + :linenos: + :emphasize-lines: 4-7 + + define macro path + { path(?steps) } => { let x = 0; let y = 0; ?steps; values(x, y) } + steps: + { north ?:token, ... } => { y := y - ?token; ... } + { south ?:token, ... } => { y := y + ?token; ... } + { west ?:token, ... } => { x := x - ?token; ... } + { east ?:token, ... } => { x := x + ?token; ... } + { } => { } + end macro + +.. [rec1-call] *Recursive macro call* + + .. code-block:: dylan + + let (x, y) = path(north 5, east 3, south 1, east 2) diff --git a/documentation/website/source/articles/macro-system/background-overview.rst b/documentation/website/source/articles/macro-system/background-overview.rst new file mode 100644 index 0000000000..2aef3a5227 --- /dev/null +++ b/documentation/website/source/articles/macro-system/background-overview.rst @@ -0,0 +1,133 @@ +.. default-role:: dfn +.. highlight:: dylan +.. _background-overview: + + +*********************** +Background and Overview +*********************** + +Macros work on the basis of code fragments. The macro system +does not understand code fragments; it just substitutes some fragments for other +fragments. Once the macro system has substituted and arrange all the code +fragments, they are compiled into executable code. + +Because the macro system parses and generates code fragments, it can recognize +the difference between a string containing a macro name and an actual invocation +of a macro. Macros are not affected by such syntactical issues; strings and +other expressions are treated as opaque units. + +The following are all examples of elementary code fragments, or `parsed +fragments`. These combine to form the larger code fragments upon which macros +operate. + +.. code-block:: none + + 'a' + "end times" + 35.552 + 3/4 + (3 + 7) + #t + #"red" + red: + cinnamon + == + #[1, 2, 3] + as(...) + list.size + + +Anatomy and terms +================= + +Macros have `main rules` and `auxiliary rules`. Each of the main or auxiliary +rules has a `pattern` and a `template`. Patterns are matched against the code +fragments of your source code. A main rule is matched against the code fragment +that comprises the entire macro call. An auxiliary rule is matched against parts +of that code fragment. The matched code is then replaced by the template. + +A pattern can contain code fragments and `pattern variables`. If a code +fragment in the source code matches what is in the pattern, parts of that code +fragment may be pulled out into pattern variables. The rest is discarded. + +A template can contain other code fragments and `substitutions`. Substitutions +are placeholders; the contents of a pattern variable are processed and inserted +into the template in place of every corresponding substitution. The template's +combined fragments and substitutions form the macro's `expansion`, which +replaces the original code fragment. + +This happens recursively: after a macro is expanded, its expansion is scanned +for additional macro call code fragments, and those are expanded in turn. Macros +are recognized by way of a `distinguishing word` and a certain syntactic style. + +Let us examine a function macro [defn]_. This macro might be called by the code +[orig]_, but the actual call fragment [frag]_ is what the parser will attempt to +match. The macro's expansion will be [exp]_ and the original code will then +become [new]_. + +Here are the parts of the macro: + +- The distinguishing word is ``table``. Whenever the compiler sees ``table(…)``, + it will expand this macro rather than creating a call to a function named + "table". +- The main rules are in lines 2–4. +- The macro has one set of auxiliary rules in lines 6–9. A set of auxiliary + rules has a title written as a symbol. This set of auxiliary rules is titled + ``table-contents:`` (or, alternatively, ``#"table-contents"``). +- The pattern of the first main rule is in line 2. +- The template of the first main rule is in line 3. +- The patterns in this macro include the pattern variables ``?table-class``, + ``?table-contents``, ``?rest``, ``?key``, and ``?value``. +- The substitutions in this macro include those same names. + +Note that the expansion [new]_ is surrounded by ``begin`` and ``end``. Macro +expansions are always surrounded by a begin…end block. This helps with macro +hygiene (i.e. preventing bindings outside of a macro call from being affected by +bindings used in a macro's expansion). I discuss hygiene `later `:ref:. + +---------- + +.. [defn] *Definition* + + .. code-block:: dylan + :linenos: + + define macro table + { table(?table-class:expression, ?table-contents) } + => { let ht = make(?table-class); ?table-contents; ht; } + { table(?rest:*) } => { table(
+
- The official definition of the Dylan language and standard library. +

Learning Dylan

-`Dylan Programming -`_ - - A good Dylan tutorial by several Harlequin employees. - -Guides -====== +
+

Just getting started with Open Dylan? We recommend that + you read the Introduction to Dylan + to get a feel for the language. After that, you can broaden + your knowledge with the Dylan Programming + book.

+
`An Introduction to Dylan `_ [`pdf `__] @@ -32,9 +30,14 @@ Guides experience in C++ or another object-oriented static language. It provides a gentler introduction to Dylan than does the DRM. -`Dylan Cheat Sheet `_ +`Dylan Programming `_ - A cheat sheet to get you started with the basics of Dylan syntax. + A good, book length Dylan tutorial by several Harlequin employees. + +`Dylan Style Guide `_ +[`pdf `__] + + Notes and thoughts on how to format your Dylan code. `Getting Started with Open Dylan `_ [`pdf `__] @@ -42,11 +45,6 @@ Guides Describes Open Dylan's interactive development environment. -`Dylan Style Guide `_ -[`pdf `__] - - Notes and thoughts on how to format your Dylan code. - `Building Applications Using DUIM `_ [`pdf `__] [`old HTML `__] @@ -54,19 +52,49 @@ Guides Describes how to use DUIM (Dylan User Interface Manager), the portable window programming toolkit. -`Open Dylan Hacker's Guide `_ -[`pdf `__] +.. raw:: html - A work in progress to help out people who are hacking on Open Dylan itself. +
+

Cheat Sheets

+ +
+

Quick one-page sheets for common tasks.

+
+ +`Dylan Cheat Sheet `_ + + A cheat sheet to get you started with the basics of Dylan syntax. -Publications -============ +.. raw:: html -`See publications page `_ +
+

Articles

+
+

Featured articles and blog postings.

+
-References -========== +

Tools

+ +* `Development inside emacs using SLIME <../news/2011/12/12/dswank.html>`_ + +.. raw:: html + +
+
+ +

References

+ +
+

These are some lengthier reference materials. While they + make for dry reading, they're full of invaluable information!

+
+ +`Dylan Reference Manual +`_ (`Errata +`_) + + The official definition of the Dylan language and standard library. `Common Dylan library reference `_ [`pdf `__] @@ -101,8 +129,39 @@ References with C programs, and several libraries providing a low-level interface to the Microsoft Win32 API. -Old, Out of Date Documentation -============================== +.. raw:: html + +
+

Open Dylan Developers

+ +
+

Notes and materials useful to those working on + Open Dylan itself or have an interest in the low + level details.

+
+ +`Open Dylan Hacker's Guide `_ +[`pdf `__] + + A work in progress to help out people who are hacking on Open Dylan itself. + +.. raw:: html + +
+

Publications

+ +`See our publications page `_. + +.. raw:: html + +
+

Archived Documentation

+ +
+

This is old documentation that we don't plan to + bring forward. Let us know if there's interest in this + material.

+
`Developing Component Software with CORBA `_ @@ -115,3 +174,8 @@ Old, Out of Date Documentation Describes high and low level interfaces to COM, OLE, and ActiveX component technology, and generic DBMS support, through SQL with an ODBC backend. + +.. raw:: html + +
+
, ?rest); } + + table-contents: + { } => { } + { ?key:expression => ?value:expression, ... } + => { ht[?key] := ?value; ... } + end macro table + +.. [orig] *Original code* + + .. code-block:: dylan + + let lights = table(, "red" => "stop", "green" => "go"); + +.. [frag] *Call fragment* + + .. code-block:: dylan + + table(, "red" => "stop", "green" => "go") + +.. [exp] *Expansion* + + .. code-block:: dylan + + let ht = make(); ht["red"] := "stop"; ht["green"] := "go"; ht; + +.. [new] *Replacement code* + + .. code-block:: dylan + + let lights = begin + let ht = make(); + ht["red"] := "stop"; ht["green"] := "go"; + ht; + end; diff --git a/documentation/website/source/articles/macro-system/faq-tips.rst b/documentation/website/source/articles/macro-system/faq-tips.rst new file mode 100644 index 0000000000..3ac48ec159 --- /dev/null +++ b/documentation/website/source/articles/macro-system/faq-tips.rst @@ -0,0 +1,123 @@ +.. default-role:: samp +.. highlight:: none +.. _faq-tips: + + +************ +FAQ and Tips +************ + + +General advice and troubleshooting +================================== + +- The best way to design a macro is: + 1. Come up with the best non-macro interface you can. + 2. Design the syntax of the macro call up front. + 3. Implement thah design. +- Gwydion Dylan sometimes has issues with trailing semi-colons or commas. In + general, don't include a separator at the end of a template. +- In both Gwydion Dylan and Open Dylan, the variable declaration for a variable + used in the lexical scope of a macro needs to be in that macro. The variable + cannot be declared in an auxiliary macro and exposed to the macro through the + `?=` mechanism. However, the variable can be declared in an auxiliary rule of + the macro. +- Ensure you haven't accidently given a pattern variable the same name as an + auxiliary rule set. + + +How can I combine multiple names into one? +========================================== + +This template will not work:: + + { define ?name-1 ## "-" ## ?name-2 ## "-function" () } + +What you want is easily done for the `?"{name}"` substitution form by taking +advantage of adjacent string concatenation:: + + { format-out(?"name-1" "-" ?"name-2" "-function") } + +But this will not work for the `?{name}` or `?#"{name}"` substitution forms. For +those, you have to use an auxiliary macro to construct a name. + + +How can I do macros that follow a BNF-like syntax? +================================================== + +Macros are designed to follow Dylan language conventions, so you may not be able +to support arbitrary BNF-based syntax. But here are some tricks to help with +common BNF forms. + +`{x}?` + An optional item can be handled by a wildcard pattern variable using an + auxiliary rule with two patterns:: + + x-opt: + { x } + { } + +`{x}? {y}? {z}?` + If there are several space-separated optional items, put them all in the + same auxiliary rule, since the upper rule can't have adjacent wildcard + pattern variables that call out to an individual auxiliary rule for each + item:: + + x-y-z-opts: + { x ... } + { y ... } + { z ... } + { } + +`{x}? | {x}(, {x})*` + This is a list that may have 0–*n* items. Handle this by calling out to an + auxiliary rule that calls itself recursively like so:: + + x-list: + { ?x:*, ?x-list:* } + { } + + Note that the calling rule needs to use a wildcard pattern variable to + collect the comma'd items for the `x-list:` rule set; this pattern + variable needs to be well-separated from the syntax that follows it by a + semicolon or intermediate word. + +`{x}(, {x})*` + This is a list that may have 1–*n* items. You simply cannot do this in the + general case; your best bet is design your macro to handle 0 items + gracefully and then use a 0-*n* list. + + The following does not work because `?{x}:*` allows an empty code + fragment, which allows 0 items:: + + x-list: + // Doesn't work + { ?x:*, ?x-list:* } + { ?x:* } + + Of course, if you can put a constraint on `?x`, it will work fine, but + remember that a secondary rule can't be used to provide a constraint in a + primary rule. + + +I can't make a bare list! +========================= + +A macro that makes a bare list can't do anything useful. For example, this will +not compile:: + + define macro setter-names + { setter-names(?names) } => { ?names } + names: + { ?:name, ... } => { ?name ## "-setter", ... } + end macro; + + vector(setter-names(alpha, beta, gamma, delta)) + +It does not compile because the expansion of `setter-names` is wrapped in a +begin…end:: + + vector(begin alpha-setter, beta-setter, gamma-setter, delta-setter end) + +This is invalid syntax. You need to do something with the list in the macro +itself. diff --git a/documentation/website/source/articles/macro-system/hygiene.rst b/documentation/website/source/articles/macro-system/hygiene.rst new file mode 100644 index 0000000000..987013889b --- /dev/null +++ b/documentation/website/source/articles/macro-system/hygiene.rst @@ -0,0 +1,127 @@ +.. default-role:: samp +.. highlight:: dylan +.. _hygiene: + + +******* +Hygiene +******* + +Let us say we have two macros A and B. The expansion of A calls B. The following +diagram shows the sources or lexical scopes of a binding used in the expansion +of A and B. + +.. code-block:: none + + +--------------------------------+ +-------------------------------------+ + | [1] Module or local scope of | | [4] Module containing definition of | + | the call to macro A | | macro A | + | | | | + | +--------------------------+ | +-------------------------------------+ + | | [2] Expansion of A | | + | | | | +-------------------------------------+ + | | +--------------------+ | | | [5] Module containing definition of | + | | | [3] Expansion of B | | | | macro B | + | | | | | | | | + | | +--------------------+ | | +-------------------------------------+ + | | | | + | +--------------------------+ | + | | + +--------------------------------+ + +Macro expansions are hygienic, meaning: + +- Bindings from boxes 2 or 4 are visible in box 2. +- Bindings from boxes 3 or 5 are visible in box 3. +- A binding from box 1 is not visible in box 2, but can be wrapped in a pattern + variable and manipulated in box 2. +- A binding from box 2 is not visible in box 3, but can be wrapped in a pattern + variable and manipulated in box 3. +- A binding from box 1 is not visible in box 3, but if box 2 wraps the binding + in a pattern variable and uses that pattern variable in the call of macro B, + and macro B wraps that pattern variable in a pattern variable of its own, then + box 3 can manipulate the binding via its pattern variable. + +New bindings created by `define` statements are not hygienic. Definition +processing occurs after all macros have been expanded. A class defined in box 3 +can be used in boxes 2 and 1 and exported from the module of box 1. If there is +another definition by that name in the other boxes, it is a duplicate definition +and an error is reported. + + +Breaking hygiene +================ + +A template can prefix a binding with `?=`. This makes the binding come from +and be visible in the macro's caller. This can be illustrated by an example from +`Dylan Programming`:title:. + +Say macro A is defined in box 4 as [rep]_. Code in box 1 can call the macro as +follows: + +.. code-block:: dylan + + let i = 0; + repeat + if (i == 100) stop!() end; + i := i + 1; + end + +The `?=stop!` substitution in line 3 of the macro expands (in box 2) to a +binding visible in boxes 1 and 2. In box 1, the binding is visible as `stop!`. +In box 2 (the expansion itself), the binding is visible as `?=stop!` and if it +were a function, the macro template could contain code fragments like this: + +.. code-block:: dylan + + ?=stop!(arg-1, arg-2) + +Note that a macro expansion cannot create a new binding visible outside of the +macro call in box 1. For example, given a macro like [dofoo]_, one might expect +the macro call [dofoo-call]_ would print "Hello" twice, but it will not work. +Because every macro expansion is implicitly surrounded by begin…end as described +in `background-overview`:ref:, the example expands into [dofoo-exp]_. After the +macro call, `foo` is no longer in scope. + +---------- + +.. [rep] *Repeat macro* + + .. code-block:: dylan + :linenos: + :emphasize-lines: 3 + + define macro repeat + { repeat ?:body end } + => { block (?=stop!) + local method again() ?body; again(); end; + again(); + end } + end macro + +.. [dofoo] *Do-then-foo macro* + + .. code-block:: dylan + :linenos: + + define macro do-then-foo + { do-then-foo(?:expression) ?:body end } + => { let ?=foo = ?expression; ?body } + end macro + +.. [dofoo-call] *Calling do-then-foo* + + .. code-block:: dylan + + do-then-foo("Hello\n") format-out(foo) end; + format-out(foo) + +.. [dofoo-exp] *Expansion of do-then-foo* + + .. code-block:: dylan + + begin + let foo = "Hello\n"; + format-out(foo) + end; + format-out(foo) diff --git a/documentation/website/source/articles/macro-system/index.rst b/documentation/website/source/articles/macro-system/index.rst new file mode 100644 index 0000000000..221d7f891c --- /dev/null +++ b/documentation/website/source/articles/macro-system/index.rst @@ -0,0 +1,26 @@ +###################### +The Dylan Macro System +###################### + +Dylan macros simplify boilerplate code and provide syntactic shorthand. They are +useful in small jobs within a particular file (e.g. making a series of +repetitive declarations) and for larger jobs (e.g. constructing a GUI through +creating and associating objects). Easy jobs are easy to do with macros, but the +complicated jobs get hard fast. + +This document describes how the Dylan macro system works and some techniques you +can use when writing your own macros. I gloss over some of the implementation +details and present this information more informally than the `Dylan +Reference Manual`:title: does. + +.. toctree:: + :maxdepth: 2 + + background-overview + macro-types + patterns + pattern-variables + substitutions + auxiliary-rules + hygiene + faq-tips diff --git a/documentation/website/source/articles/macro-system/macro-types.rst b/documentation/website/source/articles/macro-system/macro-types.rst new file mode 100644 index 0000000000..f471da0a19 --- /dev/null +++ b/documentation/website/source/articles/macro-system/macro-types.rst @@ -0,0 +1,138 @@ +.. default-role:: samp +.. highlight:: none +.. _macro-types: + + +*********** +Macro Types +*********** + +There are four types of macro. + +`Body-style definition macro`:dfn: + This kind of macro lets you create `define x … end` syntax. This is the + most popular kind of macro. This type of macro can only be used at the top + level of source code. + +`List-style definition macro`:dfn: + This kind of macro lets you create `define x …` syntax, such as `define + variable $pi`. + +`Statement macro`:dfn: + This kind of macro lets you create `do-something … end` syntax. Use this + kind of syntax to simplify blocks or to create new kinds of loops. It is + most commonly used to simplify resource management. + +`Function macro`:dfn: + This kind of macro lets you create `x(…)` syntax. Use this instead of a + function call if the syntax you want in the parentheses is more + complicated than a normal function call, or if there is additional setup + needed around a normal function call. + + +Main rules +========== + +The pattern of each main rule of a macro (and thus the way the macro is called) +must follow a specific syntactic style depending on the type of macro. + +When the Dylan compiler sees a macro call, it first finds the end of the call, +then expands the macro, then recursively expands any macro calls in the +expansion. The compiler is able to recognize inner macro calls along the way, +but if a code fragment *looks* like the end of a macro and is not part of an +inner macro call, the parser will assume that that code fragment *is* the end of +the macro. + + +Body-style definition macro +--------------------------- + +The main rules' patterns must follow this syntax, with optional parts in +brackets:: + + { define [MODIFIERS] DISTINGUISHING-WORD [NAME] + [BODY-PATTERNS] [;] + end } + +`{MODIFIERS}` + One or more words or pattern variables. + +`{NAME}` + A name or a pattern variable with a name constraint. + +`{BODY-PATTERNS}` + One or more sets of code fragments and pattern variables separated by + semicolons and/or commas. + +The parser will end the macro call at the first matching `end`. The final `end` +in each main rule is the only `end` that the macro's patterns can have. + +As a special case, the final `end` matches these code fragments:: + + end + end DISTINGUISHING-WORD + end DISTINGUISHING-WORD NAME + + +List-style definition macro +--------------------------- + +The main rules' patterns must follow this syntax, with optional parts in +brackets:: + + { define [MODIFIERS] DISTINGUISHING-WORD [LIST-PATTERNS] } + +`{MODIFIERS}` + One or more words or pattern variables. + +`{LIST-PATTERNS}` + One or more sets of code fragments and pattern variables separated by + commas. + +The parser will end the macro call at the first matching `;` or the end of the +enclosing source code. None of the macro's patterns can have a semicolon, and it +is probably better to avoid `?:body` or `?:case-body` pattern variables. + + +Statement macro +--------------- + +The main rules' patterns must follow this syntax, with optional parts in +brackets:: + + { DISTINGUISHING-WORD [`{BODY-PATTERNS}`] [;] end } + +`{BODY-PATTERNS}` + One or more sets of code fragments and pattern variables separated by + semicolons and/or commas. + +The parser will end the macro call at the first matching `end`. The final `end` +in each main rule is the only `end` that the macro's patterns can have. + +As a special case, the final `end` matches these code fragments:: + + end + end DISTINGUISHING-WORD + + +Function macro +-------------- + +The main rules' patterns must follow this syntax, with optional parts in +brackets:: + + { DISTINGUISHING-WORD ( [BODY-PATTERNS] ) } + +`{BODY-PATTERNS}` + One or more sets of code fragments and pattern variables separated by + semicolons and/or commas. + +The parser will end the macro call when it sees the closing parenthesis. Other +patterns in the macro can also include parentheses, so long as they are matched; +the parser understands nested parentheses. + +As a special case, function macros can be called using operator, slot access, or +element access syntax. The function macro has to accept expressions for its +`{BODY-PATTERN}` arguments like a normal function call in order to be used with +these syntaxes. + diff --git a/documentation/website/source/articles/macro-system/pattern-variables.rst b/documentation/website/source/articles/macro-system/pattern-variables.rst new file mode 100644 index 0000000000..15cd4afc1c --- /dev/null +++ b/documentation/website/source/articles/macro-system/pattern-variables.rst @@ -0,0 +1,296 @@ +.. default-role:: samp +.. highlight:: none +.. _pattern-variables: + + +***************** +Pattern Variables +***************** + +A macro pattern variables pulls out and transforms part of a code fragment. This +partial code fragment is then substituted into the macro's expansion. The +substitution can be altered in some ways, or intercepted and more extensively +transformed using auxiliary rules. + +Every pattern variable has a name and a `constraint`:dfn:. The constraint forces +the pattern variable to only match certain code fragments. If the pattern +variable cannot match, the pattern containing the variable will not match. +Unless the pattern variable has the wildcard (or `*`) constraint, it can only +match a code fragment that is part of the core language or a macro call; a +pattern variable cannot match a code fragment that is only legal with respect to +a given inner macro. An example of this is given in the discussion of the +`?:body` constraint below. + +The scope of a pattern variable is the rule that uses it. Other rules or +auxiliary rule sets cannot use the pattern variable. + +What follows is a categorized list of pattern variable syntaxes. + + +Simple pattern variables +======================== + +`?{name}:{constraint}` + This is the basic pattern variable. + +`?:{constraint}` + This is a pattern variable where its constraint is also its name. For + example, `?:expression` is equivalent to `?expression:expression`, + that is, a pattern variable named `expression` with a constraint of + `expression.` + +`?{name}:name` + This matches a name. + +`?{name}:token` + This matches a name, operator, or simple literal such as a string, character, + or number. It does not match vector literals or function calls. + +`?{name}:expression` + This matches any expression, including vector literals, function calls, + and begin…end blocks. + +`?{name}:variable` + This matches a variable name and optional specialization, for example, + `color` or `color :: `. + +`?{name}:name :: ?{specialization}:expression` + This matches a variable name and optional specialization, like + `?:variable`, but lets you get each part. If the code fragment just + has the name part, the substitution for `?{specialization}` will be + ``. Note that `?{specialization}` will not match every expression. It + will only match an expression that happens to be a type specialization. + + +.. _proplist-variables: + +Property list pattern variables +=============================== + +`#rest ?{name}:{constraint}` + This matches a property list where every value part meets the + constraint. If the constraint is `*`, any value part will match. The + substitution for `?{name}` is the entire property list code fragment, + including both the name and value parts of each property. + +`#key ?{prop-1}:{constraint}, ?{prop-2}:{constraint}` + This matches a property list that only includes the `{prop-1}:` and + `{prop-2}:` properties. If the property list includes any other + property such as `alpha:` or if either `{prop-1}:` or + `{prop-2}:` are missing, this pattern variable will not match. + Additionally, the properties' value parts have to meet the constraint. + If the constraint is `*`, any value part will match. + + The substitution for `?{prop-1}` is the value part of the `{prop-1}:` + property. + +`#key ??{prop-1}:{constraint}, ??{prop-2}:{constraint}` + This matches a property list that has several properties with a symbol + part of `{prop-1}:` or `{prop-2}:`. The substitution for + `??{prop-1}` is several code fragments, each being the value part of a + `{prop-1}:` property. The substitution may use a separator between each + code fragment as described in the `substitutions`:ref: section. + + For example, consider this pattern:: + + { #key ??my-key:name } + + It will match the following code fragment:: + + my-key: alpha, my-key: beta + + The substitution will be the following code fragment:: + + alpha beta + + If the property list did not include a `my-key:` property, the + substitution for `??my-key` would have been empty. + +`#key ?{prop}:{constraint}, #all-keys` + This matches a property list that contains `{prop}:`, but also matches + if the property list contains other properties in addition to + `{prop}:`. + + For example, consider this code fragment:: + + my-key: alpha, another-key: beta + + This pattern would not match it:: + + { #key ?my-key:name } + + However, this pattern would:: + + { #key ?my-key:name, #all-keys } + +`#key ?{prop}:{constraint} = {default-value}` + This matches a property list that contains `{prop}:`, but also matches + a property list that is missing that property. If the property is + missing, the substitution will be the default value given. + + The default value is not evaluated during macro expansion. Instead, it + is simply treated as a code fragment and substituted for `?{prop}` in + the template. The default value code fragment does not have to abide by + the pattern variable's constraint. For example, the following pattern is + valid even though `#f` is not a name:: + + { #key ?name:name = #f } + +`#key ??{prop}:{constraint} = {default-value}` + This matches a property list containing zero or more `{prop}:` + properties. If `{prop}:` properties are present, the substitution for + `??{prop}` will be a sequence of value parts as it is for the `#key + ??{prop}:{constraint}` pattern. However, if the property list does not + have any `{prop}:` properties, the substitution will be a sequence of + only one code fragment — the default value code fragment. + +`#rest {…}, #key {…}` + With these two syntaxes are combined, both match separately against the + same property list. + + +Body and macro pattern variables +================================ + +`?{name}:body` + This matches a series of semicolon-separated statement and expressions. + If the code fragment does not have any statements or expressions, the + substitution will be `#f`. The substitution will wrap the code + fragment in `begin` and `end` to make an expression. + + A `?:body` pattern variable matches statements and expressions in a + code fragment until it reaches some word, called an `intermediate word`. + You must ensure that all your `?:body` pattern variables are either + followed by a word, or followed by a pattern variable referring to an + auxiliary rule set whose rules all start with a word. Those word will + become the intermediate words that tells the parser to stop matching the + pattern variable. + + In this example, the `?:body` variable matches all code fragments up to + `endif`:: + + { if (?:expression) ?:body endif } + + In this example with auxiliary rules, the `?:body` variable matches + all code fragments up to `endif` or `else`:: + + { if (?:expression) ?:body ?else-or-end } + else-or-end: + { endif } + { else ?:body endif } + + In this example, the macro will not work because the `?:body` variable + is not necessarily followed by a word:: + + { when (?:expression) ?:body } + + A `?:body` pattern variable matches semicolons. It cannot be used in a + series of comma- or semicolon-separated sub-patterns, and cannot itself + be followed by a comma or semicolon in the pattern. The following will + not work:: + + { if (?:expression) ?:body; ?else-or-end } + + A `?:body` pattern variable does not match things that are not + statements or expressions. For example, the following pattern is + designed to be used with the above `if` macro:: + + { if-into (?:expression) ?:body => ?:name } => { let ?name = if (?expression) ?body } + + You might expect that you can use this macro on the following code:: + + if-into (x = #f) format-out("false") else x + 1 endif => x + + However, the `?:body` variable will not match the words `else` or + `endif` because they are not part of the core Dylan language. They are + not statements or expressions. Those words are actually an extension to + the language allowed by the `if` macro, but the `if` macro will never + see them because the `?:body` variable does not match or pass them on + to the `if` macro. To match arbitrary fragments for the `if` macro, the + `if-into` macro must use the wildcard `*` constraint instead. + +`?{name}:case-body` + This matches a list of cases separated by semicolons, where each case + consists of: a list of expressions, an arrow, and a body. For example, + this pattern variable would match the following:: + + "red" => "stop"; + "green", "blue" => "go"; + otherwise => error("I don't know what this means.") + + Since a case includes a body, a `?:case-body` pattern variable must be + followed with an intermediate word just like a `?:body` pattern + variable and cannot be followed by a comma or semicolon. + +`?{name}:macro` + This matches any macro call. This includes calls to definition macros, + which normally only appear at the top level source code. The + substitution will be the expanded macro, without the begin…end block + that normally surrounds macro expansions. + + While you can use the `?:expression` and `?:body` pattern variable + constraints to match function and statement macro calls, but they cannot + match definition macro calls, and their substitutions will include the + begin…end wrapper. + + +Wildcard pattern variables +========================== + +`?{name}:*` + Wildcard pattern variables match as many code fragments as can be + matched before the next comma, semicolon, or other pattern fragment in + the pattern. For example, consider the following pattern:: + + { ?many-things:* ?:name } + + `?many-things` will match everything up to but not including a name. + The substitution for `?many-things` will be everything except that + name name. If the code fragment only has a name, the substitution will + be empty. + + There can only be one wildcard pattern variable in a sub-pattern. Each + must be separated from other wildcard variables by a semicolon or comma. + For example, this is not a legal pattern:: + + { ?first:* ?second:* } + + However, this is:: + + { ?first:*, ?second:* } + + As a special case, main rules of definition macros can have wildcards in + both the `{MODIFIERS}` part and the `{LIST-PATTERN}` or `{BODY-PATTERN}` + part without an intervening comma or semicolon. This allows patterns + like the following that would normally not match:: + + { define ?modifiers:* collection ?:name ?contents:* end } + + Finally, consider this pattern:: + + { ?first:*, ?second:* } + + As described in `patterns`:ref:, it will match any of the following:: + + alpha, beta + alpha, beta, gamma + alpha, + alpha + + In all cases, the wildcard constraint on `?first` will match up to the + first comma in the code fragment. `?first` will contain `alpha`. + `?second` will contain nothing, `beta`, or `beta, gamma`. + + +Auxiliary rule set pattern variables +==================================== + +`?my-aux-rules` + This syntax can only be used when there is an auxiliary rule set named + the same as the pattern variable. It is equivalent to + `?my-aux-rule:*`. See `auxiliary-rules`:ref:. + +`...` + This syntax can only be used within an auxiliary rule set. If the rule + set is named `my-aux-rules`, `...` is equivalent to `?my-aux-rules:*`. + \ No newline at end of file diff --git a/documentation/website/source/articles/macro-system/patterns.rst b/documentation/website/source/articles/macro-system/patterns.rst new file mode 100644 index 0000000000..7387c4173b --- /dev/null +++ b/documentation/website/source/articles/macro-system/patterns.rst @@ -0,0 +1,165 @@ +.. default-role:: samp +.. highlight:: none +.. _patterns: + + +******** +Patterns +******** + +Pattern matching follows these basic rules: + +- Pattern-matching starts and ends with the main rule set. +- Patterns in a rule set are tried in order. If a pattern does not match the + code fragment, the next pattern is tried, and so on. If none of the patterns + in a rule set match, macro expansion fails. +- When determining whether a pattern matches a code fragment, the compiler will + not consider auxiliary rules. Any pattern variable corresponding to an + auxiliary rule matches like any other pattern variable with the same + constraint. +- If no patterns in an auxiliary rule set match, macro expansion fails. The + compiler does not backtrack and try a different earlier rule. + + +Subdivisions +============ + +A main rule pattern has elements like `define` and `end` as described in +`macro-types`:ref:, but in general, a pattern is a list of fragments or +pattern variables separated at the highest level by semicolons, then by commas. +That is, a pattern has this syntax:: + + FRAGMENTS, FRAGMENTS, …; FRAGMENTS, FRAGMENTS, …; … + +The parser matches each semicolon-separated sub-pattern individually, and only +then matches the comma-separated sub-patterns within. This can have surprising +side effects in combination with recursive auxiliary rules. + +A pattern can include a trailing comma or semicolon, but this is strictly +decorative. The pattern will match a trailing separator in the code fragment +whether or not the pattern contains a trailing separator. Keep this in mind. The +following patterns are equivalent:: + + { ?:name } + { ?:name; } + { ?:name, } + +Any of them will match any of these code fragments:: + + alpha + alpha, + alpha; + alpha,; + +You can use parentheses, curly brackets ("{…}"), and square brackets to nest +comma- or semicolon-separated patterns inside of other patterns, as in this +example:: + + { ?name:name, { ?true-expr:expression; ?false-expr:expression }, ?final:name } + +Such a pattern will only match a code fragment with matching bracket characters. +The above pattern will match [#]_ but not [#]_. + +---------- + +.. [#] + + .. code-block:: none + + alpha, {#t; #f;}, beta + +.. [#] + + .. code-block:: none + + alpha, (#t; #f;), beta + +---------- + + +.. _final-items: + +Final items +=========== + +A pattern with at least two list items treats the last item specially. For +example, the pattern [list1]_ will match any of the code fragments of [frags]_ +and set the pattern variables as follows: + +======== ======= ======= ======================= +Fragment ?item-1 ?item-2 ?item-3 +======== ======= ======= ======================= +Line 1 `alpha` `beta` `gamma` +Line 2 `alpha` `beta` +Line 3 `alpha` `beta` `gamma, delta, epsilon` +======== ======= ======= ======================= + +This special behavior is usually only relevant when the last item in the list is +a wildcard pattern variable (see `pattern-variables`:ref:). If the pattern were +[list2]_ instead, the only matching code fragment would be line 1, because +neither an empty fragment (from line 2) nor `gamma, delta, epsilon` (from line +3) match the `name` constraint of `?item-3`. + +---------- + +.. [list1] *Pattern ending in wildcard* + + .. code-block:: none + + { ?item-1:*, ?item-2:*, ?item-3:* } + +.. [list2] *Pattern ending in name* + + .. code-block:: none + + { ?item-1:*, ?item-2:*, ?item-3:name } + +.. [frags] *Code fragments* + + .. code-block:: none + :linenos: + + alpha, beta, gamma + alpha, beta + alpha, beta, gamma, delta, epsilon + +---------- + + +Property lists +============== + +The end of a comma-separated list of pattern fragments can include `#rest`, +`#key`, and `#all-keys`, as in this example:: + + { …, #rest ?keys:token, #key ?alpha:token, ?beta:token, #all-keys } + +If you write a pattern that contains `#all-keys`, you must also include `#key`. +There are several variations on this syntax; they are described in +`pattern-variables`:ref:. + +`#rest`, `#key`, and `#all-keys` must be the only pattern fragments in their +comma-separated sub-pattern, and that sub-pattern must be the last of several +comma-separated sub-patterns. Here are some examples of when it is or is not +valid to use this syntax in a pattern:: + + /* valid */ { #key ?alpha:token } + /* invalid */ { ?alpha:token #key ?beta:token } + /* valid */ { ?anything:*, #key ?alpha:token, #all-keys } + /* invalid */ { #key ?alpha:token, #all-keys, ?anything:* } + /* valid */ { #key ?alpha:token, #all-keys; ?anything:* } + /* invalid */ { #key ?alpha:token, #key ?beta-token } + /* valid */ { #key ?alpha:token; #key ?beta-token } + +This syntax is not used to match a code fragment that contains corresponding +literal `#rest`, `#key`, and `#all-keys` fragments. Instead, this syntax +matches a code fragment consisting of keyword/value pairs, called a `property +list`:dfn:. An example of a property list is:: + + alpha: "a", beta: "b" + +In this code fragment, `alpha:` and `beta:` are the symbol parts of the +property list and `"a"` and `"b"` are the value parts. + +If you want to match literal `#rest`, `#key`, or `#all-keys` fragments, escape +them in the pattern like `\#rest`, `\#key`, or `\#all-keys`. diff --git a/documentation/website/source/articles/macro-system/substitutions.rst b/documentation/website/source/articles/macro-system/substitutions.rst new file mode 100644 index 0000000000..1cb4a308e4 --- /dev/null +++ b/documentation/website/source/articles/macro-system/substitutions.rst @@ -0,0 +1,152 @@ +.. default-role:: samp +.. highlight:: none +.. _substitutions: + + +************* +Substitutions +************* + +Pattern variables contain code fragments, which can be inserted into the macro +expansion via a substitution. A substitution looks much like a pattern variable, +but it are on the template side of the rule and has different syntax forms. + +A template can only use pattern variables from its corresponding pattern. It +cannot use pattern variables from other rules' patterns. + +As a special case, if the template has a separator followed by any of the +substitution forms below, and the substituted code fragment is empty, the +preceding separator is removed. For example, consider this template:: + + { ?alpha, ?beta } + +If `?alpha` contains `a` and `?beta` is empty, the expansion will not be +[exp1]_, but will instead be [exp2]_. This special case applies with any of the +separators [seps]_ in place of the comma. + +---------- + +.. [exp1] *Expansion 1* + + .. code-block:: none + + a, + +.. [exp2] *Expansion 2* + + .. code-block:: none + + a + +.. [seps] *Separators* + + .. code-block:: none + + , ; + - * / ^ = == ~= ~== < <= > >= & | := + +---------- + + +Simple substitutions +==================== + +`?{name}` + This is the basic substitution. The pattern variable's code fragment is + inserted into the expansion according to the syntax used in the pattern, + as described in `pattern-variables`:ref:. + + +Conversion substitutions +======================== + +`?#"{name}"` + The pattern variable's code fragment, which must be a simple name, is + turned into a symbol and inserted into the expansion. + +`?"{name}"` + The pattern variable's code fragment, which must be a simple name, is + turned into a string and inserted into the expansion. + + +Concatenation substitutions +=========================== + +`"{prefix}" ## ?{name} ## "{suffix}"` + The prefix and suffix are added to the pattern variable's code fragment, + which must be a simple name. The result is inserted into the expansion. + Either the prefix or the suffix may be omitted. + + For example, consider a pattern variable, `?name-part`, that contains + the following code fragment:: + + alpha + + The pattern variable is used by the following template:: + + { ?name-part ## "-function" } + + The expansion will be the following code fragment:: + + alpha-function + +`"{prefix}" ## ?"{name}" ## "{suffix}"` + As above, but results in a string. In the above example, the resulting + code fragment would be the following:: + + "alpha-function" + +`"{prefix}" ## ?#"{name}" ## "{suffix}"` + As above, but results in a symbol. + + +List substitutions +================== + +`??{name} ...` + Used with a `??`-style pattern variable to make a list. Consider a + pattern variable, `??name-parts`, that contains the following code + fragments:: + + alpha beta gamma + + The pattern variable is referenced by the following template and + substitution:: + + { ??name-parts ... } + + The expansion will be the following code fragment:: + + alpha beta gamma + +`??{name}, ...` + As above, but the expansion would be the following:: + + alpha,beta,gamma + + Consider if `??name-parts` contained the following code fragment:: + + alpha + + The expansion would be the following, without any commas:: + + alpha + + Any of the separators [seps]_ may be used in place of a comma in the + tempate. + + +Auxiliary rule set substitution +=============================== + +`...` + This syntax can only be used within an auxiliary rule set. If the rule + set is named `my-aux-rules`, this syntax is equivalent to + `?my-aux-rules`. + + +Unhygienic reference +==================== + +`?={binding}` + This is not a substitution, but a way to refer to a binding in the + macro's caller. See `hygiene`:ref:. From 495b6088d0c654fe1fed1788df0ada257ba0cf5e Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sat, 17 Dec 2011 23:27:08 -0500 Subject: [PATCH 091/519] Common Dylan libary reference -> Core library reference. Grammar changes. --- .../website/source/documentation/index.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index 876a20aafc..7fd6077f8a 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -27,8 +27,9 @@ Documentation [`pdf `__] This tutorial is written primarily for those with solid programming - experience in C++ or another object-oriented static language. It - provides a gentler introduction to Dylan than does the DRM. + experience in C++ or another object-oriented, static language. It + provides a gentler introduction to Dylan than does the Dylan Reference + Manual (DRM). `Dylan Programming `_ @@ -102,13 +103,13 @@ Documentation The official definition of the Dylan language and standard library. -`Common Dylan library reference `_ +`Core library reference `_ [`pdf `__] [`old HTML `__] Describes the Open Dylan implementation of the Dylan language, a - common set of Dylan libraries, and a library interchange mechanism. - The common libraries provide many language extensions, a threads + core set of Dylan libraries, and a library interchange mechanism. + The core libraries provide many language extensions, a threads interface, and object finalization. `System and I/O library reference `_ @@ -138,11 +139,11 @@ Documentation .. raw:: html
-

Open Dylan Developers

+

For Open Dylan Developers

Notes and materials useful to those working on - Open Dylan itself or have an interest in the low + Open Dylan itself or those who have an interest in the low level details.

From b866caf21803e8a90a423705622c6f899e945485 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Thu, 22 Dec 2011 10:58:40 -0500 Subject: [PATCH 092/519] Change SLIME to DIME --- .../website/source/news/2011/12/12/dswank.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/documentation/website/source/news/2011/12/12/dswank.rst b/documentation/website/source/news/2011/12/12/dswank.rst index d1029844c9..7ee83c1c93 100644 --- a/documentation/website/source/news/2011/12/12/dswank.rst +++ b/documentation/website/source/news/2011/12/12/dswank.rst @@ -1,10 +1,10 @@ :Author: Hannes Mehnert :Date: 2011-12-12 23:30:00 -Development inside of Emacs using SLIME -======================================= +Development inside of Emacs using DIME +====================================== -We have implemented a Dylan backend for SLIME using the Open Dylan +We have implemented a Dylan backend for DIME using the Open Dylan environment-protocols API to ease development of Dylan code on UNIX. At present, cross references, locating definitions, retrieving argument lists, compiling, warning reports and a class browser are @@ -17,21 +17,21 @@ implemented.
-When successfully installed, just run ``M-x slime`` to get a shell. +When successfully installed, just run ``M-x dime`` to get a shell. This is the same as the dylan-compiler shell, you can also use the same commands. When you program and hit ``(`` or ``,`` or ``(space)``, you get the argument list of the method you are calling. -``M-x slime-dylan-browse-superclasses`` will show the superclass hierarchy -of the current class. ``M-x slime-dylan-browse-subclasses`` displays the +``M-x dime-dylan-browse-superclasses`` will show the superclass hierarchy +of the current class. ``M-x dime-dylan-browse-subclasses`` displays the subclass hierarchy. +-------------------+------------------------------------------+ | Keyboard shortcut | Effect | +===================+==========================================+ -|M-x slime |start slime | +|M-x dime |start dime | +-------------------+------------------------------------------+ | , change-package | select project (in the repl buffer) | +-------------------+------------------------------------------+ @@ -53,12 +53,12 @@ subclass hierarchy. Dswank uses the Open Dylan project registry, so make sure ``OPEN_DYLAN_USER_REGISTRIES`` is set properly before starting Emacs. +DIME is a fork of SLIME. Installation ============ You need the following pieces: - * `SLIME `_ - since the CVS is a moving target, this is a safe version to use (February 2011 snapshot) * `dylan-mode `_, and extend your ``~/.emacs`` as documented in README) * dswank itself is shipped with the 2011.1 release From 163c64668515f56a49ff345523547189fbe7baec Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Thu, 22 Dec 2011 11:36:03 -0500 Subject: [PATCH 093/519] More SLIME -> DIME --- documentation/website/source/documentation/index.rst | 4 ++-- documentation/website/source/news/recent.rst.inc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index 7fd6077f8a..e302c3e7a7 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -81,9 +81,9 @@ Documentation

Tools

-`Development inside emacs using SLIME <../news/2011/12/12/dswank.html>`_ +`Development inside emacs using DIME <../news/2011/12/12/dswank.html>`_ - An exciting look at using SLIME and emacs for Dylan development. + An exciting look at using DIME and emacs for Dylan development. .. raw:: html diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index b04b8c16a7..fb1b5ba5b8 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,9 +1,9 @@ -**Dswank - a SLIME back-end** +**Dswank - emacs and SLIME** *2011-12-12* -We developed a back-end for SLIME, the superior lisp interaction -mode for emacs. Now, you can browse the class hierarchy, get +We developed DIME, the Dylan interaction mode for emacs, based +on SLIME. Now, you can browse the class hierarchy, get argument lists, locate definitions, compile, view warnings and more, all from within emacs! From d5da2166c41c2d0d659421548ba344e88431a253 Mon Sep 17 00:00:00 2001 From: Dustin Voss Date: Sat, 17 Dec 2011 19:11:06 -0800 Subject: [PATCH 094/519] Revised "Dylan Macro System" article. Fixed crappy code box formatting, added navigation, improved some content. --- .../articles/macro-system/auxiliary-rules.rst | 300 ++++++++++-------- .../macro-system/background-overview.rst | 43 ++- .../source/articles/macro-system/faq-tips.rst | 64 ++-- .../source/articles/macro-system/hygiene.rst | 101 +++--- .../source/articles/macro-system/index.rst | 12 +- .../articles/macro-system/macro-types.rst | 46 ++- .../macro-system/pattern-variables.rst | 28 +- .../source/articles/macro-system/patterns.rst | 43 ++- .../articles/macro-system/substitutions.rst | 25 +- documentation/website/source/conf.py | 2 +- .../website/source/documentation/index.rst | 5 + 11 files changed, 406 insertions(+), 263 deletions(-) diff --git a/documentation/website/source/articles/macro-system/auxiliary-rules.rst b/documentation/website/source/articles/macro-system/auxiliary-rules.rst index 500860ff93..3f4e85d2ac 100644 --- a/documentation/website/source/articles/macro-system/auxiliary-rules.rst +++ b/documentation/website/source/articles/macro-system/auxiliary-rules.rst @@ -1,18 +1,30 @@ +:copyright: Copyright © 2011 Dustin Voss, All Rights Reserved. + .. default-role:: samp .. highlight:: dylan -.. _auxiliary-rules: +.. sidebar:: Navigation + + :Next: :doc:`hygiene` + :Prev: :doc:`substitutions` + :Top: :doc:`index` + + .. contents:: + :local: ****************************** Auxiliary Rules and Expansions ****************************** +Auxiliary Rules +=============== + Auxiliary rules transform the code fragment contained in a pattern variable before it is substituted into a template. -Auxiliary rule sets follow the syntax described in `patterns`:ref: and have the +Auxiliary rule sets follow the syntax described in :doc:`patterns` and have the behaviors described on that page. They do not have the special elements like -`define` or `{modifiers}` shown in `macro-types`:ref:, but the macro type does +`define` or `{modifiers}` shown in :ref:`main-rules`, but the macro type does place certain *de facto* restrictions on what can appear in auxiliary rule patterns: @@ -25,7 +37,7 @@ An auxiliary rule set comes into play when a pattern variable matches a code fragment and that pattern variable is named the same as the auxiliary rule set. Usually, the pattern variable is a wildcard variable written without a constraint, but the pattern variable can use any of the forms described in -`patterns`:ref:, including the `#key` and `??{name}:{constraint}` forms. +:doc:`patterns`, including the `#key` and `??{name}:{constraint}` forms. After the pattern variable matches and is set to a code fragment, that code fragment is matched against the rules of the auxiliary rule set. If a rule's @@ -33,18 +45,29 @@ pattern matches the code fragment, that rule's template is expanded and replaces the code fragment contained by the pattern variable. If no rules match the code fragment, macro expansion fails. -If the pattern variable named the same as the rule set is a ``??``-style pattern +If the pattern variable named the same as the rule set is a `??`-style pattern variable, the process is similar, except each code fragment in the pattern variable is individually matched and transformed by the auxiliary rules. -Expansion examples -================== +Expansions +========== + +This section discusses expansions through a series of examples. The examples are +all variations of a function macro named `version` that builds a version number +in a specific format and sets it by calling a function `set-version`. The +`set-version` function is declared like this:: + + define function set-version (version-string :: ) => () -Consider a macro [ver1]_ that makes it easier to generate version numbers. The -macro is called by [ver1-call]_ and expands to [ver1-exp]_. -The `?type` pattern variable in line 1 of the macro definition matches ``alpha`` +Simple expansion +---------------- + +First, let us consider the macro definition `Definition 1`_. The macro is called +by `Call 1`_ and expands to `Expansion 1`_. + +The `?type` pattern variable in line 1 of the macro definition matches `alpha` in the call. After the variable matches, the `type:` auxiliary rule set in lines 4–7 rewrite the contents of the pattern variable according to the matching rule in line 5. The matching rule expands to the string `"a"`, which replaces the @@ -54,7 +77,7 @@ the expansion. ---------- -.. [ver1] *Version macro* +_`Definition 1`: .. code-block:: dylan :linenos: @@ -68,32 +91,35 @@ the expansion. { release } => { } end macro -.. [ver1-call] *Macro call* +_`Call 1`: .. code-block:: dylan - + version("1.2", alpha) -.. [ver1-exp] *Macro expansion* +_`Expansion 1`: .. code-block:: dylan - + set-version("1.2" "a") + .. tip:: Dylan compiles `"1.2" "a"` like `"1.2a"`. + ---------- Effect of constraints ---------------------- +^^^^^^^^^^^^^^^^^^^^^ -Now consider if the auxiliary rules were rewritten as [ver2]_. This macro might -be intended to create a version number like `"1.0a1"` if called by [ver2-call]_. -However, the macro will never succeed. `?type` in line 2 is constrained to -always be a simple name. None of the patterns in the `type:` auxiliary rule set -match a simple name (they all expect commas), so the macro expansion will fail. +Now consider if the auxiliary rules were rewritten as `Definition 2`_. This +macro is intended to be called by `Call 2`_ to create a version number like +`"1.0a1"`. However, the macro will never succeed. `?type` in line 2 is +constrained to always be a simple name. None of the patterns in the `type:` +auxiliary rule set match a simple name (they all expect commas), so the macro +expansion will fail. ---------- -.. [ver2] *Version macro 2* +_`Definition 2`: .. code-block:: dylan :linenos: @@ -108,7 +134,7 @@ match a simple name (they all expect commas), so the macro expansion will fail. { release, ?n:expression } => { } end macro -.. [ver2-call] *Macro call* +_`Call 2`: .. code-block:: dylan @@ -116,30 +142,30 @@ match a simple name (they all expect commas), so the macro expansion will fail. ---------- -Missing code fragments ----------------------- +Empty and missing code fragments +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ An auxiliary rule set can match against a missing code fragment. Consider the -following code which calls [ver1]_: +following code which calls either of the above `version` macros: .. code-block:: dylan version("1.0") -With this macro call, the `?number` pattern variable would -contain `"1.0"` and `?type` would be empty, as described in -`final-items`:ref:. The macro would fail to match this code -fragment, since the `name`` constraint of the `?type` variable does not match -a missing code fragment. +With this macro call, the `?number` pattern variable would contain `"1.0"` and +`?type` would be empty, as described in :ref:`final-items`. The macro would fail +to match this code fragment, since the `name` constraint of the `?type` +variable does not match a missing code fragment. -If we changed the macro definition to include a wildcard constraint [ver3]_, the -macro would still fail to match the code fragment because the `type:` -auxiliary rule set does not have a pattern that matches a missing code fragment. -We would also have to add that rule [ver4]_. +If we changed the macro definition to include a wildcard constraint, as in +`Definition 3`_, the macro would still fail to match the code fragment because +the `type:` auxiliary rule set does not have a pattern that matches a missing +code fragment. We would also have to add the rule highlighted in `Definition +4`_. ---------- -.. [ver3] *Macro with wildcard* +_`Definition 3`: .. code-block:: dylan :linenos: @@ -154,11 +180,11 @@ We would also have to add that rule [ver4]_. { release } => { } end macro -.. [ver4] *Macro with wildcard and empty pattern* +_`Definition 4`: .. code-block:: dylan :linenos: - :emphasize-lines: 2,8 + :emphasize-lines: 8 define macro version { version(?number:expression, ?type:*) } @@ -172,40 +198,72 @@ We would also have to add that rule [ver4]_. ---------- -Final exam + +Complex expansion +----------------- + +Now suppose we wanted to support the syntax `Call 5`_. This macro should expand +to `Expansion 5`_ to generate a version number like `"1.042a"`. The macro could +be defined by the code `Definition 5`_. + ---------- -Now suppose we wanted to support the syntax [ver5-call]_. This macro should -expand to [ver5-exp]_ to generate a version number like "1.042a". The macro -could be defined by the code [ver5]_. There are several interesting aspects to -this version of the macro that I would like to point out. +_`Definition 5`: -Required and optional properties -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + .. code-block:: dylan + :linenos: + + define macro version + { version(#key ?major:expression, ??rev:expression, ?type:name = none) } + => { set-version(concatenate(?major, ".", ??rev, ..., ?type)) } + major: + { ?rev } => { ?rev } + rev: + { ?:expression } => { format-to-string("%s", ?expression) } + type: + { alpha } => { "a" } + { beta } => { "b" } + { release } => { } + { none } => { } + end macro + +_`Call 5`: + + .. code-block:: dylan + + version(major: 1, rev: 0, rev: 4, rev: 2, type: alpha) + +_`Expansion 5`: + + .. code-block:: dylan + + set-version(concatenate("1", ".", "0", 4", "2", "a")) + +---------- + +Property lists and optional properties +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The macro call must include the `major:` property, but the `rev:` and `type:` -properties are optional. `rev:` is optional because it is a ``??``-type pattern +properties are optional. `rev:` is optional because it is a `??`-type pattern variable, and `type:` is optional because the pattern variable includes a default value. If the macro call did not include any `rev:` properties, the substitution for `??rev, ...` would be empty. This would cause the comma after `"."` in line 3 to vanish. If the macro call did not include `type:`, the substitution for -``?type`` in line 3 would be empty because the defaulted pattern variable +`?type` in line 3 would be empty because the defaulted pattern variable matches the pattern of the auxiliary rule in line 12, and the template for that rule is empty. Because `?type` in line 3 would be empty, the comma after `??rev, ...` would vanish. -Property symbols -^^^^^^^^^^^^^^^^ +You may have noted that the `major:`, `rev:`, and `type:` auxiliary rule sets do +not include the actual `major:`, `rev:`, or `type:` symbols found in the macro +call. This is because `#key`-type pattern variables contain only the value parts +of properties, not the symbol parts. -The `major:`, `rev:`, and `type:` auxiliary rule sets do not include the actual -`major:`, `rev:`, or `type:` symbols found in the macro call. This is because -``#key``-type pattern variables contain only the value parts of properties, not -the symbol parts. - -``??`` and ``?`` pattern variables -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +`??` and `?` pattern variables +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The main rule and the `major:` auxiliary rule set both contain a pattern variable named `rev`, though it is `??rev:expression` in the main rule (line 2) @@ -229,7 +287,7 @@ individually. The `??rev, ...` substitution in line 3 then joins each of the transformed code fragments with a comma and includes the entire collection in the macro expansion. -Empty ``??`` pattern variables +Empty `??` pattern variables ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In line 2, the `?type` variable has a default. If the macro call @@ -242,115 +300,85 @@ fragment. Since the `rev:` rule does not include an empty pattern, you might expect the macro to fail. But the macro still works. The `rev:` rule will be applied to each code fragment -in `??rev` individually because it is a ``??``-type pattern variable. Since +in `??rev` individually because it is a `??`-type pattern variable. Since there are no code fragments in `??rev`, the `rev:` is not even applied once, so its lack of an empty pattern is irrelevant. ----------- - -.. [ver5-call] *Complex syntax call* - - .. code-block:: dylan - - version(major: 1, rev: 0, rev: 4, rev: 2, type: alpha) - -.. [ver5-exp] *Complex expansion* - - .. code-block:: dylan - - set-version(concatenate("1", ".", "0", 4", "2", "a")) - -.. [ver5] *Complex macro definition* - - .. code-block:: dylan - :linenos: - - define macro version - { version(#key ?major:expression, ??rev:expression, ?type:name = none) } - => { set-version(concatenate(?major, ".", ??rev, ..., ?type)) } - major: - { ?rev } => { ?rev } - rev: - { ?:expression } => { format-to-string("%s", ?expression) } - type: - { alpha } => { "a" } - { beta } => { "b" } - { release } => { } - { none } => { } - end macro - ----------- Recursive expansion -=================== +------------------- Any pattern variable named the same as an auxiliary rule is processed by that rule. That includes pattern variables in the auxiliary rule itself. This recursive behavior is useful for processing lists of items. The `...` pattern variable and substitution syntaxes draw attention to a -recursive rule. Using that syntax, the macros [rec1]_ and [rec2]_ are -equivalent. But I feel there is a good argument for avoiding that syntax for -clarity's sake. +recursive rule. Using that syntax, the macros `Definition 6`_ and `Definition +7`_ are equivalent. But I feel there is a good argument for avoiding that syntax +for clarity's sake. + +Tracing this call of the macro shows how macro recursion works:: + + let (x, y) = path(north 5, east 3, south 1, east 2) -Tracing a call of the macro [rec1-call]_ shows how macro recursion works. +The patterns and templates will be evaluated as follows: -1. The main rule pattern matches. ``?steps`` is set to ``north 5, east 3, south - 1, east 2``. -#. The contents of ``?steps`` is rewritten by the *steps* auxiliary rule set. +1. The main rule pattern matches. `?steps` is set to + `north 5, east 3, south 1, east 2`. +#. The contents of `?steps` is rewritten by the `steps:` auxiliary rule set. - a. The "north" rule is matched against ``north 5, east 3, south 1, east 2``. + a. The "north" rule is matched against `north 5, east 3, south 1, east 2`. The pattern is a comma-separated pattern, which matches the code fragment. - The word ``north`` and the token ``5`` match. As described in - `final-items`:ref:, the ``?steps`` pattern variable belonging to this - pattern-match operation is set to ``east 3, south 1, east 2``. - #. The contents of this rule's ``?steps`` variable is rewritten by the *steps* + The word `north` and the token `5` match. As described in + :ref:`final-items`, the `?steps` pattern variable belonging to this + pattern-match operation is set to `east 3, south 1, east 2`. + #. The contents of this rule's `?steps` variable is rewritten by the `steps:` auxiliary rule set. - i. The "north," "south," and "west" rules fail to match against ``east 3, - south 1, east 2``. - #. The "east" rule matches and the ``?steps`` pattern variable of this - pattern-match operation (different from any other ``?steps`` variable - being dealt with) is set to ``south 1, east 2``. - #. ``?steps`` is rewritten by another pass through the *steps* rule set. + i. The "north," "south," and "west" rules fail to match against + `east 3, south 1, east 2`. + #. The "east" rule matches and the `?steps` pattern variable of this + pattern-match operation (different from any other `?steps` variable + being dealt with) is set to `south 1, east 2`. + #. `?steps` is rewritten by another pass through the `steps:` rule set. - 1. The "south" rule matches and its ``?steps`` is set to ``east 2``. - #. ``?steps`` is rewritten. + 1. The "south" rule matches and its `?steps` is set to `east 2`. + #. `?steps` is rewritten. a. The "north," "south," and "west" rules fail to match. - #. The "east" rule is matched against ``east 2``. The word ``east`` and - the token ``2`` match. The code fragment does not contain a comma, but - the pattern matches the code fragment without the comma per - `final-items`:ref:. The ``?steps`` pattern variable will contain an + #. The "east" rule is matched against `east 2`. The word `east` and + the token `2` match. The code fragment does not contain a comma, + but the pattern matches the code fragment without the comma per + :ref:`final-items`. The `?steps` pattern variable will contain an empty code fragment. - #. Even though ``?steps`` contains an empty code fragment, it is still - rewritten by the *steps* auxiliary rule set. + #. Even though `?steps` contains an empty code fragment, it is still + rewritten by the `steps:` auxiliary rule set. - i. The "north," "south," "west," and "east" rules fail to match against - an empty code fragment. + i. The "north," "south," "west," and "east" rules fail to match + against an empty code fragment. #. The empty pattern matches. Its expansion is an empty fragment. - #. The ``?steps`` pattern variable of the "east" rule is set to the + #. The `?steps` pattern variable of the "east" rule is set to the expansion of the auxiliary rule set, i.e., an empty fragment. - #. The rule's expansion is therefore ``x := x + 2``. + #. The rule's expansion is therefore `x := x + 2`. - #. The ``?steps`` pattern variable of the "south" rule is set to ``x := x + - 2``. - #. The rule's expansion is therefore ``y := y + 1; x := x + 2``. + #. The `?steps` pattern variable of the "south" rule is set to + `x := x + 2`. + #. The rule's expansion is therefore `y := y + 1; x := x + 2`. - #. The ``?steps`` pattern variable of the "east" rule is set to ``y := y + 1; - x := x + 2``. - #. The rule's expansion is therefore ``x := x + 3; y := y + 1; x := x + 2`` + #. The `?steps` pattern variable of the "east" rule is set to + `y := y + 1; x := x + 2`. + #. The rule's expansion is therefore `x := x + 3; y := y + 1; x := x + 2` …and so on. The key ideas to note are: -- The rule set has to have a non-recursing rule (in this case, ``{ } => { }``) -- Each rule's matching and expansion has its own ``?token`` and ``?steps`` +- The rule set has to have a non-recursing rule (in this case, `{ } => { }`) +- Each rule's matching and expansion has its own `?token` and `?steps` pattern variable. ---------- -.. [rec1] *Recursive macro* +_`Definition 6`: .. code-block:: dylan :linenos: @@ -365,7 +393,7 @@ Tracing a call of the macro [rec1-call]_ shows how macro recursion works. { } => { } end macro -.. [rec2] *Recursive macro with ellipses* +_`Definition 7`: .. code-block:: dylan :linenos: @@ -380,9 +408,3 @@ Tracing a call of the macro [rec1-call]_ shows how macro recursion works. { east ?:token, ... } => { x := x + ?token; ... } { } => { } end macro - -.. [rec1-call] *Recursive macro call* - - .. code-block:: dylan - - let (x, y) = path(north 5, east 3, south 1, east 2) diff --git a/documentation/website/source/articles/macro-system/background-overview.rst b/documentation/website/source/articles/macro-system/background-overview.rst index 2aef3a5227..096192b500 100644 --- a/documentation/website/source/articles/macro-system/background-overview.rst +++ b/documentation/website/source/articles/macro-system/background-overview.rst @@ -1,6 +1,15 @@ +:copyright: Copyright © 2011 Dustin Voss, All Rights Reserved. + .. default-role:: dfn .. highlight:: dylan -.. _background-overview: +.. sidebar:: Navigation + + :Next: :doc:`macro-types` + :Prev: :doc:`index` + :Top: :doc:`index` + + .. contents:: + :local: *********************** @@ -58,13 +67,15 @@ combined fragments and substitutions form the macro's `expansion`, which replaces the original code fragment. This happens recursively: after a macro is expanded, its expansion is scanned -for additional macro call code fragments, and those are expanded in turn. Macros -are recognized by way of a `distinguishing word` and a certain syntactic style. +for additional macro call code fragments, and those are expanded in turn. The +parser recognizes a macro call code fragment by way of a `distinguishing word` +and the type of syntax associated with the macro (discussed further in +:doc:`macro-types`). -Let us examine a function macro [defn]_. This macro might be called by the code -[orig]_, but the actual call fragment [frag]_ is what the parser will attempt to -match. The macro's expansion will be [exp]_ and the original code will then -become [new]_. +Let us examine `Function Macro`_. This macro might be called by the code +`Original Code`_, but the actual call fragment `Call Fragment`_ is what the +parser will attempt to match. The macro's expansion will be `Expansion`_ and the +original code will then become `Replacement Code`_. Here are the parts of the macro: @@ -81,14 +92,14 @@ Here are the parts of the macro: ``?table-contents``, ``?rest``, ``?key``, and ``?value``. - The substitutions in this macro include those same names. -Note that the expansion [new]_ is surrounded by ``begin`` and ``end``. Macro -expansions are always surrounded by a begin…end block. This helps with macro -hygiene (i.e. preventing bindings outside of a macro call from being affected by -bindings used in a macro's expansion). I discuss hygiene `later `:ref:. +Note that the expansion is surrounded by ``begin`` and ``end``. Macro expansions +are always surrounded by a begin…end block. This helps with macro hygiene (i.e. +preventing bindings outside of a macro call from being affected by bindings used +in a macro's expansion). I discuss hygiene :doc:`here `. ---------- -.. [defn] *Definition* +_`Function Macro`: .. code-block:: dylan :linenos: @@ -104,25 +115,25 @@ bindings used in a macro's expansion). I discuss hygiene `later `:ref:. => { ht[?key] := ?value; ... } end macro table -.. [orig] *Original code* +_`Original Code`: .. code-block:: dylan let lights = table(, "red" => "stop", "green" => "go"); -.. [frag] *Call fragment* +_`Call Fragment`: .. code-block:: dylan table(, "red" => "stop", "green" => "go") -.. [exp] *Expansion* +_`Expansion`: .. code-block:: dylan let ht = make(); ht["red"] := "stop"; ht["green"] := "go"; ht; -.. [new] *Replacement code* +_`Replacement Code`: .. code-block:: dylan diff --git a/documentation/website/source/articles/macro-system/faq-tips.rst b/documentation/website/source/articles/macro-system/faq-tips.rst index 3ac48ec159..7328c4e810 100644 --- a/documentation/website/source/articles/macro-system/faq-tips.rst +++ b/documentation/website/source/articles/macro-system/faq-tips.rst @@ -1,13 +1,19 @@ .. default-role:: samp .. highlight:: none -.. _faq-tips: +.. sidebar:: Navigation + + :Next: + :Prev: :doc:`hygiene` + :Top: :doc:`index` + + .. contents:: + :local: ************ FAQ and Tips ************ - General advice and troubleshooting ================================== @@ -29,21 +35,22 @@ General advice and troubleshooting How can I combine multiple names into one? ========================================== -This template will not work:: +There is no real way to do this for names or symbols. The concatenating +substitution forms do not scale, so this template will not work:: { define ?name-1 ## "-" ## ?name-2 ## "-function" () } -What you want is easily done for the `?"{name}"` substitution form by taking -advantage of adjacent string concatenation:: +However, you can easily combine multiple names into a string by taking advantage +of adjacent string concatenation:: { format-out(?"name-1" "-" ?"name-2" "-function") } -But this will not work for the `?{name}` or `?#"{name}"` substitution forms. For -those, you have to use an auxiliary macro to construct a name. +Your best bet may be to do some sort of string-based introspection, or create +anonymous definitions stored in a table keyed by a string. -How can I do macros that follow a BNF-like syntax? -================================================== +How can I write macros that follow a BNF-like syntax? +===================================================== Macros are designed to follow Dylan language conventions, so you may not be able to support arbitrary BNF-based syntax. But here are some tricks to help with @@ -103,21 +110,34 @@ common BNF forms. I can't make a bare list! ========================= -A macro that makes a bare list can't do anything useful. For example, this will -not compile:: +A macro that makes a bare list (by which I mean a simple list of comma-separated +names) cannot do anything useful with it. Macros build cohesive code fragments, +and a bare list is not such a code fragment. - define macro setter-names - { setter-names(?names) } => { ?names } - names: - { ?:name, ... } => { ?name ## "-setter", ... } - end macro; - - vector(setter-names(alpha, beta, gamma, delta)) +For example, this will not compile:: + + define macro setter-names + { setter-names(?names) } => { ?names } + names: + { ?:name, ... } => { ?name ## "-setter", ... } + end macro; + + vector(setter-names(alpha, beta, gamma, delta)) It does not compile because the expansion of `setter-names` is wrapped in a -begin…end:: +begin…end, resulting in this invalid syntax:: + + vector(begin alpha-setter, beta-setter, gamma-setter, delta-setter end) - vector(begin alpha-setter, beta-setter, gamma-setter, delta-setter end) +Instead, do something with the list in the macro itself: -This is invalid syntax. You need to do something with the list in the macro -itself. +.. code-block:: dylan + :emphasize-lines: 2, 7 + + define macro setter-vector + { setter-vector(?names) } => { vector(?names) } + names: + { ?:name, ... } => { ?name ## "-setter", ... } + end macro; + + setter-vector(alpha, beta, gamma, delta) diff --git a/documentation/website/source/articles/macro-system/hygiene.rst b/documentation/website/source/articles/macro-system/hygiene.rst index 987013889b..4fb8301ce4 100644 --- a/documentation/website/source/articles/macro-system/hygiene.rst +++ b/documentation/website/source/articles/macro-system/hygiene.rst @@ -1,6 +1,15 @@ +:copyright: Copyright © 2011 Dustin Voss, All Rights Reserved. + .. default-role:: samp .. highlight:: dylan -.. _hygiene: +.. sidebar:: Navigation + + :Next: :doc:`faq-tips` + :Prev: :doc:`auxiliary-rules` + :Top: :doc:`index` + + .. contents:: + :local: ******* @@ -11,24 +20,38 @@ Let us say we have two macros A and B. The expansion of A calls B. The following diagram shows the sources or lexical scopes of a binding used in the expansion of A and B. -.. code-block:: none - - +--------------------------------+ +-------------------------------------+ - | [1] Module or local scope of | | [4] Module containing definition of | - | the call to macro A | | macro A | - | | | | - | +--------------------------+ | +-------------------------------------+ - | | [2] Expansion of A | | - | | | | +-------------------------------------+ - | | +--------------------+ | | | [5] Module containing definition of | - | | | [3] Expansion of B | | | | macro B | - | | | | | | | | - | | +--------------------+ | | +-------------------------------------+ - | | | | - | +--------------------------+ | - | | - +--------------------------------+ - +.. raw:: html + + 
+   ╒═════════════════════════════════════╕
+   │ [1] Module or local scope of a call │    
+   │     to macro A                      │    
+   │                                     │    
+   │  ┌───────────────────────────────┐  │
+   │  │ [2] Expansion of A            │  │    
+   │  │                               │  │     
+   │  │  ┌─────────────────────────┐  │  │     
+   │  │  │ [3] Expansion of B      │  │  │     
+   │  │  │                         │  │  │     
+   │  │  └─────────────────────────┘  │  │     
+   │  │                               │  │ 
+   │  └───────────────────────────────┘  │ 
+   │                                     │ 
+   ╘═════════════════════════════════════╛
+
+   ╒═════════════════════════════════════╕
+   │ [4] Module containing definition of │
+   │     macro A                         │
+   │                                     │
+   ╘═════════════════════════════════════╛
+   
+   ╒═════════════════════════════════════╕
+   │ [5] Module containing definition of │
+   │     macro B                         │
+   │                                     │
+   ╘═════════════════════════════════════╛
+
+ Macro expansions are hygienic, meaning: - Bindings from boxes 2 or 4 are visible in box 2. @@ -54,10 +77,10 @@ Breaking hygiene A template can prefix a binding with `?=`. This makes the binding come from and be visible in the macro's caller. This can be illustrated by an example from -`Dylan Programming`:title:. +:title:`Dylan Programming`. -Say macro A is defined in box 4 as [rep]_. Code in box 1 can call the macro as -follows: +Say macro A defined in box 4 is `Definition 1`_, and the macro call in box 1 is +the following: .. code-block:: dylan @@ -67,25 +90,25 @@ follows: i := i + 1; end -The `?=stop!` substitution in line 3 of the macro expands (in box 2) to a +The `?=stop!` substitution in line 3 of the macro becomes a reference to a binding visible in boxes 1 and 2. In box 1, the binding is visible as `stop!`. -In box 2 (the expansion itself), the binding is visible as `?=stop!` and if it -were a function, the macro template could contain code fragments like this: - -.. code-block:: dylan - - ?=stop!(arg-1, arg-2) - -Note that a macro expansion cannot create a new binding visible outside of the -macro call in box 1. For example, given a macro like [dofoo]_, one might expect -the macro call [dofoo-call]_ would print "Hello" twice, but it will not work. -Because every macro expansion is implicitly surrounded by begin…end as described -in `background-overview`:ref:, the example expands into [dofoo-exp]_. After the +In box 2 (the expansion itself), the binding is visible as `?=stop!` and can be +used like any other binding (e.g. `format-out`) as shown by the highlighted +line. + +Note that that a macro expansion cannot create a new binding visible outside of +the macro call itself (except by way of a top-level `define` statement). In +other words, box 2 cannot create a local binding for use elsewhere in box 1. + +For example, given the macro in `Definition 2`_, one might expect the macro call +in `Call 2`_ would print "Hello" twice, but the code does not compile. Because +every macro expansion is implicitly surrounded by begin…end as described in +:doc:`background-overview`, the example expands into `Expansion 2`_. After the macro call, `foo` is no longer in scope. ---------- -.. [rep] *Repeat macro* +_`Definition 1`: .. code-block:: dylan :linenos: @@ -99,7 +122,7 @@ macro call, `foo` is no longer in scope. end } end macro -.. [dofoo] *Do-then-foo macro* +_`Definition 2`: .. code-block:: dylan :linenos: @@ -109,14 +132,14 @@ macro call, `foo` is no longer in scope. => { let ?=foo = ?expression; ?body } end macro -.. [dofoo-call] *Calling do-then-foo* +_`Call 2`: .. code-block:: dylan do-then-foo("Hello\n") format-out(foo) end; format-out(foo) -.. [dofoo-exp] *Expansion of do-then-foo* +_`Expansion 2`: .. code-block:: dylan diff --git a/documentation/website/source/articles/macro-system/index.rst b/documentation/website/source/articles/macro-system/index.rst index 221d7f891c..6ef8b0a969 100644 --- a/documentation/website/source/articles/macro-system/index.rst +++ b/documentation/website/source/articles/macro-system/index.rst @@ -1,3 +1,11 @@ +:copyright: Copyright © 2011 Dustin Voss, All Rights Reserved. + +.. sectionauthor:: Dustin Voss +.. sidebar:: Navigation + + :Next: :doc:`background-overview` + + ###################### The Dylan Macro System ###################### @@ -10,8 +18,8 @@ complicated jobs get hard fast. This document describes how the Dylan macro system works and some techniques you can use when writing your own macros. I gloss over some of the implementation -details and present this information more informally than the `Dylan -Reference Manual`:title: does. +details and present this information more informally than the :title:`Dylan +Reference Manual` does. .. toctree:: :maxdepth: 2 diff --git a/documentation/website/source/articles/macro-system/macro-types.rst b/documentation/website/source/articles/macro-system/macro-types.rst index f471da0a19..600de06d66 100644 --- a/documentation/website/source/articles/macro-system/macro-types.rst +++ b/documentation/website/source/articles/macro-system/macro-types.rst @@ -1,6 +1,15 @@ +:copyright: Copyright © 2011 Dustin Voss, All Rights Reserved. + .. default-role:: samp .. highlight:: none -.. _macro-types: +.. sidebar:: Navigation + + :Next: :doc:`patterns` + :Prev: :doc:`background-overview` + :Top: :doc:`index` + + .. contents:: + :local: *********** @@ -11,8 +20,7 @@ There are four types of macro. `Body-style definition macro`:dfn: This kind of macro lets you create `define x … end` syntax. This is the - most popular kind of macro. This type of macro can only be used at the top - level of source code. + most popular kind of macro. `List-style definition macro`:dfn: This kind of macro lets you create `define x …` syntax, such as `define @@ -30,6 +38,36 @@ There are four types of macro. needed around a normal function call. +Macro definitions +================= + +All macros are defined by the `define macro` macro, which follows this general +syntax, with optional parts in brackets:: + + define macro MACRO-NAME + MAIN-RULE-SET + [AUXILIARY-RULE-SETS] + end macro MACRO-NAME + +`{MACRO-NAME}` + For statement and function macros, this is the macro's distinguishing + word. For body-style and list-style definition macros, though, it is the + distinguishing word plus `-definer`. + +`{MAIN-RULE-SET}` + One or more pattern/template pairs. The syntax that the patterns all + follow determine the type of the macro, and are described `below + `_. The patterns are matched in order; see :doc:`patterns`. + +`{AUXILIARY-RULE-SETS}` + One or more auxiliary rule sets, described in more detail in + :doc:`auxiliary-rules`. Each rule set has a name (which is syntactically a + symbol) and one or more pattern/template pairs. The name may be written as + `my-aux-ruleset:` or `#"my-aux-ruleset"`; both are the same. + + +.. _`main-rules`: + Main rules ========== @@ -100,7 +138,7 @@ Statement macro The main rules' patterns must follow this syntax, with optional parts in brackets:: - { DISTINGUISHING-WORD [`{BODY-PATTERNS}`] [;] end } + { DISTINGUISHING-WORD [BODY-PATTERNS] [;] end } `{BODY-PATTERNS}` One or more sets of code fragments and pattern variables separated by diff --git a/documentation/website/source/articles/macro-system/pattern-variables.rst b/documentation/website/source/articles/macro-system/pattern-variables.rst index 15cd4afc1c..222067e1f1 100644 --- a/documentation/website/source/articles/macro-system/pattern-variables.rst +++ b/documentation/website/source/articles/macro-system/pattern-variables.rst @@ -1,6 +1,15 @@ +:copyright: Copyright © 2011 Dustin Voss, All Rights Reserved. + .. default-role:: samp .. highlight:: none -.. _pattern-variables: +.. sidebar:: Navigation + + :Next: :doc:`substitutions` + :Prev: :doc:`patterns` + :Top: :doc:`index` + + .. contents:: + :local: ***************** @@ -89,7 +98,7 @@ Property list pattern variables part of `{prop-1}:` or `{prop-2}:`. The substitution for `??{prop-1}` is several code fragments, each being the value part of a `{prop-1}:` property. The substitution may use a separator between each - code fragment as described in the `substitutions`:ref: section. + code fragment as described in :doc:`substitutions`. For example, consider this pattern:: @@ -223,17 +232,18 @@ Body and macro pattern variables variable and cannot be followed by a comma or semicolon. `?{name}:macro` - This matches any macro call. This includes calls to definition macros, - which normally only appear at the top level source code. The - substitution will be the expanded macro, without the begin…end block - that normally surrounds macro expansions. + This matches any macro call. The substitution will be the expanded + macro, without the begin…end block that normally surrounds macro + expansions. While you can use the `?:expression` and `?:body` pattern variable - constraints to match function and statement macro calls, but they cannot + constraints to match function and statement macro calls, they cannot match definition macro calls, and their substitutions will include the begin…end wrapper. +.. _wildcard-variables: + Wildcard pattern variables ========================== @@ -270,7 +280,7 @@ Wildcard pattern variables { ?first:*, ?second:* } - As described in `patterns`:ref:, it will match any of the following:: + As described in :doc:`patterns`, it will match any of the following:: alpha, beta alpha, beta, gamma @@ -288,7 +298,7 @@ Auxiliary rule set pattern variables `?my-aux-rules` This syntax can only be used when there is an auxiliary rule set named the same as the pattern variable. It is equivalent to - `?my-aux-rule:*`. See `auxiliary-rules`:ref:. + `?my-aux-rule:*`. See :doc:`auxiliary-rules`. `...` This syntax can only be used within an auxiliary rule set. If the rule diff --git a/documentation/website/source/articles/macro-system/patterns.rst b/documentation/website/source/articles/macro-system/patterns.rst index 7387c4173b..3e5c4b112d 100644 --- a/documentation/website/source/articles/macro-system/patterns.rst +++ b/documentation/website/source/articles/macro-system/patterns.rst @@ -1,6 +1,15 @@ +:copyright: Copyright © 2011 Dustin Voss, All Rights Reserved. + .. default-role:: samp .. highlight:: none -.. _patterns: +.. sidebar:: Navigation + + :Next: :doc:`pattern-variables` + :Prev: :doc:`macro-types` + :Top: :doc:`index` + + .. contents:: + :local: ******** @@ -25,7 +34,7 @@ Subdivisions ============ A main rule pattern has elements like `define` and `end` as described in -`macro-types`:ref:, but in general, a pattern is a list of fragments or +:doc:`macro-types`, but in general, a pattern is a list of fragments or pattern variables separated at the highest level by semicolons, then by commas. That is, a pattern has this syntax:: @@ -58,24 +67,12 @@ example:: { ?name:name, { ?true-expr:expression; ?false-expr:expression }, ?final:name } Such a pattern will only match a code fragment with matching bracket characters. -The above pattern will match [#]_ but not [#]_. +The above pattern will match the first line of the following, but not the +second:: ----------- - -.. [#] - - .. code-block:: none - alpha, {#t; #f;}, beta - -.. [#] - - .. code-block:: none - alpha, (#t; #f;), beta ----------- - .. _final-items: @@ -83,7 +80,7 @@ Final items =========== A pattern with at least two list items treats the last item specially. For -example, the pattern [list1]_ will match any of the code fragments of [frags]_ +example, the pattern `Pattern 1`_ will match any of `Code Fragments`_ and set and set the pattern variables as follows: ======== ======= ======= ======================= @@ -95,26 +92,26 @@ Line 3 `alpha` `beta` `gamma, delta, epsilon` ======== ======= ======= ======================= This special behavior is usually only relevant when the last item in the list is -a wildcard pattern variable (see `pattern-variables`:ref:). If the pattern were -[list2]_ instead, the only matching code fragment would be line 1, because +a wildcard pattern variable (see :ref:`wildcard-variables`). If the pattern were +`Pattern 2`_ instead, the only matching code fragment would be line 1, because neither an empty fragment (from line 2) nor `gamma, delta, epsilon` (from line 3) match the `name` constraint of `?item-3`. ---------- -.. [list1] *Pattern ending in wildcard* +_`Pattern 1`: .. code-block:: none { ?item-1:*, ?item-2:*, ?item-3:* } -.. [list2] *Pattern ending in name* +_`Pattern 2`: .. code-block:: none { ?item-1:*, ?item-2:*, ?item-3:name } -.. [frags] *Code fragments* +_`Code Fragments`: .. code-block:: none :linenos: @@ -136,7 +133,7 @@ The end of a comma-separated list of pattern fragments can include `#rest`, If you write a pattern that contains `#all-keys`, you must also include `#key`. There are several variations on this syntax; they are described in -`pattern-variables`:ref:. +:ref:`proplist-variables`. `#rest`, `#key`, and `#all-keys` must be the only pattern fragments in their comma-separated sub-pattern, and that sub-pattern must be the last of several diff --git a/documentation/website/source/articles/macro-system/substitutions.rst b/documentation/website/source/articles/macro-system/substitutions.rst index 1cb4a308e4..4eefa52642 100644 --- a/documentation/website/source/articles/macro-system/substitutions.rst +++ b/documentation/website/source/articles/macro-system/substitutions.rst @@ -1,6 +1,15 @@ +:copyright: Copyright © 2011 Dustin Voss, All Rights Reserved. + .. default-role:: samp .. highlight:: none -.. _substitutions: +.. sidebar:: Navigation + + :Next: :doc:`auxiliary-rules` + :Prev: :doc:`pattern-variables` + :Top: :doc:`index` + + .. contents:: + :local: ************* @@ -21,24 +30,24 @@ preceding separator is removed. For example, consider this template:: { ?alpha, ?beta } If `?alpha` contains `a` and `?beta` is empty, the expansion will not be -[exp1]_, but will instead be [exp2]_. This special case applies with any of the -separators [seps]_ in place of the comma. +`Expansion 1`_, but will instead be `Expansion 2`_. This special case applies +with any of the separators listed in `Separators`_ in place of the comma. ---------- -.. [exp1] *Expansion 1* +_`Expansion 1`: .. code-block:: none a, -.. [exp2] *Expansion 2* +_`Expansion 2`: .. code-block:: none a -.. [seps] *Separators* +_`Separators`: .. code-block:: none @@ -53,7 +62,7 @@ Simple substitutions `?{name}` This is the basic substitution. The pattern variable's code fragment is inserted into the expansion according to the syntax used in the pattern, - as described in `pattern-variables`:ref:. + as described in :doc:`pattern-variables`. Conversion substitutions @@ -149,4 +158,4 @@ Unhygienic reference `?={binding}` This is not a substitution, but a way to refer to a binding in the - macro's caller. See `hygiene`:ref:. + macro's caller. See :doc:`hygiene`. diff --git a/documentation/website/source/conf.py b/documentation/website/source/conf.py index 847812341c..8c7d5f62af 100644 --- a/documentation/website/source/conf.py +++ b/documentation/website/source/conf.py @@ -82,7 +82,7 @@ # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. -#show_authors = False +show_authors = True # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index e302c3e7a7..e32a1fea0a 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -72,6 +72,11 @@ Documentation

Learning Dylan

+`Dylan Macro System <../articles/macro-system/index.html>`_ by Dustin Voss. + + This article holds hard-won knowledge about how the Dylan macro system works + and how to work around some of the gotchas that may catch a macro writer. + `Procedural Dylan <../articles/procedural-dylan/index.html>`_ by Paul Haahr. This essay explores Dylan from the perspective of a programmer used to From d41ae270ea4f218b36276c67166d5f6e207386c4 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 23 Dec 2011 08:46:50 +0700 Subject: [PATCH 095/519] Link to Dustin's article on macros. --- documentation/website/source/news/index.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/website/source/news/index.rst b/documentation/website/source/news/index.rst index 52d6d7c2df..5854ca46e6 100644 --- a/documentation/website/source/news/index.rst +++ b/documentation/website/source/news/index.rst @@ -18,6 +18,11 @@ News & Articles

Articles

+`Dylan Macro System <../articles/macro-system/index.html>`_ by Dustin Voss. + + This article holds hard-won knowledge about how the Dylan macro system works + and how to work around some of the gotchas that may catch a macro writer. + `Procedural Dylan <../articles/procedural-dylan/index.html>`_ by Paul Haahr. This essay explores Dylan from the perspective of a programmer used to From 94924e4dfbc0a92e04b28b7f37ce6ac23e3a6c10 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 28 Dec 2011 21:42:57 +0700 Subject: [PATCH 096/519] Link to epub files. --- documentation/website/source/documentation/index.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index e32a1fea0a..1262b60bd2 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -25,6 +25,7 @@ Documentation `An Introduction to Dylan `_ [`pdf `__] +[`epub `__] This tutorial is written primarily for those with solid programming experience in C++ or another object-oriented, static language. It @@ -37,12 +38,14 @@ Documentation `Getting Started with Open Dylan `_ [`pdf `__] +[`epub `__] [`old HTML `__] Describes Open Dylan's interactive development environment. `Building Applications Using DUIM `_ [`pdf `__] +[`epub `__] [`old HTML `__] Describes how to use DUIM (Dylan User Interface Manager), @@ -110,6 +113,7 @@ Documentation `Core library reference `_ [`pdf `__] +[`epub `__] [`old HTML `__] Describes the Open Dylan implementation of the Dylan language, a @@ -119,6 +123,7 @@ Documentation `System and I/O library reference `_ [`pdf `__] +[`epub `__] [`old HTML `__] Describes Open Dylan's printing and output formatting modules, @@ -135,6 +140,7 @@ Documentation `C FFI and Win32 library reference `_ [`pdf `__] +[`epub `__] [`old HTML `__] Describes a foreign function interface library for interoperation @@ -154,11 +160,13 @@ Documentation `Open Dylan Hacker's Guide `_ [`pdf `__] +[`epub `__] A work in progress to help out people who are hacking on Open Dylan itself. `Dylan Style Guide `_ [`pdf `__] +[`epub `__] Notes and thoughts on how to format your Dylan code. This is the style guide that we aspire to adhere to in the Open Dylan sources. From d91bbe2d45e1aa71ebeaec2633fa7a5e04e5b816 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 28 Dec 2011 21:55:49 +0700 Subject: [PATCH 097/519] Link to the right epub file names. --- documentation/website/source/documentation/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index 1262b60bd2..e40a345719 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -25,7 +25,7 @@ Documentation `An Introduction to Dylan `_ [`pdf `__] -[`epub `__] +[`epub `__] This tutorial is written primarily for those with solid programming experience in C++ or another object-oriented, static language. It @@ -123,7 +123,7 @@ Documentation `System and I/O library reference `_ [`pdf `__] -[`epub `__] +[`epub `__] [`old HTML `__] Describes Open Dylan's printing and output formatting modules, From a593c81e3c5654264aec8193e626802e92768b7f Mon Sep 17 00:00:00 2001 From: Dustin Voss Date: Wed, 28 Dec 2011 22:44:51 -0800 Subject: [PATCH 098/519] Corrects typos, bad links, and some misinformation about macro calls in ?:body and ?:expression code fragments. Improves discussion of complex auxiliary rules and hygiene and misinformation about hygiene of definitions. --- .../articles/macro-system/auxiliary-rules.rst | 138 ++++++++++-------- .../source/articles/macro-system/faq-tips.rst | 4 +- .../source/articles/macro-system/hygiene.rst | 68 +++++---- .../articles/macro-system/macro-types.rst | 2 +- .../macro-system/pattern-variables.rst | 74 +++++----- .../source/articles/macro-system/patterns.rst | 52 +++---- .../articles/macro-system/substitutions.rst | 28 +++- 7 files changed, 208 insertions(+), 158 deletions(-) diff --git a/documentation/website/source/articles/macro-system/auxiliary-rules.rst b/documentation/website/source/articles/macro-system/auxiliary-rules.rst index 3f4e85d2ac..caf63a3509 100644 --- a/documentation/website/source/articles/macro-system/auxiliary-rules.rst +++ b/documentation/website/source/articles/macro-system/auxiliary-rules.rst @@ -28,10 +28,11 @@ behaviors described on that page. They do not have the special elements like place certain *de facto* restrictions on what can appear in auxiliary rule patterns: -- `end` cannot usefully appear in patterns of a body-style definition macro or - a statement macro unless it is enclosed in bracketing characters. -- `;` cannot usefully appear in patterns of a list-style definition macro - unless enclosed in bracketing characters. +- `end` cannot usefully appear in an auxiliary rule pattern of a body-style + definition macro or a statement macro unless it is enclosed in bracketing + characters. +- `;` cannot usefully appear in an auxiliary rule pattern of a list-style + definition macro unless enclosed in bracketing characters. An auxiliary rule set comes into play when a pattern variable matches a code fragment and that pattern variable is named the same as the auxiliary rule set. @@ -45,9 +46,9 @@ pattern matches the code fragment, that rule's template is expanded and replaces the code fragment contained by the pattern variable. If no rules match the code fragment, macro expansion fails. -If the pattern variable named the same as the rule set is a `??`-style pattern -variable, the process is similar, except each code fragment in the pattern -variable is individually matched and transformed by the auxiliary rules. +If the pattern variable being examined is a `??`-style pattern variable, the +process is similar, except each code fragment in the pattern variable is +individually matched and transformed by the auxiliary rules. Expansions @@ -69,11 +70,11 @@ by `Call 1`_ and expands to `Expansion 1`_. The `?type` pattern variable in line 1 of the macro definition matches `alpha` in the call. After the variable matches, the `type:` auxiliary rule set in lines -4–7 rewrite the contents of the pattern variable according to the matching rule +4–7 rewrites the contents of the pattern variable according to the matching rule in line 5. The matching rule expands to the string `"a"`, which replaces the -contents of the pattern variable. In the main rule's template (line 3), the -pattern variable (now containing `"a"` instead of `alpha`) is substituted into -the expansion. +`alpha` code fragment in the pattern variable. In the main rule's template (line +3), the pattern variable (now containing `"a"`) is substituted into the +expansion. ---------- @@ -112,10 +113,10 @@ Effect of constraints Now consider if the auxiliary rules were rewritten as `Definition 2`_. This macro is intended to be called by `Call 2`_ to create a version number like -`"1.0a1"`. However, the macro will never succeed. `?type` in line 2 is -constrained to always be a simple name. None of the patterns in the `type:` -auxiliary rule set match a simple name (they all expect commas), so the macro -expansion will fail. +`"1.0a1"`. However, the macro will never succeed. `?type` in line 2 has the +`name` constraint, so it cannot match the call, which includes a comma and an +additional clause. The `type:` auxiliary rule set will not even be consulted and +macro expansion will fail. ---------- @@ -146,7 +147,7 @@ Empty and missing code fragments ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ An auxiliary rule set can match against a missing code fragment. Consider the -following code which calls either of the above `version` macros: +following macro call in relation to `Definition 1`_: .. code-block:: dylan @@ -158,10 +159,10 @@ to match this code fragment, since the `name` constraint of the `?type` variable does not match a missing code fragment. If we changed the macro definition to include a wildcard constraint, as in -`Definition 3`_, the macro would still fail to match the code fragment because -the `type:` auxiliary rule set does not have a pattern that matches a missing -code fragment. We would also have to add the rule highlighted in `Definition -4`_. +`Definition 3`_, the macro would still fail to match the code fragment because, +while the `?type` pattern variable itself will match, the `type:` auxiliary rule +set does not have a pattern that matches a missing code fragment. We would also +have to add the rule highlighted in `Definition 4`_. ---------- @@ -237,7 +238,12 @@ _`Expansion 5`: .. code-block:: dylan - set-version(concatenate("1", ".", "0", 4", "2", "a")) + set-version(concatenate(format-to-string("%s", 1), + ".", + format-to-string("%s", 0), + format-to-string("%s", 4), + format-to-string("%s", 2), + "a")) ---------- @@ -245,23 +251,37 @@ Property lists and optional properties ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The macro call must include the `major:` property, but the `rev:` and `type:` -properties are optional. `rev:` is optional because it is a `??`-type pattern -variable, and `type:` is optional because the pattern variable includes a -default value. - -If the macro call did not include any `rev:` properties, the substitution for -`??rev, ...` would be empty. This would cause the comma after `"."` in line 3 to -vanish. If the macro call did not include `type:`, the substitution for -`?type` in line 3 would be empty because the defaulted pattern variable -matches the pattern of the auxiliary rule in line 12, and the template for that -rule is empty. Because `?type` in line 3 would be empty, the comma after `??rev, -...` would vanish. +properties are optional. + +`rev:` is optional because it is a `??`-type pattern variable and, as described +in :ref:`proplist-variables`, that type of pattern variable can handle a missing +property. If the macro call did not include any `rev:` properties, the +substitution for `??rev, ...` would be empty. This would also cause the comma +after `"."` in line 3 to vanish, as described in :ref:`finalitems-subst`. + +`type:` is optional because the pattern variable includes a default value. If +the macro call did not include `type:`, the substitution for `?type` in line 3 +would be empty. It would initially be `none`, but then the pattern variable +would be processed by the `type:` auxiliary rule set and matched by the rule in +line 12, and its contents replaced by the empty template for that rule. Because +`?type` in line 3 would be empty, the comma after `??rev, ...` would vanish. You may have noted that the `major:`, `rev:`, and `type:` auxiliary rule sets do not include the actual `major:`, `rev:`, or `type:` symbols found in the macro call. This is because `#key`-type pattern variables contain only the value parts of properties, not the symbol parts. +Auxiliary rule sets in auxiliary rules +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In line 5, `?rev` is equivalent to `?rev:*`. The code fragment matched by that +pattern variable is the code fragment initially contained by the `?major` +pattern variable matched in line 2. This code fragment will be an expression. +Because `rev` is also the name of an auxiliary rule set, that code fragment will +be matched and transformed by the `rev:` rule set. That transformed code +fragment will be inserted in place of the `?rev` substitution in line 5 and then +subsequently inserted in place of the `?major` substitution in line 3. + `??` and `?` pattern variables ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -269,30 +289,27 @@ The main rule and the `major:` auxiliary rule set both contain a pattern variable named `rev`, though it is `??rev:expression` in the main rule (line 2) and `?rev` in the auxiliary rule (line 5). Both pattern variables are transformed by the `rev:` auxiliary rule in line 7 because both pattern -variables have the name "rev", but they are transformed differently because of +variables have the name `rev`, but they are transformed differently because of the different natures of the two pattern variables. -In line 5, `?rev` is equivalent to `?rev:*`. The code fragment matched by that -wildcard is the code fragment contained by the pattern variable `?major` in line -2. This code fragment will be an expression, which will be matched and -transformed by the `rev:` rule and will replace `?major` in line 3. - -The `?rev` pattern variable in line 5 is a simple pattern variable that contains -only one code fragment. The `rev:` rule in line 7 transforms that fragment as -you would expect. +Because the `?major` pattern variable in line 2 is a simple pattern variable +that contains only one code fragment, the `rev:` rule in line 7 that acts on it +(for reasons described above) transforms that fragment as you would expect: +`?major` will become a call to `format-to-string`. However, the `??rev` pattern variable in line 2 is a `??`-type pattern variable -containing has zero or more code fragments, so the `rev:` rule transforms each -individually. The `??rev, ...` substitution in line 3 then joins each of the -transformed code fragments with a comma and includes the entire collection in -the macro expansion. +containing has zero or more code fragments, so when acting on *it*, the `rev:` +rule transforms each code fragment individually. The `??rev, ...` substitution +in line 3 then joins each of the transformed code fragments with a comma and +includes the entire collection in the main rule expansion, transforming the list +of revision numbers to a list of calls to `format-to-string`. Empty `??` pattern variables ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -In line 2, the `?type` variable has a default. If the macro call -does not contain a `type:` property, the default provides a code fragment to -match against the `type:` auxiliary rule set. +In line 2, the `?type` variable has a default. If the macro call does not +contain a `type:` property, the default provides a code fragment to match +against the `type:` auxiliary rule set. In contrast, the `??rev` variable does not have a default. If the call does not include any `rev:` properties then the pattern variable will not contain a code @@ -300,24 +317,26 @@ fragment. Since the `rev:` rule does not include an empty pattern, you might expect the macro to fail. But the macro still works. The `rev:` rule will be applied to each code fragment -in `??rev` individually because it is a `??`-type pattern variable. Since -there are no code fragments in `??rev`, the `rev:` is not even applied once, so -its lack of an empty pattern is irrelevant. +in `??rev` individually because it is a `??`-type pattern variable. Since there +are no code fragments in `??rev`, the `rev:` rule set is not applied even once, +so its lack of an empty pattern is irrelevant. Recursive expansion ------------------- Any pattern variable named the same as an auxiliary rule is processed by that -rule. That includes pattern variables in the auxiliary rule itself. This -recursive behavior is useful for processing lists of items. +rule. That includes pattern variables in the auxiliary rule referring to the +auxiliary rule set itself. This recursive behavior is useful for processing +lists of items. The `...` pattern variable and substitution syntaxes draw attention to a -recursive rule. Using that syntax, the macros `Definition 6`_ and `Definition -7`_ are equivalent. But I feel there is a good argument for avoiding that syntax -for clarity's sake. +recursive rule and makes the author's intention explicit. Using that syntax, the +`path` macros in `Definition 6`_ and `Definition 7`_ are equivalent. But if I +may editorialize, I feel there is a good argument for avoiding that syntax for +the sake of consistency. -Tracing this call of the macro shows how macro recursion works:: +Let us trace the following macro call to show how macro recursion works:: let (x, y) = path(north 5, east 3, south 1, east 2) @@ -343,7 +362,7 @@ The patterns and templates will be evaluated as follows: #. `?steps` is rewritten by another pass through the `steps:` rule set. 1. The "south" rule matches and its `?steps` is set to `east 2`. - #. `?steps` is rewritten. + #. `?steps` is again rewritten. a. The "north," "south," and "west" rules fail to match. #. The "east" rule is matched against `east 2`. The word `east` and @@ -372,7 +391,7 @@ The patterns and templates will be evaluated as follows: …and so on. The key ideas to note are: -- The rule set has to have a non-recursing rule (in this case, `{ } => { }`) +- The rule set has to have a non-recursing rule (in this case, ``{ } => { }``) - Each rule's matching and expansion has its own `?token` and `?steps` pattern variable. @@ -382,6 +401,7 @@ _`Definition 6`: .. code-block:: dylan :linenos: + :emphasize-lines: 4-7 define macro path { path(?steps) } => { let x = 0; let y = 0; ?steps; values(x, y) } diff --git a/documentation/website/source/articles/macro-system/faq-tips.rst b/documentation/website/source/articles/macro-system/faq-tips.rst index 7328c4e810..dc3403e5b8 100644 --- a/documentation/website/source/articles/macro-system/faq-tips.rst +++ b/documentation/website/source/articles/macro-system/faq-tips.rst @@ -76,7 +76,7 @@ common BNF forms. { z ... } { } -`{x}? | {x}(, {x})*` +`{x}? | {x} (, {x})*` This is a list that may have 0–*n* items. Handle this by calling out to an auxiliary rule that calls itself recursively like so:: @@ -89,7 +89,7 @@ common BNF forms. variable needs to be well-separated from the syntax that follows it by a semicolon or intermediate word. -`{x}(, {x})*` +`{x} (, {x})*` This is a list that may have 1–*n* items. You simply cannot do this in the general case; your best bet is design your macro to handle 0 items gracefully and then use a 0-*n* list. diff --git a/documentation/website/source/articles/macro-system/hygiene.rst b/documentation/website/source/articles/macro-system/hygiene.rst index 4fb8301ce4..30c0a277ae 100644 --- a/documentation/website/source/articles/macro-system/hygiene.rst +++ b/documentation/website/source/articles/macro-system/hygiene.rst @@ -16,16 +16,20 @@ Hygiene ******* +Macro expansions are hygienic, meaning there can be no name conflict between +a local binding in scope that calls the macro and a local binding in the macro +expansion. + Let us say we have two macros A and B. The expansion of A calls B. The following -diagram shows the sources or lexical scopes of a binding used in the expansion -of A and B. +diagram shows the lexical scopes of bindings used in A and B. The table after +describes the scopes in more detail. .. raw:: html 
    ╒═════════════════════════════════════╕
-   │ [1] Module or local scope of a call │    
-   │     to macro A                      │    
+   │ [1] Module or lexical scope of a    │    
+   │     call to macro A                 │    
    │                                     │    
    │  ┌───────────────────────────────┐  │
    │  │ [2] Expansion of A            │  │    
@@ -52,24 +56,38 @@ of A and B.
    ╘═════════════════════════════════════╛
-Macro expansions are hygienic, meaning: - -- Bindings from boxes 2 or 4 are visible in box 2. -- Bindings from boxes 3 or 5 are visible in box 3. -- A binding from box 1 is not visible in box 2, but can be wrapped in a pattern - variable and manipulated in box 2. -- A binding from box 2 is not visible in box 3, but can be wrapped in a pattern - variable and manipulated in box 3. -- A binding from box 1 is not visible in box 3, but if box 2 wraps the binding - in a pattern variable and uses that pattern variable in the call of macro B, - and macro B wraps that pattern variable in a pattern variable of its own, then - box 3 can manipulate the binding via its pattern variable. - -New bindings created by `define` statements are not hygienic. Definition -processing occurs after all macros have been expanded. A class defined in box 3 -can be used in boxes 2 and 1 and exported from the module of box 1. If there is -another definition by that name in the other boxes, it is a duplicate definition -and an error is reported. + ++------------+---------------------+---------------------+---------------------+-------+--------+ +| Definition | Definition Location | +| Visibility +---------------------+---------------------+---------------------+-------+--------+ +| | Box 1 | Box 2 | Box 3 | Box 4 | Box 5 | ++============+=====================+=====================+=====================+=======+========+ +| Box 1 | All | Only if defined | Only if defined | | | +| | | with unhygienic | with unhygienic | | | +| | | reference to name | reference to name | | | +| | | from 1, captured by | from 1, captured by | | | +| | | pattern variable of | pattern variable of | | | +| | | A | A and recaptured by | | | +| | | | pattern variable of | | | +| | | | B | | | ++------------+---------------------+---------------------+---------------------+-------+--------+ +| Box 2 | Only if captured by | All | Only if defined | All | | +| | pattern variable of | | with unhygienic | | | +| | A | | reference to name | | | +| | | | from 2, captured by | | | +| | | | pattern variable of | | | +| | | | B | | | ++------------+---------------------+---------------------+---------------------+-------+--------+ +| Box 3 | Only if captured by | Only if captured by | All | | All | +| | pattern variable of | pattern variable of | | | | +| | A and recaptured by | B | | | | +| | pattern variable of | | | | | +| | B | | | | | ++------------+---------------------+---------------------+---------------------+-------+--------+ +| Box 4 | | | | All | | ++------------+---------------------+---------------------+---------------------+-------+--------+ +| Box 5 | | | | | All | ++------------+---------------------+---------------------+---------------------+-------+--------+ Breaking hygiene @@ -96,9 +114,9 @@ In box 2 (the expansion itself), the binding is visible as `?=stop!` and can be used like any other binding (e.g. `format-out`) as shown by the highlighted line. -Note that that a macro expansion cannot create a new binding visible outside of -the macro call itself (except by way of a top-level `define` statement). In -other words, box 2 cannot create a local binding for use elsewhere in box 1. +Note that that a macro expansion cannot create a new name visible outside of the +macro call itself. In other words, box 2 cannot create a binding for use +elsewhere in box 1 unless box 1 supplies the name to be defined. For example, given the macro in `Definition 2`_, one might expect the macro call in `Call 2`_ would print "Hello" twice, but the code does not compile. Because diff --git a/documentation/website/source/articles/macro-system/macro-types.rst b/documentation/website/source/articles/macro-system/macro-types.rst index 600de06d66..a2a1422140 100644 --- a/documentation/website/source/articles/macro-system/macro-types.rst +++ b/documentation/website/source/articles/macro-system/macro-types.rst @@ -66,7 +66,7 @@ syntax, with optional parts in brackets:: `my-aux-ruleset:` or `#"my-aux-ruleset"`; both are the same. -.. _`main-rules`: +.. _main-rules: Main rules ========== diff --git a/documentation/website/source/articles/macro-system/pattern-variables.rst b/documentation/website/source/articles/macro-system/pattern-variables.rst index 222067e1f1..5d83f55ae8 100644 --- a/documentation/website/source/articles/macro-system/pattern-variables.rst +++ b/documentation/website/source/articles/macro-system/pattern-variables.rst @@ -33,8 +33,6 @@ a given inner macro. An example of this is given in the discussion of the The scope of a pattern variable is the rule that uses it. Other rules or auxiliary rule sets cannot use the pattern variable. -What follows is a categorized list of pattern variable syntaxes. - Simple pattern variables ======================== @@ -46,14 +44,15 @@ Simple pattern variables This is a pattern variable where its constraint is also its name. For example, `?:expression` is equivalent to `?expression:expression`, that is, a pattern variable named `expression` with a constraint of - `expression.` + `expression`. `?{name}:name` This matches a name. `?{name}:token` - This matches a name, operator, or simple literal such as a string, character, - or number. It does not match vector literals or function calls. + This matches a name, operator, or simple literal such as a string, + character constant, or number. It does not match vector literals or + function calls. `?{name}:expression` This matches any expression, including vector literals, function calls, @@ -65,10 +64,11 @@ Simple pattern variables `?{name}:name :: ?{specialization}:expression` This matches a variable name and optional specialization, like - `?:variable`, but lets you get each part. If the code fragment just - has the name part, the substitution for `?{specialization}` will be - ``. Note that `?{specialization}` will not match every expression. It - will only match an expression that happens to be a type specialization. + `?:variable`, but lets you extract each part separately. If the code + fragment just has the name part, the substitution for + `?{specialization}` will be ``. Note that `?{specialization}` + will not match every expression; it will only match an expression that + happens to also be a valied type specialization. .. _proplist-variables: @@ -84,21 +84,21 @@ Property list pattern variables `#key ?{prop-1}:{constraint}, ?{prop-2}:{constraint}` This matches a property list that only includes the `{prop-1}:` and - `{prop-2}:` properties. If the property list includes any other - property such as `alpha:` or if either `{prop-1}:` or - `{prop-2}:` are missing, this pattern variable will not match. - Additionally, the properties' value parts have to meet the constraint. - If the constraint is `*`, any value part will match. + `{prop-2}:` properties. If the property list includes any other property + such as `alpha:` or if either `{prop-1}:` or `{prop-2}:` are missing, + this pattern variable will not match. Additionally, the properties' + value parts have to meet the constraints given. If the constraint is + `*`, any value part will match. The substitution for `?{prop-1}` is the value part of the `{prop-1}:` property. `#key ??{prop-1}:{constraint}, ??{prop-2}:{constraint}` This matches a property list that has several properties with a symbol - part of `{prop-1}:` or `{prop-2}:`. The substitution for - `??{prop-1}` is several code fragments, each being the value part of a - `{prop-1}:` property. The substitution may use a separator between each - code fragment as described in :doc:`substitutions`. + part of `{prop-1}:` or `{prop-2}:`. The substitution for `??{prop-1}` is + several code fragments, each being the value part of a `{prop-1}:` + property. The substitution may use one of the separators listed in + :ref:`finalitems-subst` between each code fragment. For example, consider this pattern:: @@ -124,7 +124,7 @@ Property list pattern variables my-key: alpha, another-key: beta - This pattern would not match it:: + This pattern would not match:: { #key ?my-key:name } @@ -167,8 +167,8 @@ Body and macro pattern variables substitution will be `#f`. The substitution will wrap the code fragment in `begin` and `end` to make an expression. - A `?:body` pattern variable matches statements and expressions in a - code fragment until it reaches some word, called an `intermediate word`. + A `?:body` pattern variable matches statements and expressions in a code + fragment until it reaches some word, called an `intermediate word`:dfn:. You must ensure that all your `?:body` pattern variables are either followed by a word, or followed by a pattern variable referring to an auxiliary rule set whose rules all start with a word. Those word will @@ -188,8 +188,8 @@ Body and macro pattern variables { endif } { else ?:body endif } - In this example, the macro will not work because the `?:body` variable - is not necessarily followed by a word:: + In this example, the macro will not work because the pattern does not + include an intermediate word following the `?:body` variable:: { when (?:expression) ?:body } @@ -236,10 +236,9 @@ Body and macro pattern variables macro, without the begin…end block that normally surrounds macro expansions. - While you can use the `?:expression` and `?:body` pattern variable - constraints to match function and statement macro calls, they cannot - match definition macro calls, and their substitutions will include the - begin…end wrapper. + While you can use `?:expression` and `?:body` pattern variables to match + macro calls, their substitutions will include a called macro's begin…end + wrapper, and `?:expression` can only match function macro calls. .. _wildcard-variables: @@ -254,14 +253,15 @@ Wildcard pattern variables { ?many-things:* ?:name } - `?many-things` will match everything up to but not including a name. - The substitution for `?many-things` will be everything except that - name name. If the code fragment only has a name, the substitution will - be empty. + `?many-things` will match everything up to but not including a name. The + substitution for `?many-things` will be everything except that name. If + the code fragment only has a name, the substitution for `?many-things` + will be empty. - There can only be one wildcard pattern variable in a sub-pattern. Each - must be separated from other wildcard variables by a semicolon or comma. - For example, this is not a legal pattern:: + There can only be one wildcard pattern variable in a comma- or + semicolon-separated sub-pattern. Each must be separated from other + wildcards by a semicolon or comma. For example, this is not a legal + pattern:: { ?first:* ?second:* } @@ -295,10 +295,10 @@ Wildcard pattern variables Auxiliary rule set pattern variables ==================================== -`?my-aux-rules` +`?{aux-rules}` This syntax can only be used when there is an auxiliary rule set named - the same as the pattern variable. It is equivalent to - `?my-aux-rule:*`. See :doc:`auxiliary-rules`. + the same as the pattern variable. It is equivalent to `?{aux-rules}:*`. + See :doc:`auxiliary-rules`. `...` This syntax can only be used within an auxiliary rule set. If the rule diff --git a/documentation/website/source/articles/macro-system/patterns.rst b/documentation/website/source/articles/macro-system/patterns.rst index 3e5c4b112d..d3c966c9bd 100644 --- a/documentation/website/source/articles/macro-system/patterns.rst +++ b/documentation/website/source/articles/macro-system/patterns.rst @@ -80,16 +80,16 @@ Final items =========== A pattern with at least two list items treats the last item specially. For -example, the pattern `Pattern 1`_ will match any of `Code Fragments`_ and set -and set the pattern variables as follows: +example, the pattern `Pattern 1`_ will match any of `Code Fragments`_, and will +set the pattern variables as follows: -======== ======= ======= ======================= -Fragment ?item-1 ?item-2 ?item-3 -======== ======= ======= ======================= -Line 1 `alpha` `beta` `gamma` -Line 2 `alpha` `beta` -Line 3 `alpha` `beta` `gamma, delta, epsilon` -======== ======= ======= ======================= +============== ======= ======= ======================= +Code Fragments ?item-1 ?item-2 ?item-3 +============== ======= ======= ======================= +Line 1 `alpha` `beta` `gamma` +Line 2 `alpha` `beta` +Line 3 `alpha` `beta` `gamma, delta, epsilon` +============== ======= ======= ======================= This special behavior is usually only relevant when the last item in the list is a wildcard pattern variable (see :ref:`wildcard-variables`). If the pattern were @@ -131,23 +131,6 @@ The end of a comma-separated list of pattern fragments can include `#rest`, { …, #rest ?keys:token, #key ?alpha:token, ?beta:token, #all-keys } -If you write a pattern that contains `#all-keys`, you must also include `#key`. -There are several variations on this syntax; they are described in -:ref:`proplist-variables`. - -`#rest`, `#key`, and `#all-keys` must be the only pattern fragments in their -comma-separated sub-pattern, and that sub-pattern must be the last of several -comma-separated sub-patterns. Here are some examples of when it is or is not -valid to use this syntax in a pattern:: - - /* valid */ { #key ?alpha:token } - /* invalid */ { ?alpha:token #key ?beta:token } - /* valid */ { ?anything:*, #key ?alpha:token, #all-keys } - /* invalid */ { #key ?alpha:token, #all-keys, ?anything:* } - /* valid */ { #key ?alpha:token, #all-keys; ?anything:* } - /* invalid */ { #key ?alpha:token, #key ?beta-token } - /* valid */ { #key ?alpha:token; #key ?beta-token } - This syntax is not used to match a code fragment that contains corresponding literal `#rest`, `#key`, and `#all-keys` fragments. Instead, this syntax matches a code fragment consisting of keyword/value pairs, called a `property @@ -160,3 +143,20 @@ property list and `"a"` and `"b"` are the value parts. If you want to match literal `#rest`, `#key`, or `#all-keys` fragments, escape them in the pattern like `\#rest`, `\#key`, or `\#all-keys`. + +If you write a pattern that contains `#all-keys`, you must also include `#key`. +There are several variations on this syntax; they are described in +:ref:`proplist-variables`. + +`#rest`, `#key`, and `#all-keys` must be the only pattern fragments in their +comma-separated sub-pattern, and that sub-pattern must be the last of several +comma-separated sub-patterns. Here are some examples of when it **is** or **is +not** valid to use this syntax in a pattern:: + + /* valid */ { #key ?alpha:token } + /* not valid */ { ?alpha:token #key ?beta:token } + /* valid */ { ?anything:*, #key ?alpha:token, #all-keys } + /* not valid */ { #key ?alpha:token, #all-keys, ?anything:* } + /* valid */ { #key ?alpha:token, #all-keys; ?anything:* } + /* not valid */ { #key ?alpha:token, #key ?beta-token } + /* valid */ { #key ?alpha:token; #key ?beta-token } diff --git a/documentation/website/source/articles/macro-system/substitutions.rst b/documentation/website/source/articles/macro-system/substitutions.rst index 4eefa52642..cd44ef58fa 100644 --- a/documentation/website/source/articles/macro-system/substitutions.rst +++ b/documentation/website/source/articles/macro-system/substitutions.rst @@ -18,11 +18,17 @@ Substitutions Pattern variables contain code fragments, which can be inserted into the macro expansion via a substitution. A substitution looks much like a pattern variable, -but it are on the template side of the rule and has different syntax forms. +but it is on the template side of the rule and has different syntax forms. A template can only use pattern variables from its corresponding pattern. It cannot use pattern variables from other rules' patterns. + +.. _finalitems-subst: + +Final items +=========== + As a special case, if the template has a separator followed by any of the substitution forms below, and the substituted code fragment is empty, the preceding separator is removed. For example, consider this template:: @@ -69,12 +75,12 @@ Conversion substitutions ======================== `?#"{name}"` - The pattern variable's code fragment, which must be a simple name, is - turned into a symbol and inserted into the expansion. + The code fragment of the pattern variable `{name}`, which must be a + simple name, is turned into a symbol and inserted into the expansion. `?"{name}"` - The pattern variable's code fragment, which must be a simple name, is - turned into a string and inserted into the expansion. + The code fragment of the pattern variable `{name}`, which must be a + simple name, is turned into a string and inserted into the expansion. Concatenation substitutions @@ -105,7 +111,13 @@ Concatenation substitutions "alpha-function" `"{prefix}" ## ?#"{name}" ## "{suffix}"` - As above, but results in a symbol. + As above, but results in a symbol:: + + #"alpha-function" + + Or, equivalently:: + + alpha-function: List substitutions @@ -140,8 +152,8 @@ List substitutions alpha - Any of the separators [seps]_ may be used in place of a comma in the - tempate. + Any of the separators `Separators`_ may be used in place of a comma in + the tempate. Auxiliary rule set substitution From 82c3b2928d04c56cc221813daae52bedbc9ff729 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 1 Jan 2012 08:36:29 -0500 Subject: [PATCH 099/519] Add link to proposals index. --- documentation/website/source/documentation/index.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index e40a345719..b539e78d92 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -171,6 +171,12 @@ Documentation Notes and thoughts on how to format your Dylan code. This is the style guide that we aspire to adhere to in the Open Dylan sources. +`Dylan Enhancement Proposals <../proposals/index.html>`_ + + A series of proposals for improvements to the Open Dylan + implementation and related libraries. + + .. raw:: html
From 1a18d47f4fe18ebb62c7e1f5bf056a829fd64aa4 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 1 Jan 2012 08:37:34 -0500 Subject: [PATCH 100/519] Add proposals directory, with some initial thoughts on improved string hacking --- .../source/proposals/better-strings.rst | 279 ++++++++++++++++++ .../website/source/proposals/index.rst | 24 ++ 2 files changed, 303 insertions(+) create mode 100644 documentation/website/source/proposals/better-strings.rst create mode 100644 documentation/website/source/proposals/index.rst diff --git a/documentation/website/source/proposals/better-strings.rst b/documentation/website/source/proposals/better-strings.rst new file mode 100644 index 0000000000..1e4166dfdb --- /dev/null +++ b/documentation/website/source/proposals/better-strings.rst @@ -0,0 +1,279 @@ +******************************************* +Better String Manipulation for common-dylan +******************************************* + +============== ============================================= +Proposal #: 1 +Title: Better Strings API +Author: Carl Gay +Status: Draft +Content-Type: text/x-rst +Created: 2011.12.27 +Dylan-Version: 2011.1 +============== ============================================= + + +.. contents:: + + +Abstract +======== + +The ``dylan`` and ``common-dylan`` libraries have only limited string +manipulation functionality. This proposal is an attempt to provide a +richer strings API. + +For this draft I'm being slightly loose with signatures. I use names +such as char-or-string rather than writing out each overloaded +signature with explicit types. I'll fix that in a later draft once +the basic form of the API is agreed. --cgay + + + +Goals +===== + +#. Comprehensive string APIs available via the ``common-dylan`` module + in the ``common-dylan`` library. + +#. Replace existing string-extensions module with names directly + available in common-dylan. + +#. Consistent high-level API for when readability and convenience are + paramount. Low-level functions available where a significant + performance improvement can be had. + +#. String operations consistent with regular expression operations + where possible. i.e., share the same generic functions + + +Non Goals +========= + +#. Unicode + +#. Immutable strings + +#. Strings not implemented as subclasses of ````. + + +Constants +========= + +TODO: remove these. I don't see any need for them to be exported. +Leaving them here for now, in case something comes up. + +$control-characters +$printable-characters +$graphic-characters +$decimal-digits +$octal-digits +$hexadecimal-digits +$ascii-letters +$whitespace-characters +$alphanumeric-characters + + + +Functions +========= + + +Predicates +---------- + +These all work for a single character or for a string. When applied +to a string they are true if they're true for each character in the +string. + +These are mainly taken from string-extensions/character-type.dylan. + +ascii-control? (char-or-string) => () + +ascii-printable? (char-or-string) => () + +ascii-graphic? (char-or-string) => () + +ascii-letter? (char-or-string) => () + +lowercase? (char-or-string) => () + +uppercase? (char-or-string) => () + +whitespace? (char-or-string) => () + +alphanumeric? (char-or-string) => () + +decimal-digit? (char-or-string) => () + +octal-digit? (char-or-string) => () + +hexadecimal-digit? (char-or-string) => () + + +Comparisons +----------- + +Characters +~~~~~~~~~~ + +Case insensitive character comparisons for use as the value of various +"test" parameters. For case-sensitive comparison, use "=". +:: + + ci-char-equal? (char1, char2) + ci-char-less? (char1, char2) + ci-char-greater? (char1, char2) + +**Discussion** + +The "ci-*" naming scheme is consistent with other proposed functions +(below). Case-insensitive character comparison is used frequently +enough in our existing code base that at least ``ci-char-equal?`` +should exist. ``ci-char-less?`` and ``ci-char-greater?`` are likely +to be less useful, but are provided for completeness. + + +Strings +~~~~~~~ + +String comparisons, both case-sensitive and case-insensitive. These +default to comparing the entire string but allow comparing substrings +via keyword arguments. +:: + + string-compare (string1, string2, #key start1, end1, start2, end2, test) + Low-level function used to implement the functions below. + +These are case-sensitive:: + + string-equal? (string1, string2, #key start1, end1, start2, end2) + string-less? (string1, string2, #key start1, end1, start2, end2) + string-greater? (string1, string2, #key start1, end1, start2, end2) + +These are case-insensitive:: + + ci-string-equal? (string1, string2, #key start1, end1, start2, end2) + ci-string-less? (string1, string2, #key start1, end1, start2, end2) + ci-string-greater? (string1, string2, #key start1, end1, start2, end2) + +From the ``dylan`` module (included for completeness):: + + = (char-or-string, char-or-string) + < (char-or-string, char-or-string) + > (char-or-string, char-or-string) + + +**Discussion** + +Some people may object to the ci-* functions on the grounds that a +"test" parameter could be added to the non-ci-* functions instead. +But consider this type of code, which is likely to be fairly common:: + + sort(seq, test: ci-string-less?) + +Instead one would have to write this:: + + sort(seq, test: rcurry(string-less?, test: ci-char-equal?)) + +or worse, if ci-char-equal? is removed on the same grounds:: + + sort(seq, test: rcurry(string-less?, test: method (c1, c2) + as-lowercase(c1) = as-lowercase(c2) + end)) + +or, the less efficient but more concise:: + + sort(seq, test: method (s1, s2) as-lowercase(s1) < as-lowercase(s2) end) + +The abbreviation "ci" stands for case-insensitive. In the author's +opinion "case-insensitive-string-less?" etc. are simply too long and +"ci" is easy enough to remember. The author is willing to be +out-voted on this point. + + +Conversions +----------- + +make(, size: n, fill: char) + +concatenate(sequence, #rest sequences) // somewhat redundant with "join" + +copy(string, #key start, end) + +lowercase(char-or-string, #key start, end) + +lowercase!(char-or-string, #key start, end) + +uppercase(char-or-string, #key start, end) + +uppercase!(char-or-string, #key start, end) + +wrap(string, width, #key prefix = "", test, strict?) => (new-string) + Return a copy of ``string`` which has been line wrapped at column width + ``width``. Each line is prefixed with ``prefix``, which defaults to the + empty string. The ``test`` determines where it is acceptable to wrap + long lines. It defaults to a function that will only wrap on whitespace. + If any non-breakable sequence of characters (plus the prefix) is wider + than ``width``, then ``width`` will be exceeded in that case unless + ``strict?`` is true. + + **TODO:** exact contract of ``test`` function. It may become more + obvious during implementation. Consider: how to deal with wrapping + on '-'. + +pad-left(string, width, #key fill = ' ') +pad-right(string, width, #key fill = ' ') +pad-center(string, width, #key fill = ' ') + Return a string of the given ``width``. If the given ``string`` + is shorter than ``width``, add ``fill`` equally to both sides of + the result such that the original string is center aligned. + + Examples:: + + pad-center("x", 5) => " x " + pad-center("x", 4) => " x " or " x " (unspecified) + pad-center("x", 7, fill: '.') => "...x..." + + Return a string padded on the left or right with ``fill`` until it + is ``width`` columns wide. If ``string``.size is >= ``width`` no + padding is performed. + +strip(string, #key start, end, test) + +find(string, pattern, #key start, end, test) + +starts-with?(string, pattern) => + +ends-with?(string, pattern) => + +replace(string, pattern, new, #key test) + +replace!(string, pattern, new, #key test) + +slice(sequence, #key start, end, step) => (new-sequence) + +slice!(sequence, #key start, end, step) => (sequence) + Return value may share structure with original sequence. + +join(parts, separator, #key start, end, key, conjunction) => (string) + +split(string, separator, #key start, end, max, remove-if-empty?) => (sequence-of-strings) + +split-lines(string, #rest split-keys) => (sequence-of-strings) + Alternative: split(text, find-end-of-line, #key ...) + +count(string, pattern, #key start, end, test, overlap?) => (n) + +interpolate(string, table) => (string) + interpolate("foo {x}", table("x" => 5)) => "foo 5" + + +Other +===== + +* Move and friends from string-extensions to + regular-expressions. That's the only place that uses it, and it is + unlikely to be of much use elsewhere. See conversation in #dylan on + 2011.12.26. + diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst new file mode 100644 index 0000000000..d161aa770a --- /dev/null +++ b/documentation/website/source/proposals/index.rst @@ -0,0 +1,24 @@ +*************************** +Dylan Enhancement Proposals +*************************** + +.. contents:: + + +Active Proposals +================ + +#. `Better string manipulation for common-dylan `_ + + +Accepted Proposals +================== + +There are no accepted proposals. + + +Declined Proposals +================== + +There are no declined proposals. + From 9d602a279ac00987c6f44464f6ba664427493f8c Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 2 Jan 2012 14:17:11 -0500 Subject: [PATCH 101/519] fix typo --- .../source/articles/macro-system/background-overview.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/articles/macro-system/background-overview.rst b/documentation/website/source/articles/macro-system/background-overview.rst index 096192b500..fae64fc5fd 100644 --- a/documentation/website/source/articles/macro-system/background-overview.rst +++ b/documentation/website/source/articles/macro-system/background-overview.rst @@ -18,7 +18,7 @@ Background and Overview Macros work on the basis of code fragments. The macro system does not understand code fragments; it just substitutes some fragments for other -fragments. Once the macro system has substituted and arrange all the code +fragments. Once the macro system has substituted and arranged all the code fragments, they are compiled into executable code. Because the macro system parses and generates code fragments, it can recognize From 5a9ad0445e9162e3b84f50dbc20e40ce26d1e5d5 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sat, 7 Jan 2012 17:35:36 -0500 Subject: [PATCH 102/519] Python PEP 1, unmodified --- .../website/source/proposals/dep-0001.rst | 516 ++++++++++++++++++ 1 file changed, 516 insertions(+) create mode 100644 documentation/website/source/proposals/dep-0001.rst diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst new file mode 100644 index 0000000000..b018ccd1cf --- /dev/null +++ b/documentation/website/source/proposals/dep-0001.rst @@ -0,0 +1,516 @@ +PEP: 1 +Title: PEP Purpose and Guidelines +Version: $Revision$ +Last-Modified: $Date$ +Author: Barry Warsaw, Jeremy Hylton, David Goodger +Status: Active +Type: Process +Content-Type: text/x-rst +Created: 13-Jun-2000 +Post-History: 21-Mar-2001, 29-Jul-2002, 03-May-2003 + + +What is a PEP? +============== + +PEP stands for Python Enhancement Proposal. A PEP is a design +document providing information to the Python community, or describing +a new feature for Python or its processes or environment. The PEP +should provide a concise technical specification of the feature and a +rationale for the feature. + +We intend PEPs to be the primary mechanisms for proposing new +features, for collecting community input on an issue, and for +documenting the design decisions that have gone into Python. The PEP +author is responsible for building consensus within the community and +documenting dissenting opinions. + +Because the PEPs are maintained as text files in a versioned +repository, their revision history is the historical record of the +feature proposal [1]_. + + +PEP Types +========= + +There are three kinds of PEP: + +1. A **Standards Track** PEP describes a new feature or implementation + for Python. + +2. An **Informational** PEP describes a Python design issue, or + provides general guidelines or information to the Python community, + but does not propose a new feature. Informational PEPs do not + necessarily represent a Python community consensus or + recommendation, so users and implementors are free to ignore + Informational PEPs or follow their advice. + +3. A **Process** PEP describes a process surrounding Python, or + proposes a change to (or an event in) a process. Process PEPs are + like Standards Track PEPs but apply to areas other than the Python + language itself. They may propose an implementation, but not to + Python's codebase; they often require community consensus; unlike + Informational PEPs, they are more than recommendations, and users + are typically not free to ignore them. Examples include + procedures, guidelines, changes to the decision-making process, and + changes to the tools or environment used in Python development. + Any meta-PEP is also considered a Process PEP. + + +PEP Work Flow +============= + +The PEP editors assign PEP numbers and change their status. Please send +all PEP-related email to (no cross-posting please). +Also see `PEP Editor Responsibilities & Workflow`_ below. + +The PEP process begins with a new idea for Python. It is highly +recommended that a single PEP contain a single key proposal or new +idea. Small enhancements or patches often don't need +a PEP and can be injected into the Python development work flow with a +patch submission to the Python `issue tracker`_. The more focussed the +PEP, the more successful it tends to be. The PEP editor reserves the +right to reject PEP proposals if they appear too unfocussed or too +broad. If in doubt, split your PEP into several well-focussed ones. + +Each PEP must have a champion -- someone who writes the PEP using the +style and format described below, shepherds the discussions in the +appropriate forums, and attempts to build community consensus around +the idea. The PEP champion (a.k.a. Author) should first attempt to +ascertain whether the idea is PEP-able. Posting to the +comp.lang.python newsgroup (a.k.a. python-list@python.org mailing +list) or the python-ideas mailing list is the best way to go about this. + +Vetting an idea publicly before going as far as writing a PEP is meant +to save the potential author time. Many ideas have been brought +forward for changing Python that have been rejected for various +reasons. Asking the Python community first if an idea is original +helps prevent too much time being spent on something that is +guaranteed to be rejected based on prior discussions (searching +the internet does not always do the trick). It also helps to make sure +the idea is applicable to the entire community and not just the author. +Just because an idea sounds good to the author does not +mean it will work for most people in most areas where Python is used. + +Once the champion has asked the Python community as to whether an +idea has any chance of acceptance, a draft PEP should be presented to +python-ideas. This gives the author a chance to flesh out the draft +PEP to make properly formatted, of high quality, and to address +initial concerns about the proposal. + +Following a discussion on python-ideas, the proposal should be sent to +the `python-dev list `__ with the draft +PEP and the PEP editors . This +draft must be written in PEP style as described below, else it will be +sent back without further regard until proper formatting rules are +followed. + +If the PEP editor approves, he will assign the PEP a number, label it +as Standards Track, Informational, or Process, give it status "Draft", +and create and check-in the initial draft of the PEP. The PEP editor +will not unreasonably deny a PEP. Reasons for denying PEP status +include duplication of effort, being technically unsound, not +providing proper motivation or addressing backwards compatibility, or +not in keeping with the Python philosophy. The BDFL (Benevolent +Dictator for Life, Guido van Rossum) can be consulted during the +approval phase, and is the final arbiter of the draft's PEP-ability. + +As updates are necessary, the PEP author can check in new versions if +they have SVN commit permissions, or can email new PEP versions to +the PEP editor for committing. + +Standards Track PEPs consist of two parts, a design document and a +reference implementation. The PEP should be reviewed and accepted +before a reference implementation is begun, unless a reference +implementation will aid people in studying the PEP. Standards Track +PEPs must include an implementation -- in the form of code, a patch, +or a URL to same -- before it can be considered Final. + +PEP authors are responsible for collecting community feedback on a PEP +before submitting it for review. However, wherever possible, long +open-ended discussions on public mailing lists should be avoided. +Strategies to keep the +discussions efficient include: setting up a separate SIG mailing list +for the topic, having the PEP author accept private comments in the +early design phases, setting up a wiki page, etc. PEP authors should +use their discretion here. + +Once the authors have completed a PEP, they must inform the PEP editor +that it is ready for review. PEPs are reviewed by the BDFL and his +chosen consultants, who may accept or reject a PEP or send it back to +the author(s) for revision. For a PEP that is pre-determined to be +acceptable (e.g., it is an obvious win as-is and/or its implementation +has already been checked in) the BDFL may also initiate a PEP review, +first notifying the PEP author(s) and giving them a chance to make +revisions. + +For a PEP to be accepted it must meet certain minimum criteria. It +must be a clear and complete description of the proposed enhancement. +The enhancement must represent a net improvement. The proposed +implementation, if applicable, must be solid and must not complicate +the interpreter unduly. Finally, a proposed enhancement must be +"pythonic" in order to be accepted by the BDFL. (However, "pythonic" +is an imprecise term; it may be defined as whatever is acceptable to +the BDFL. This logic is intentionally circular.) See PEP 2 [2]_ for +standard library module acceptance criteria. + +Once a PEP has been accepted, the reference implementation must be +completed. When the reference implementation is complete and accepted +by the BDFL, the status will be changed to "Final". + +A PEP can also be assigned status "Deferred". The PEP author or +editor can assign the PEP this status when no progress is being made +on the PEP. Once a PEP is deferred, the PEP editor can re-assign it +to draft status. + +A PEP can also be "Rejected". Perhaps after all is said and done it +was not a good idea. It is still important to have a record of this +fact. + +PEPs can also be superseded by a different PEP, rendering the original +obsolete. This is intended for Informational PEPs, where version 2 of +an API can replace version 1. + +The possible paths of the status of PEPs are as follows: + +.. image:: pep-0001-1.png + +Some Informational and Process PEPs may also have a status of "Active" +if they are never meant to be completed. E.g. PEP 1 (this PEP). + + +What belongs in a successful PEP? +================================= + +Each PEP should have the following parts: + +1. Preamble -- RFC 822 style headers containing meta-data about the + PEP, including the PEP number, a short descriptive title (limited + to a maximum of 44 characters), the names, and optionally the + contact info for each author, etc. + +2. Abstract -- a short (~200 word) description of the technical issue + being addressed. + +3. Copyright/public domain -- Each PEP must either be explicitly + labelled as placed in the public domain (see this PEP as an + example) or licensed under the `Open Publication License`_. + +4. Specification -- The technical specification should describe the + syntax and semantics of any new language feature. The + specification should be detailed enough to allow competing, + interoperable implementations for any of the current Python + platforms (CPython, Jython, Python .NET). + +5. Motivation -- The motivation is critical for PEPs that want to + change the Python language. It should clearly explain why the + existing language specification is inadequate to address the + problem that the PEP solves. PEP submissions without sufficient + motivation may be rejected outright. + +6. Rationale -- The rationale fleshes out the specification by + describing what motivated the design and why particular design + decisions were made. It should describe alternate designs that + were considered and related work, e.g. how the feature is supported + in other languages. + + The rationale should provide evidence of consensus within the + community and discuss important objections or concerns raised + during discussion. + +7. Backwards Compatibility -- All PEPs that introduce backwards + incompatibilities must include a section describing these + incompatibilities and their severity. The PEP must explain how the + author proposes to deal with these incompatibilities. PEP + submissions without a sufficient backwards compatibility treatise + may be rejected outright. + +8. Reference Implementation -- The reference implementation must be + completed before any PEP is given status "Final", but it need not + be completed before the PEP is accepted. It is better to finish + the specification and rationale first and reach consensus on it + before writing code. + + The final implementation must include test code and documentation + appropriate for either the Python language reference or the + standard library reference. + + +PEP Formats and Templates +========================= + +There are two PEP formats available to authors: plaintext and +reStructuredText_. Both are UTF-8-encoded text files. + +Plaintext PEPs are written with minimal structural markup that adheres +to a rigid style. PEP 9 contains a instructions and a template [3]_ +you can use to get started writing your plaintext PEP. + +ReStructuredText_ PEPs allow for rich markup that is still quite easy +to read, but results in much better-looking and more functional HTML. +PEP 12 contains instructions and a template [4]_ for reStructuredText +PEPs. + +There is a Python script that converts both styles of PEPs to HTML for +viewing on the web [5]_. Parsing and conversion of plaintext PEPs is +self-contained within the script. reStructuredText PEPs are parsed +and converted by Docutils_ code called from the script. + + +PEP Header Preamble +=================== + +Each PEP must begin with an RFC 822 style header preamble. The headers +must appear in the following order. Headers marked with "*" are +optional and are described below. All other headers are required. :: + + PEP: + Title: + Version: + Last-Modified: + Author: + * Discussions-To: + Status: + Type: + * Content-Type: + * Requires: + Created: + * Python-Version: + Post-History: + * Replaces: + * Superseded-By: + * Resolution: + +The Author header lists the names, and optionally the email addresses +of all the authors/owners of the PEP. The format of the Author header +value must be + + Random J. User + +if the email address is included, and just + + Random J. User + +if the address is not given. For historical reasons the format +"address@dom.ain (Random J. User)" may appear in a PEP, however new +PEPs must use the mandated format above, and it is acceptable to +change to this format when PEPs are updated. + +If there are multiple authors, each should be on a separate line +following RFC 2822 continuation line conventions. Note that personal +email addresses in PEPs will be obscured as a defense against spam +harvesters. + +*Note: The Resolution header is required for Standards Track PEPs +only. It contains a URL that should point to an email message or +other web resource where the pronouncement about the PEP is made.* + +While a PEP is in private discussions (usually during the initial +Draft phase), a Discussions-To header will indicate the mailing list +or URL where the PEP is being discussed. No Discussions-To header is +necessary if the PEP is being discussed privately with the author, or +on the python-list or python-dev email mailing lists. Note that email +addresses in the Discussions-To header will not be obscured. + +The Type header specifies the type of PEP: Standards Track, +Informational, or Process. + +The format of a PEP is specified with a Content-Type header. The +acceptable values are "text/plain" for plaintext PEPs (see PEP 9 [3]_) +and "text/x-rst" for reStructuredText PEPs (see PEP 12 [4]_). +Plaintext ("text/plain") is the default if no Content-Type header is +present. + +The Created header records the date that the PEP was assigned a +number, while Post-History is used to record the dates of when new +versions of the PEP are posted to python-list and/or python-dev. Both +headers should be in dd-mmm-yyyy format, e.g. 14-Aug-2001. + +Standards Track PEPs must have a Python-Version header which indicates +the version of Python that the feature will be released with. +Informational and Process PEPs do not need a Python-Version header. + +PEPs may have a Requires header, indicating the PEP numbers that this +PEP depends on. + +PEPs may also have a Superseded-By header indicating that a PEP has +been rendered obsolete by a later document; the value is the number of +the PEP that replaces the current document. The newer PEP must have a +Replaces header containing the number of the PEP that it rendered +obsolete. + + +Auxiliary Files +=============== + +PEPs may include auxiliary files such as diagrams. Such files must be +named ``pep-XXXX-Y.ext``, where "XXXX" is the PEP number, "Y" is a +serial number (starting at 1), and "ext" is replaced by the actual +file extension (e.g. "png"). + + +Reporting PEP Bugs, or Submitting PEP Updates +============================================= + +How you report a bug, or submit a PEP update depends on several +factors, such as the maturity of the PEP, the preferences of the PEP +author, and the nature of your comments. For the early draft stages +of the PEP, it's probably best to send your comments and changes +directly to the PEP author. For more mature, or finished PEPs you may +want to submit corrections to the Python `issue tracker`_ so that your +changes don't get lost. If the PEP author is a Python developer, assign the +bug/patch to him, otherwise assign it to the PEP editor. + +When in doubt about where to send your changes, please check first +with the PEP author and/or PEP editor. + +PEP authors who are also Python committers can update the +PEPs themselves by using "svn commit" to commit their changes. + + +Transferring PEP Ownership +========================== + +It occasionally becomes necessary to transfer ownership of PEPs to a +new champion. In general, we'd like to retain the original author as +a co-author of the transferred PEP, but that's really up to the +original author. A good reason to transfer ownership is because the +original author no longer has the time or interest in updating it or +following through with the PEP process, or has fallen off the face of +the 'net (i.e. is unreachable or not responding to email). A bad +reason to transfer ownership is because you don't agree with the +direction of the PEP. We try to build consensus around a PEP, but if +that's not possible, you can always submit a competing PEP. + +If you are interested in assuming ownership of a PEP, send a message +asking to take over, addressed to both the original author and the PEP +editor . If the original author doesn't respond to +email in a timely manner, the PEP editor will make a unilateral +decision (it's not like such decisions can't be reversed :). + + +PEP Editor Responsibilities & Workflow +====================================== + +A PEP editor must subscribe to the list. All +PEP-related correspondence should be sent (or CC'd) to + (but please do not cross-post!). + +For each new PEP that comes in an editor does the following: + +* Read the PEP to check if it is ready: sound and complete. The ideas + must make technical sense, even if they don't seem likely to be + accepted. + +* The title should accurately describe the content. + +* Edit the PEP for language (spelling, grammar, sentence structure, + etc.), markup (for reST PEPs), code style (examples should match PEP + 8 & 7). + +If the PEP isn't ready, the editor will send it back to the author for +revision, with specific instructions. + +Once the PEP is ready for the repository, the PEP editor will: + +* Assign a PEP number (almost always just the next available number, + but sometimes it's a special/joke number, like 666 or 3141). + +* List the PEP in PEP 0 (in two places: the categorized list, and the + numeric list). + +* Add the PEP to SVN. For Subversion repository instructions, see + `the FAQ for Developers + `_. + + The command to check out a read-only copy of the repository is:: + + svn checkout http://svn.python.org/projects/peps/trunk peps + + The command to check out a read-write copy of the repository is:: + + svn checkout svn+ssh://pythondev@svn.python.org/peps/trunk peps + + In particular, the ``svn:eol-style`` property should be set to ``native`` + and the ``svn:keywords`` property to ``Author Date Id Revision``. + +* Monitor python.org to make sure the PEP gets added to the site + properly. + +* Send email back to the PEP author with next steps (post to + python-list & -dev). + +Updates to existing PEPs also come in to peps@python.org. Many PEP +authors are not SVN committers yet, so we do the commits for them. + +Many PEPs are written and maintained by developers with write access +to the Python codebase. The PEP editors monitor the python-checkins +list for PEP changes, and correct any structure, grammar, spelling, or +markup mistakes we see. + +The editors don't pass judgement on PEPs. We merely do the +administrative & editorial part. Except for times like this, there's +relatively low volume. + +Resources: + +* `How Python is Developed `_ + +* `Python's Development Process `_ + +* `Why Develop Python? `_ + +* `Development Tools `_ + +* `Frequently Asked Questions for Developers + `_ + + +References and Footnotes +======================== + +.. [1] This historical record is available by the normal SVN commands + for retrieving older revisions. For those without direct access to + the SVN tree, you can browse the current and past PEP revisions here: + http://svn.python.org/view/peps/trunk/ + +.. [2] PEP 2, Procedure for Adding New Modules, Faassen + (http://www.python.org/dev/peps/pep-0002) + +.. [3] PEP 9, Sample Plaintext PEP Template, Warsaw + (http://www.python.org/dev/peps/pep-0009) + +.. [4] PEP 12, Sample reStructuredText PEP Template, Goodger, Warsaw + (http://www.python.org/dev/peps/pep-0012) + +.. [5] The script referred to here is pep2pyramid.py, the successor to + pep2html.py, both of which live in the same directory in the SVN + tree as the PEPs themselves. Try ``pep2html.py --help`` for + details. The URL for viewing PEPs on the web is + http://www.python.org/dev/peps/. + +.. _issue tracker: + http://bugs.python.org/ + +.. _Open Publication License: http://www.opencontent.org/openpub/ + +.. _reStructuredText: http://docutils.sourceforge.net/rst.html + +.. _Docutils: http://docutils.sourceforge.net/ + + +Copyright +========= + +This document has been placed in the public domain. + + +.. + Local Variables: + mode: indented-text + indent-tabs-mode: nil + sentence-end-double-space: t + fill-column: 70 + coding: utf-8 + End: From 2b575a3ac8a08c2e56473fa745987b4eee7218f6 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sat, 7 Jan 2012 18:16:56 -0500 Subject: [PATCH 103/519] "define function" proposal, unmodified from original --- .../website/source/proposals/dep-0002.rst | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 documentation/website/source/proposals/dep-0002.rst diff --git a/documentation/website/source/proposals/dep-0002.rst b/documentation/website/source/proposals/dep-0002.rst new file mode 100644 index 0000000000..7ed33b90bd --- /dev/null +++ b/documentation/website/source/proposals/dep-0002.rst @@ -0,0 +1,117 @@ +PROPOSAL NAME: Define Function + +PROPOSAL: + + Add a "define function" defining macro that creates a constant + binding in the current module and initializes it to a new function. + The new defining macro has the following syntax: + + DEFINE { adjective }* FUNCTION name parameter-list + [ body ] + END [ FUNCTION ] [ name ] + + The adjectives allowed are implementation dependent. The parameter + list describes the number and types of the arguments that the + function accepts, and the number and types of the values it returns. + It is an error to supply #next in the parameter list, and there is + no implicit #next parameter. + + Using reflective operations on "define function" functions: + + 1] For the following functions an implementation may choose to + return a meaningful result (or perform a meaningful side-effect + operation), or the implementation may signal an error: + generic-function-methods, add-method, find-method, + generic-function-mandatory-keywords, remove-method, + sorted-applicable-methods, applicable-method? + + Note, the error signalled might not be a , + and this implementation choice holds for a "define function" + function that is passed as either argument to add-method and + remove-method. + + 2] The following functions return the same values as they would + for a bare method defined with the same signature: + function-specializers, function-arguments, + function-return-values + + "Define function" could be added either to the core language or to a + library. + +RATIONALE: + + Many programmers desire a way to define a function that clearly + says to other programmers that the function is not part of any + generic operation; furthermore, the function won't be extended as a + generic function, and calling it need not involve any generic + dispatch. The two main choices in current practice are: + + define constant cube = method (x) x * x * x end; + + define method cube (x) x * x * x end; + + The first choice is clumsy because it makes it hard to distinguish + function constants from non-function constants. The second choice + does not make it clear that this is the only method for the + function. The "define function" proposal gives everybody one + simple way to express their intent. The expansion of the macro is + left unspecified so that Dylan implementations have latitude to + support it in the best way suited to the implementation. + + This proposal defines the behavior of applicable-method? when called + on "define function" functions based on new wording that describes + applicable-method? in the DRM. + +EXAMPLES: + + An example use: + + define function cube (x) x * x * x end; + + Below is one possible implementation of the macro. This implementation + supports whatever adjectives are supported by "define constant". + Other implementations are possible. + + define macro function-definer + { define ?adjectives:* function ?name:name + ?signature-and-body:* end } + => { define ?adjectives constant ?name = method + ?signature-and-body end } + end macro function-definer; + +COST TO IMPLEMENTORS: + + The cost is very little, essentially a macro definition and exporting + the identifier for the macro. An implementation may also want to + annotate the function's name in the compiler's database to indicate + that the function should not be extended (or added to a generic + function if it is a method), signalling appropriate errors or + protecting compiler optimizations based on assumptions about the + function. + +REVISION HISTORY: + + Version 1; Harlequin, Inc.; Bill Chiles; 26 JAN 96. + Initial proposal with input from a few people. + Version 2; Harlequin, Inc.; Bill Chiles; 01 FEB 96. + New specification of reflective operations on functions. + Replaces rationale text for the specification of reflective + operations with one sentences about applicable-method?. + Strengthens #next restriction by saying there is no implicit + #next argument. + Removes controversial macro example. + Version 3; Harlequin, Inc.; Bill Chiles; 08 FEB 96. + Described "define function" defining macro without reference to + "define method". + Version 4; Harlequin, Inc.; Peter Norvig 13 MAR 96. + Changed format to meet the new Dylan Change Proposal Format. + Added two possible macro implementations. + Version 5; Kim Barrett 31 Dec 1996 + Removed incorrect example macro definition which used "define method" + in the expansion. (Incorrect because it introduces an implicit binding + of a variable named "next-method" around the body, which is counter to + the specified contract for this macro.) + +STATUS: + + Accepted 31 December 1996 From 842910745b75de18628cf0f627a4f3e9bb76648d Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 00:57:39 -0500 Subject: [PATCH 104/519] Initial rewrite from the Python version. --- .../website/source/proposals/dep-0001.rst | 555 +++++++----------- 1 file changed, 224 insertions(+), 331 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index b018ccd1cf..578f1ae2d0 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -1,212 +1,190 @@ -PEP: 1 -Title: PEP Purpose and Guidelines -Version: $Revision$ -Last-Modified: $Date$ -Author: Barry Warsaw, Jeremy Hylton, David Goodger -Status: Active -Type: Process -Content-Type: text/x-rst -Created: 13-Jun-2000 -Post-History: 21-Mar-2001, 29-Jul-2002, 03-May-2003 - - -What is a PEP? +============== ============================================= +DEP #: 1 +Title: DEP Purpose and Guidelines +Type: Process +Author: Carl Gay +Status: Draft +Created: 07-Jan-2011 +Post-History: None +============== ============================================= + + +Preamble +======== + +This document is based heavily on Python PEP 1, "PEP Purpose and +Guidelines", by Barry Warsaw, Jeremy Hylton, and David Goodger. The +author would like to thank them for providing an excellent base for +the Dylan team to work from. + + +What is a DEP? ============== -PEP stands for Python Enhancement Proposal. A PEP is a design -document providing information to the Python community, or describing -a new feature for Python or its processes or environment. The PEP +DEP stands for Dylan Enhancement Proposal. A DEP is a design +document providing information to the Dylan community, or describing +a new feature for Dylan or its processes or environment. The DEP should provide a concise technical specification of the feature and a rationale for the feature. -We intend PEPs to be the primary mechanisms for proposing new +We intend DEPs to be the primary mechanisms for proposing new features, for collecting community input on an issue, and for -documenting the design decisions that have gone into Python. The PEP +documenting the design decisions that have gone into Dylan. The DEP author is responsible for building consensus within the community and documenting dissenting opinions. -Because the PEPs are maintained as text files in a versioned +Because the DEPs are maintained as text files in a versioned repository, their revision history is the historical record of the feature proposal [1]_. -PEP Types +DEP Types ========= -There are three kinds of PEP: +There are three kinds of DEP: -1. A **Standards Track** PEP describes a new feature or implementation - for Python. +1. A **Standards Track** DEP describes a new feature or implementation + for Dylan. -2. An **Informational** PEP describes a Python design issue, or - provides general guidelines or information to the Python community, - but does not propose a new feature. Informational PEPs do not - necessarily represent a Python community consensus or +2. An **Informational** DEP describes a Dylan design issue, or + provides general guidelines or information to the Dylan community, + but does not propose a new feature. Informational DEPs do not + necessarily represent a Dylan community consensus or recommendation, so users and implementors are free to ignore - Informational PEPs or follow their advice. + Informational DEPs or follow their advice. -3. A **Process** PEP describes a process surrounding Python, or - proposes a change to (or an event in) a process. Process PEPs are - like Standards Track PEPs but apply to areas other than the Python +3. A **Process** DEP describes a process surrounding Dylan, or + proposes a change to (or an event in) a process. Process DEPs are + like Standards Track DEPs but apply to areas other than the Dylan language itself. They may propose an implementation, but not to - Python's codebase; they often require community consensus; unlike - Informational PEPs, they are more than recommendations, and users + Dylan's codebase; they often require community consensus; unlike + Informational DEPs, they are more than recommendations, and users are typically not free to ignore them. Examples include procedures, guidelines, changes to the decision-making process, and - changes to the tools or environment used in Python development. - Any meta-PEP is also considered a Process PEP. + changes to the tools or environment used in Dylan development. + Any meta-DEP is also considered a Process DEP. -PEP Work Flow +DEP Work Flow ============= -The PEP editors assign PEP numbers and change their status. Please send -all PEP-related email to (no cross-posting please). -Also see `PEP Editor Responsibilities & Workflow`_ below. - -The PEP process begins with a new idea for Python. It is highly -recommended that a single PEP contain a single key proposal or new -idea. Small enhancements or patches often don't need -a PEP and can be injected into the Python development work flow with a -patch submission to the Python `issue tracker`_. The more focussed the -PEP, the more successful it tends to be. The PEP editor reserves the -right to reject PEP proposals if they appear too unfocussed or too -broad. If in doubt, split your PEP into several well-focussed ones. +The DEP process begins with a new idea for Dylan. It is highly +recommended that a single DEP contain a single key proposal or new +idea. Small enhancements or patches often don't need a DEP and can be +injected into the Dylan development work flow with a patch submission +to the issue tracker for the appropriate repository on GitHub. The +more focussed the DEP, the more successful it tends to be. If in +doubt, split your DEP into several well-focussed ones. -Each PEP must have a champion -- someone who writes the PEP using the +Each DEP must have a champion -- someone who writes the DEP using the style and format described below, shepherds the discussions in the appropriate forums, and attempts to build community consensus around -the idea. The PEP champion (a.k.a. Author) should first attempt to -ascertain whether the idea is PEP-able. Posting to the -comp.lang.python newsgroup (a.k.a. python-list@python.org mailing -list) or the python-ideas mailing list is the best way to go about this. - -Vetting an idea publicly before going as far as writing a PEP is meant -to save the potential author time. Many ideas have been brought -forward for changing Python that have been rejected for various -reasons. Asking the Python community first if an idea is original +the idea. The DEP champion (a.k.a. Author) should first attempt to +ascertain whether the idea is DEP-able. Posting to +hackers@opendylan.org is the best way to go about this. + +Vetting an idea publicly before going as far as writing a DEP is meant +to save the potential author time. Many ideas have been brought +forward for changing Dylan that have been rejected for various +reasons. Asking the Dylan community first if an idea is original helps prevent too much time being spent on something that is guaranteed to be rejected based on prior discussions (searching the internet does not always do the trick). It also helps to make sure the idea is applicable to the entire community and not just the author. Just because an idea sounds good to the author does not -mean it will work for most people in most areas where Python is used. - -Once the champion has asked the Python community as to whether an -idea has any chance of acceptance, a draft PEP should be presented to -python-ideas. This gives the author a chance to flesh out the draft -PEP to make properly formatted, of high quality, and to address -initial concerns about the proposal. - -Following a discussion on python-ideas, the proposal should be sent to -the `python-dev list `__ with the draft -PEP and the PEP editors . This -draft must be written in PEP style as described below, else it will be -sent back without further regard until proper formatting rules are -followed. - -If the PEP editor approves, he will assign the PEP a number, label it -as Standards Track, Informational, or Process, give it status "Draft", -and create and check-in the initial draft of the PEP. The PEP editor -will not unreasonably deny a PEP. Reasons for denying PEP status -include duplication of effort, being technically unsound, not -providing proper motivation or addressing backwards compatibility, or -not in keeping with the Python philosophy. The BDFL (Benevolent -Dictator for Life, Guido van Rossum) can be consulted during the -approval phase, and is the final arbiter of the draft's PEP-ability. - -As updates are necessary, the PEP author can check in new versions if -they have SVN commit permissions, or can email new PEP versions to -the PEP editor for committing. - -Standards Track PEPs consist of two parts, a design document and a -reference implementation. The PEP should be reviewed and accepted +mean it will work for most people in most areas where Dylan is used. + +Once the champion has asked the Dylan community whether an idea has +any chance of acceptance, a properly formatted draft DEP should be +presented to hackers@opendylan.org. The initial DEP status should be +"Draft". The DEP author should assign the next available DEP number +to the DEP by looking at the `DEP directory `_ to find the +highest used number. The DEP number is not assured until the DEP has +been committed to the `origin Git repository +`_. +As updates are necessary, the DEP author may commit new versions. + +Because Dylan does not have a Benevolent Dictator for Life (as Python +has in Guido van Rossum) we rely on reaching consensus on the hackers +mailing list. Consensus _must_ be reached for the DEP to be approved. +Exactly what "consensus" means here is left undefined, as we expect +most cases to be obvious and we wish to keep the process informal for +now. At such time as this becomes a problem we may implement a more +formal scheme (e.g., voting). + +Standards Track DEPs consist of two parts, a design document and a +reference implementation. The DEP should be reviewed and accepted before a reference implementation is begun, unless a reference -implementation will aid people in studying the PEP. Standards Track -PEPs must include an implementation -- in the form of code, a patch, +implementation will aid people in studying the DEP. Standards Track +DEPs must include an implementation -- in the form of code, a patch, or a URL to same -- before it can be considered Final. -PEP authors are responsible for collecting community feedback on a PEP +DEP authors are responsible for collecting community feedback on a DEP before submitting it for review. However, wherever possible, long open-ended discussions on public mailing lists should be avoided. -Strategies to keep the -discussions efficient include: setting up a separate SIG mailing list -for the topic, having the PEP author accept private comments in the -early design phases, setting up a wiki page, etc. PEP authors should -use their discretion here. - -Once the authors have completed a PEP, they must inform the PEP editor -that it is ready for review. PEPs are reviewed by the BDFL and his -chosen consultants, who may accept or reject a PEP or send it back to -the author(s) for revision. For a PEP that is pre-determined to be -acceptable (e.g., it is an obvious win as-is and/or its implementation -has already been checked in) the BDFL may also initiate a PEP review, -first notifying the PEP author(s) and giving them a chance to make -revisions. - -For a PEP to be accepted it must meet certain minimum criteria. It +Strategies to keep the discussions efficient include: setting up a +separate SIG mailing list for the topic, having the DEP author accept +private comments in the early design phases, setting up a wiki page, +etc. DEP authors should use their discretion here. + +For a DEP to be accepted it must meet certain minimum criteria. It must be a clear and complete description of the proposed enhancement. The enhancement must represent a net improvement. The proposed -implementation, if applicable, must be solid and must not complicate -the interpreter unduly. Finally, a proposed enhancement must be -"pythonic" in order to be accepted by the BDFL. (However, "pythonic" -is an imprecise term; it may be defined as whatever is acceptable to -the BDFL. This logic is intentionally circular.) See PEP 2 [2]_ for -standard library module acceptance criteria. - -Once a PEP has been accepted, the reference implementation must be +implementation, if applicable, must be solid and must not unduly add +complication. + +Once a DEP has been accepted, the reference implementation must be completed. When the reference implementation is complete and accepted -by the BDFL, the status will be changed to "Final". +by the community, the status may be changed to "Final". -A PEP can also be assigned status "Deferred". The PEP author or -editor can assign the PEP this status when no progress is being made -on the PEP. Once a PEP is deferred, the PEP editor can re-assign it +A DEP can also be assigned status "Deferred". The DEP author or +editor can assign the DEP this status when no progress is being made +on the DEP. Once a DEP is deferred, the DEP editor can re-assign it to draft status. -A PEP can also be "Rejected". Perhaps after all is said and done it +A DEP can also be "Rejected". Perhaps after all is said and done it was not a good idea. It is still important to have a record of this fact. -PEPs can also be superseded by a different PEP, rendering the original -obsolete. This is intended for Informational PEPs, where version 2 of +DEPs can also be superseded by a different DEP, rendering the original +obsolete. This is intended for Informational DEPs, where version 2 of an API can replace version 1. -The possible paths of the status of PEPs are as follows: +The possible paths of the status of DEPs are as follows: -.. image:: pep-0001-1.png +.. image:: ../_static/dep-0001-states.png -Some Informational and Process PEPs may also have a status of "Active" -if they are never meant to be completed. E.g. PEP 1 (this PEP). +Some Informational and Process DEPs may also have a status of "Active" +if they are never meant to be completed. E.g. DEP 1 (this DEP). -What belongs in a successful PEP? +What belongs in a successful DEP? ================================= -Each PEP should have the following parts: +Each DEP should have the following parts: 1. Preamble -- RFC 822 style headers containing meta-data about the - PEP, including the PEP number, a short descriptive title (limited + DEP, including the DEP number, a short descriptive title (limited to a maximum of 44 characters), the names, and optionally the contact info for each author, etc. 2. Abstract -- a short (~200 word) description of the technical issue being addressed. -3. Copyright/public domain -- Each PEP must either be explicitly - labelled as placed in the public domain (see this PEP as an +3. Copyright/public domain -- Each DEP must either be explicitly + labelled as placed in the public domain (see this DEP as an example) or licensed under the `Open Publication License`_. 4. Specification -- The technical specification should describe the syntax and semantics of any new language feature. The specification should be detailed enough to allow competing, - interoperable implementations for any of the current Python - platforms (CPython, Jython, Python .NET). + interoperable implementations for any of the current Dylan + platforms. -5. Motivation -- The motivation is critical for PEPs that want to - change the Python language. It should clearly explain why the +5. Motivation -- The motivation is critical for DEPs that want to + change the Dylan language. It should clearly explain why the existing language specification is inadequate to address the - problem that the PEP solves. PEP submissions without sufficient - motivation may be rejected outright. + problem that the DEP solves. 6. Rationale -- The rationale fleshes out the specification by describing what motivated the design and why particular design @@ -218,72 +196,68 @@ Each PEP should have the following parts: community and discuss important objections or concerns raised during discussion. -7. Backwards Compatibility -- All PEPs that introduce backwards +7. Backwards Compatibility -- All DEPs that introduce backwards incompatibilities must include a section describing these - incompatibilities and their severity. The PEP must explain how the - author proposes to deal with these incompatibilities. PEP - submissions without a sufficient backwards compatibility treatise - may be rejected outright. + incompatibilities and their severity. The DEP must explain how the + author proposes to deal with these incompatibilities. 8. Reference Implementation -- The reference implementation must be - completed before any PEP is given status "Final", but it need not - be completed before the PEP is accepted. It is better to finish + completed before any DEP is given status "Final", but it need not + be completed before the DEP is accepted. It is better to finish the specification and rationale first and reach consensus on it before writing code. - The final implementation must include test code and documentation - appropriate for either the Python language reference or the - standard library reference. + The final implementation must include good test code and + documentation. -PEP Formats and Templates -========================= +DEP Format and Templates +======================== + +DEPs must be written in ReStructuredText_ format. This allows for +rich markup that is still quite easy to read, but results in much +better-looking and more functional HTML. -There are two PEP formats available to authors: plaintext and -reStructuredText_. Both are UTF-8-encoded text files. +.. DEP 12 contains instructions and a template [4]_ for + reStructuredText DEPs. -Plaintext PEPs are written with minimal structural markup that adheres -to a rigid style. PEP 9 contains a instructions and a template [3]_ -you can use to get started writing your plaintext PEP. +The DEP author must verify that the ReStructuredText_ parses correctly. +For example:: -ReStructuredText_ PEPs allow for rich markup that is still quite easy -to read, but results in much better-looking and more functional HTML. -PEP 12 contains instructions and a template [4]_ for reStructuredText -PEPs. + git clone git@github.com:dylan-lang/website.git + cd website + cp your-dep.rst source/proposals/dep-1234.rst + make html -There is a Python script that converts both styles of PEPs to HTML for -viewing on the web [5]_. Parsing and conversion of plaintext PEPs is -self-contained within the script. reStructuredText PEPs are parsed -and converted by Docutils_ code called from the script. +Fix any errors that are displayed. -PEP Header Preamble +DEP Header Preamble =================== -Each PEP must begin with an RFC 822 style header preamble. The headers -must appear in the following order. Headers marked with "*" are -optional and are described below. All other headers are required. :: +Each DEP must begin with an RFC 822 style header preamble in simple +RST table format. The headers must appear in the following order. +Headers marked with "*" are optional and are described below. All +other headers are required. :: - PEP: - Title: - Version: - Last-Modified: + DEP: + Title: + Version: + Last-Modified: Author: - * Discussions-To: Status: Type: - * Content-Type: - * Requires: + * Requires: Created: - * Python-Version: - Post-History: - * Replaces: - * Superseded-By: + * Dylan-Version: + Post-History: + * Replaces: + * Superseded-By: * Resolution: The Author header lists the names, and optionally the email addresses -of all the authors/owners of the PEP. The format of the Author header +of all the authors/owners of the DEP. The format of the Author header value must be Random J. User @@ -292,225 +266,144 @@ if the email address is included, and just Random J. User -if the address is not given. For historical reasons the format -"address@dom.ain (Random J. User)" may appear in a PEP, however new -PEPs must use the mandated format above, and it is acceptable to -change to this format when PEPs are updated. +if the address is not given. If there are multiple authors, each should be on a separate line -following RFC 2822 continuation line conventions. Note that personal -email addresses in PEPs will be obscured as a defense against spam -harvesters. +following RFC 2822 continuation line conventions. -*Note: The Resolution header is required for Standards Track PEPs -only. It contains a URL that should point to an email message or -other web resource where the pronouncement about the PEP is made.* +.. Not yet: Note that personal email addresses in DEPs will be + obscured as a defense against spam harvesters. -While a PEP is in private discussions (usually during the initial -Draft phase), a Discussions-To header will indicate the mailing list -or URL where the PEP is being discussed. No Discussions-To header is -necessary if the PEP is being discussed privately with the author, or -on the python-list or python-dev email mailing lists. Note that email -addresses in the Discussions-To header will not be obscured. +*Note: The Resolution header is required for Standards Track DEPs +only. It contains a URL that should point to an email message or +other web resource where the pronouncement about the DEP is made.* -The Type header specifies the type of PEP: Standards Track, +The Type header specifies the type of DEP: Standards Track, Informational, or Process. -The format of a PEP is specified with a Content-Type header. The -acceptable values are "text/plain" for plaintext PEPs (see PEP 9 [3]_) -and "text/x-rst" for reStructuredText PEPs (see PEP 12 [4]_). -Plaintext ("text/plain") is the default if no Content-Type header is -present. - -The Created header records the date that the PEP was assigned a +The Created header records the date that the DEP was assigned a number, while Post-History is used to record the dates of when new -versions of the PEP are posted to python-list and/or python-dev. Both +versions of the DEP are posted to the hackers list. Both headers should be in dd-mmm-yyyy format, e.g. 14-Aug-2001. -Standards Track PEPs must have a Python-Version header which indicates -the version of Python that the feature will be released with. -Informational and Process PEPs do not need a Python-Version header. +Standards Track DEPs must have a Dylan-Version header which indicates +the version of Dylan that the feature will be released with. +Informational and Process DEPs do not need a Dylan-Version header. -PEPs may have a Requires header, indicating the PEP numbers that this -PEP depends on. +DEPs may have a Requires header, indicating the DEP numbers that this +DEP depends on. -PEPs may also have a Superseded-By header indicating that a PEP has +DEPs may also have a Superseded-By header indicating that a DEP has been rendered obsolete by a later document; the value is the number of -the PEP that replaces the current document. The newer PEP must have a -Replaces header containing the number of the PEP that it rendered +the DEP that replaces the current document. The newer DEP must have a +Replaces header containing the number of the DEP that it rendered obsolete. Auxiliary Files =============== -PEPs may include auxiliary files such as diagrams. Such files must be -named ``pep-XXXX-Y.ext``, where "XXXX" is the PEP number, "Y" is a -serial number (starting at 1), and "ext" is replaced by the actual -file extension (e.g. "png"). +DEPs may include auxiliary files such as diagrams. Such files must be +named ``pep-XXXX-aaaa.ext``, where "XXXX" is the DEP number, "aaaa" is +arbitrary text to indicate the file content (e.g., "state-diagram"), +and "ext" is replaced by the actual file extension (e.g. "png"). -Reporting PEP Bugs, or Submitting PEP Updates +Reporting DEP Bugs, or Submitting DEP Updates ============================================= -How you report a bug, or submit a PEP update depends on several -factors, such as the maturity of the PEP, the preferences of the PEP +How you report a bug, or submit a DEP update depends on several +factors, such as the maturity of the DEP, the preferences of the DEP author, and the nature of your comments. For the early draft stages -of the PEP, it's probably best to send your comments and changes -directly to the PEP author. For more mature, or finished PEPs you may -want to submit corrections to the Python `issue tracker`_ so that your -changes don't get lost. If the PEP author is a Python developer, assign the -bug/patch to him, otherwise assign it to the PEP editor. +of the DEP, it's probably best to send your comments and changes +directly to the DEP author. For more mature, or finished DEPs you may +want to submit corrections to the Dylan `issue tracker`_ so that your +changes don't get lost. Assign the bug/patch to the DEP author. When in doubt about where to send your changes, please check first -with the PEP author and/or PEP editor. - -PEP authors who are also Python committers can update the -PEPs themselves by using "svn commit" to commit their changes. - - -Transferring PEP Ownership -========================== +with the DEP author. -It occasionally becomes necessary to transfer ownership of PEPs to a -new champion. In general, we'd like to retain the original author as -a co-author of the transferred PEP, but that's really up to the -original author. A good reason to transfer ownership is because the -original author no longer has the time or interest in updating it or -following through with the PEP process, or has fallen off the face of -the 'net (i.e. is unreachable or not responding to email). A bad -reason to transfer ownership is because you don't agree with the -direction of the PEP. We try to build consensus around a PEP, but if -that's not possible, you can always submit a competing PEP. +DEP authors who are also Dylan committers can update the DEPs +themselves committing them to Git and pushing to the main repository. -If you are interested in assuming ownership of a PEP, send a message -asking to take over, addressed to both the original author and the PEP -editor . If the original author doesn't respond to -email in a timely manner, the PEP editor will make a unilateral -decision (it's not like such decisions can't be reversed :). - -PEP Editor Responsibilities & Workflow +DEP Author Responsibilities & Workflow ====================================== -A PEP editor must subscribe to the list. All -PEP-related correspondence should be sent (or CC'd) to - (but please do not cross-post!). - -For each new PEP that comes in an editor does the following: +A DEP author must subscribe to the list. +Before submitting a (new revision of a DEP) the author must do the +following: -* Read the PEP to check if it is ready: sound and complete. The ideas +* Read the DEP to check if it is ready: sound and complete. The ideas must make technical sense, even if they don't seem likely to be accepted. * The title should accurately describe the content. -* Edit the PEP for language (spelling, grammar, sentence structure, - etc.), markup (for reST PEPs), code style (examples should match PEP - 8 & 7). - -If the PEP isn't ready, the editor will send it back to the author for -revision, with specific instructions. - -Once the PEP is ready for the repository, the PEP editor will: +* Edit the DEP for language (spelling, grammar, sentence structure, + etc.), markup, and code style. -* Assign a PEP number (almost always just the next available number, - but sometimes it's a special/joke number, like 666 or 3141). +Once the DEP is ready for the repository, the DEP author will: -* List the PEP in PEP 0 (in two places: the categorized list, and the - numeric list). +* Assign the next available DEP number. -* Add the PEP to SVN. For Subversion repository instructions, see - `the FAQ for Developers - `_. +* List the DEP in the DEP index (in two places: the categorized list, + and the numeric list). - The command to check out a read-only copy of the repository is:: +* Add the DEP to Git. All DEPs live in `the website repository + `_. The command to check + it out is:: - svn checkout http://svn.python.org/projects/peps/trunk peps + git clone git@github.com:dylan-lang/website.git - The command to check out a read-write copy of the repository is:: + Commit your changes, push them to your fork of the repository and + submit a pull request. - svn checkout svn+ssh://pythondev@svn.python.org/peps/trunk peps - - In particular, the ``svn:eol-style`` property should be set to ``native`` - and the ``svn:keywords`` property to ``Author Date Id Revision``. - -* Monitor python.org to make sure the PEP gets added to the site +* Monitor opendylan.org to make sure the DEP gets added to the site properly. -* Send email back to the PEP author with next steps (post to - python-list & -dev). - -Updates to existing PEPs also come in to peps@python.org. Many PEP -authors are not SVN committers yet, so we do the commits for them. - -Many PEPs are written and maintained by developers with write access -to the Python codebase. The PEP editors monitor the python-checkins -list for PEP changes, and correct any structure, grammar, spelling, or -markup mistakes we see. +Resources: -The editors don't pass judgement on PEPs. We merely do the -administrative & editorial part. Except for times like this, there's -relatively low volume. +* See the section `For Open Dylan Developers + `_ on the opendylan.org + documentation page. -Resources: +.. It would be nice to have equivalents for some of these: -* `How Python is Developed `_ + * `How Dylan is Developed `_ -* `Python's Development Process `_ + * `Dylan's Development Process `_ -* `Why Develop Python? `_ + * `Why Develop Dylan? `_ -* `Development Tools `_ + * `Development Tools `_ -* `Frequently Asked Questions for Developers - `_ + * `Frequently Asked Questions for Developers + `_ References and Footnotes ======================== -.. [1] This historical record is available by the normal SVN commands +.. [1] This historical record is available by the normal Git commands for retrieving older revisions. For those without direct access to - the SVN tree, you can browse the current and past PEP revisions here: - http://svn.python.org/view/peps/trunk/ - -.. [2] PEP 2, Procedure for Adding New Modules, Faassen - (http://www.python.org/dev/peps/pep-0002) - -.. [3] PEP 9, Sample Plaintext PEP Template, Warsaw - (http://www.python.org/dev/peps/pep-0009) + Git, you can browse the current and past DEP revisions here: + https://github.com/dylan-lang/website/tree/master/source/proposals -.. [4] PEP 12, Sample reStructuredText PEP Template, Goodger, Warsaw - (http://www.python.org/dev/peps/pep-0012) - -.. [5] The script referred to here is pep2pyramid.py, the successor to - pep2html.py, both of which live in the same directory in the SVN - tree as the PEPs themselves. Try ``pep2html.py --help`` for - details. The URL for viewing PEPs on the web is - http://www.python.org/dev/peps/. - -.. _issue tracker: - http://bugs.python.org/ +.. [2] Which issue tracker to use will depend on the content of the + DEP. For language changes, changes to Open Dylan, or changes to + "core" libraries it will usually be `opendylan + `_. For other + libraries there may be a separate repository and issue tracker. + This is still in flux. When in doubt, ask in IRC on the #dylan + channel or on the hackers list. .. _Open Publication License: http://www.opencontent.org/openpub/ .. _reStructuredText: http://docutils.sourceforge.net/rst.html -.. _Docutils: http://docutils.sourceforge.net/ - Copyright ========= This document has been placed in the public domain. - - -.. - Local Variables: - mode: indented-text - indent-tabs-mode: nil - sentence-end-double-space: t - fill-column: 70 - coding: utf-8 - End: From 8a69cedb49a2d4645e588a2cd1bd7b8c468e3af4 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 00:58:47 -0500 Subject: [PATCH 105/519] state diagram for dep 1 --- .../website/source/_static/dep-0001-states.png | Bin 0 -> 20813 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 documentation/website/source/_static/dep-0001-states.png diff --git a/documentation/website/source/_static/dep-0001-states.png b/documentation/website/source/_static/dep-0001-states.png new file mode 100644 index 0000000000000000000000000000000000000000..51eb2b25826c3f97b38a4fa17425a86d27c0d962 GIT binary patch literal 20813 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 literal 0 HcmV?d00001 From 523098311e4df5d2aeebde0b43cd2d0b11d8b34b Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 00:59:25 -0500 Subject: [PATCH 106/519] update dep index --- documentation/website/source/proposals/index.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index d161aa770a..71bdc16a4c 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -5,16 +5,17 @@ Dylan Enhancement Proposals .. contents:: -Active Proposals -================ +Draft Proposals +=============== -#. `Better string manipulation for common-dylan `_ +#. `DEP Purpose and Guidelines `_ +#. `New strings Library `_ Accepted Proposals ================== -There are no accepted proposals. +#. `define function `_ Declined Proposals From cb6464f2235924a8146ce71ff165e6550275755e Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 01:00:25 -0500 Subject: [PATCH 107/519] deleted better-strings.rst -- not ready --- .../source/proposals/better-strings.rst | 279 ------------------ 1 file changed, 279 deletions(-) delete mode 100644 documentation/website/source/proposals/better-strings.rst diff --git a/documentation/website/source/proposals/better-strings.rst b/documentation/website/source/proposals/better-strings.rst deleted file mode 100644 index 1e4166dfdb..0000000000 --- a/documentation/website/source/proposals/better-strings.rst +++ /dev/null @@ -1,279 +0,0 @@ -******************************************* -Better String Manipulation for common-dylan -******************************************* - -============== ============================================= -Proposal #: 1 -Title: Better Strings API -Author: Carl Gay -Status: Draft -Content-Type: text/x-rst -Created: 2011.12.27 -Dylan-Version: 2011.1 -============== ============================================= - - -.. contents:: - - -Abstract -======== - -The ``dylan`` and ``common-dylan`` libraries have only limited string -manipulation functionality. This proposal is an attempt to provide a -richer strings API. - -For this draft I'm being slightly loose with signatures. I use names -such as char-or-string rather than writing out each overloaded -signature with explicit types. I'll fix that in a later draft once -the basic form of the API is agreed. --cgay - - - -Goals -===== - -#. Comprehensive string APIs available via the ``common-dylan`` module - in the ``common-dylan`` library. - -#. Replace existing string-extensions module with names directly - available in common-dylan. - -#. Consistent high-level API for when readability and convenience are - paramount. Low-level functions available where a significant - performance improvement can be had. - -#. String operations consistent with regular expression operations - where possible. i.e., share the same generic functions - - -Non Goals -========= - -#. Unicode - -#. Immutable strings - -#. Strings not implemented as subclasses of ````. - - -Constants -========= - -TODO: remove these. I don't see any need for them to be exported. -Leaving them here for now, in case something comes up. - -$control-characters -$printable-characters -$graphic-characters -$decimal-digits -$octal-digits -$hexadecimal-digits -$ascii-letters -$whitespace-characters -$alphanumeric-characters - - - -Functions -========= - - -Predicates ----------- - -These all work for a single character or for a string. When applied -to a string they are true if they're true for each character in the -string. - -These are mainly taken from string-extensions/character-type.dylan. - -ascii-control? (char-or-string) => () - -ascii-printable? (char-or-string) => () - -ascii-graphic? (char-or-string) => () - -ascii-letter? (char-or-string) => () - -lowercase? (char-or-string) => () - -uppercase? (char-or-string) => () - -whitespace? (char-or-string) => () - -alphanumeric? (char-or-string) => () - -decimal-digit? (char-or-string) => () - -octal-digit? (char-or-string) => () - -hexadecimal-digit? (char-or-string) => () - - -Comparisons ------------ - -Characters -~~~~~~~~~~ - -Case insensitive character comparisons for use as the value of various -"test" parameters. For case-sensitive comparison, use "=". -:: - - ci-char-equal? (char1, char2) - ci-char-less? (char1, char2) - ci-char-greater? (char1, char2) - -**Discussion** - -The "ci-*" naming scheme is consistent with other proposed functions -(below). Case-insensitive character comparison is used frequently -enough in our existing code base that at least ``ci-char-equal?`` -should exist. ``ci-char-less?`` and ``ci-char-greater?`` are likely -to be less useful, but are provided for completeness. - - -Strings -~~~~~~~ - -String comparisons, both case-sensitive and case-insensitive. These -default to comparing the entire string but allow comparing substrings -via keyword arguments. -:: - - string-compare (string1, string2, #key start1, end1, start2, end2, test) - Low-level function used to implement the functions below. - -These are case-sensitive:: - - string-equal? (string1, string2, #key start1, end1, start2, end2) - string-less? (string1, string2, #key start1, end1, start2, end2) - string-greater? (string1, string2, #key start1, end1, start2, end2) - -These are case-insensitive:: - - ci-string-equal? (string1, string2, #key start1, end1, start2, end2) - ci-string-less? (string1, string2, #key start1, end1, start2, end2) - ci-string-greater? (string1, string2, #key start1, end1, start2, end2) - -From the ``dylan`` module (included for completeness):: - - = (char-or-string, char-or-string) - < (char-or-string, char-or-string) - > (char-or-string, char-or-string) - - -**Discussion** - -Some people may object to the ci-* functions on the grounds that a -"test" parameter could be added to the non-ci-* functions instead. -But consider this type of code, which is likely to be fairly common:: - - sort(seq, test: ci-string-less?) - -Instead one would have to write this:: - - sort(seq, test: rcurry(string-less?, test: ci-char-equal?)) - -or worse, if ci-char-equal? is removed on the same grounds:: - - sort(seq, test: rcurry(string-less?, test: method (c1, c2) - as-lowercase(c1) = as-lowercase(c2) - end)) - -or, the less efficient but more concise:: - - sort(seq, test: method (s1, s2) as-lowercase(s1) < as-lowercase(s2) end) - -The abbreviation "ci" stands for case-insensitive. In the author's -opinion "case-insensitive-string-less?" etc. are simply too long and -"ci" is easy enough to remember. The author is willing to be -out-voted on this point. - - -Conversions ------------ - -make(, size: n, fill: char) - -concatenate(sequence, #rest sequences) // somewhat redundant with "join" - -copy(string, #key start, end) - -lowercase(char-or-string, #key start, end) - -lowercase!(char-or-string, #key start, end) - -uppercase(char-or-string, #key start, end) - -uppercase!(char-or-string, #key start, end) - -wrap(string, width, #key prefix = "", test, strict?) => (new-string) - Return a copy of ``string`` which has been line wrapped at column width - ``width``. Each line is prefixed with ``prefix``, which defaults to the - empty string. The ``test`` determines where it is acceptable to wrap - long lines. It defaults to a function that will only wrap on whitespace. - If any non-breakable sequence of characters (plus the prefix) is wider - than ``width``, then ``width`` will be exceeded in that case unless - ``strict?`` is true. - - **TODO:** exact contract of ``test`` function. It may become more - obvious during implementation. Consider: how to deal with wrapping - on '-'. - -pad-left(string, width, #key fill = ' ') -pad-right(string, width, #key fill = ' ') -pad-center(string, width, #key fill = ' ') - Return a string of the given ``width``. If the given ``string`` - is shorter than ``width``, add ``fill`` equally to both sides of - the result such that the original string is center aligned. - - Examples:: - - pad-center("x", 5) => " x " - pad-center("x", 4) => " x " or " x " (unspecified) - pad-center("x", 7, fill: '.') => "...x..." - - Return a string padded on the left or right with ``fill`` until it - is ``width`` columns wide. If ``string``.size is >= ``width`` no - padding is performed. - -strip(string, #key start, end, test) - -find(string, pattern, #key start, end, test) - -starts-with?(string, pattern) => - -ends-with?(string, pattern) => - -replace(string, pattern, new, #key test) - -replace!(string, pattern, new, #key test) - -slice(sequence, #key start, end, step) => (new-sequence) - -slice!(sequence, #key start, end, step) => (sequence) - Return value may share structure with original sequence. - -join(parts, separator, #key start, end, key, conjunction) => (string) - -split(string, separator, #key start, end, max, remove-if-empty?) => (sequence-of-strings) - -split-lines(string, #rest split-keys) => (sequence-of-strings) - Alternative: split(text, find-end-of-line, #key ...) - -count(string, pattern, #key start, end, test, overlap?) => (n) - -interpolate(string, table) => (string) - interpolate("foo {x}", table("x" => 5)) => "foo 5" - - -Other -===== - -* Move and friends from string-extensions to - regular-expressions. That's the only place that uses it, and it is - unlikely to be of much use elsewhere. See conversation in #dylan on - 2011.12.26. - From b55425716abf67828a81343c8bb435061e571ae3 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 01:52:34 -0500 Subject: [PATCH 108/519] fix footnote reference --- documentation/website/source/proposals/dep-0001.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 578f1ae2d0..6fb4beb633 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -317,7 +317,7 @@ factors, such as the maturity of the DEP, the preferences of the DEP author, and the nature of your comments. For the early draft stages of the DEP, it's probably best to send your comments and changes directly to the DEP author. For more mature, or finished DEPs you may -want to submit corrections to the Dylan `issue tracker`_ so that your +want to submit corrections to the Dylan issue tracker [2]_ so that your changes don't get lost. Assign the bug/patch to the DEP author. When in doubt about where to send your changes, please check first From 834a3d2924058877cf9617ca2fb80333825266fe Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 12:05:13 -0500 Subject: [PATCH 109/519] Improvements to the DEP index. --- .../website/source/proposals/index.rst | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index 71bdc16a4c..feec658e9c 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -2,20 +2,28 @@ Dylan Enhancement Proposals *************************** -.. contents:: +.. contents:: Contents + :local: +.. NOTE: When adding a new proposal to this index be sure to add it in + two places: the "All Proposals by Number" section and at least one + other section depending on the proposal's current status. -Draft Proposals -=============== -#. `DEP Purpose and Guidelines `_ -#. `New strings Library `_ +Open Proposals (under consideration) +==================================== + +==== ============================================= +0001 `DEP Purpose and Guidelines `_ (`source `__) +==== ============================================= Accepted Proposals ================== -#. `define function `_ +==== ============================================= +0002 `define function `_ (`source `__) +==== ============================================= Declined Proposals @@ -23,3 +31,12 @@ Declined Proposals There are no declined proposals. + +All Proposals by Number +======================= + +==== ============================================= +0001 `DEP Purpose and Guidelines `_ (`source `__) +0002 `define function `_ (`source `__) +==== ============================================= + From f1ce325caf576147b714ef127fa7e6aa3f025402 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 12:16:46 -0500 Subject: [PATCH 110/519] Convert to RST format with minimal changes. --- .../website/source/proposals/dep-0002.rst | 75 ++++++++++++------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/documentation/website/source/proposals/dep-0002.rst b/documentation/website/source/proposals/dep-0002.rst index 7ed33b90bd..5f1648b078 100644 --- a/documentation/website/source/proposals/dep-0002.rst +++ b/documentation/website/source/proposals/dep-0002.rst @@ -1,10 +1,23 @@ -PROPOSAL NAME: Define Function - -PROPOSAL: +============== ============================================= +DEP #: 2 +Title: Define Function +Type: Standards Track +Author: Bill Chiles +Status: Accepted +Created: 26-Jan-1996 +Post-History: None +============== ============================================= + +*Note: This DEP was converted from the old Dylan Change Proposal +Format to DEP format with minimal changes for ReStructuredText. It +does not fully conform to the new format.* + +Specification +============= Add a "define function" defining macro that creates a constant binding in the current module and initializes it to a new function. - The new defining macro has the following syntax: + The new defining macro has the following syntax:: DEFINE { adjective }* FUNCTION name parameter-list [ body ] @@ -18,33 +31,36 @@ PROPOSAL: Using reflective operations on "define function" functions: - 1] For the following functions an implementation may choose to - return a meaningful result (or perform a meaningful side-effect - operation), or the implementation may signal an error: - generic-function-methods, add-method, find-method, - generic-function-mandatory-keywords, remove-method, - sorted-applicable-methods, applicable-method? - - Note, the error signalled might not be a , - and this implementation choice holds for a "define function" - function that is passed as either argument to add-method and - remove-method. - - 2] The following functions return the same values as they would - for a bare method defined with the same signature: - function-specializers, function-arguments, + (1) For the following functions an implementation may choose to + return a meaningful result (or perform a meaningful side-effect + operation), or the implementation may signal an error:: + + generic-function-methods, add-method, find-method, + generic-function-mandatory-keywords, remove-method, + sorted-applicable-methods, applicable-method? + + Note, the error signalled might not be a , + and this implementation choice holds for a "define function" + function that is passed as either argument to add-method and + remove-method. + + (2) The following functions return the same values as they would + for a bare method defined with the same signature:: + + function-specializers, function-arguments, function-return-values "Define function" could be added either to the core language or to a library. -RATIONALE: +Rationale +========= Many programmers desire a way to define a function that clearly says to other programmers that the function is not part of any generic operation; furthermore, the function won't be extended as a generic function, and calling it need not involve any generic - dispatch. The two main choices in current practice are: + dispatch. The two main choices in current practice are:: define constant cube = method (x) x * x * x end; @@ -62,15 +78,16 @@ RATIONALE: on "define function" functions based on new wording that describes applicable-method? in the DRM. -EXAMPLES: +Examples +======== - An example use: + An example use:: define function cube (x) x * x * x end; Below is one possible implementation of the macro. This implementation supports whatever adjectives are supported by "define constant". - Other implementations are possible. + Other implementations are possible. :: define macro function-definer { define ?adjectives:* function ?name:name @@ -79,7 +96,8 @@ EXAMPLES: ?signature-and-body end } end macro function-definer; -COST TO IMPLEMENTORS: +Cost to Implementors +==================== The cost is very little, essentially a macro definition and exporting the identifier for the macro. An implementation may also want to @@ -89,7 +107,9 @@ COST TO IMPLEMENTORS: protecting compiler optimizations based on assumptions about the function. -REVISION HISTORY: +Revision History +================ +:: Version 1; Harlequin, Inc.; Bill Chiles; 26 JAN 96. Initial proposal with input from a few people. @@ -112,6 +132,7 @@ REVISION HISTORY: of a variable named "next-method" around the body, which is counter to the specified contract for this macro.) -STATUS: +Status +====== Accepted 31 December 1996 From 3671baa988d1970609d796e779587cc5402f68e9 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 12:39:02 -0500 Subject: [PATCH 111/519] Remove ref to BDFL, requested by Hannes. --- documentation/website/source/proposals/dep-0001.rst | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 6fb4beb633..e70d3e25ad 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -104,13 +104,12 @@ been committed to the `origin Git repository `_. As updates are necessary, the DEP author may commit new versions. -Because Dylan does not have a Benevolent Dictator for Life (as Python -has in Guido van Rossum) we rely on reaching consensus on the hackers -mailing list. Consensus _must_ be reached for the DEP to be approved. -Exactly what "consensus" means here is left undefined, as we expect -most cases to be obvious and we wish to keep the process informal for -now. At such time as this becomes a problem we may implement a more -formal scheme (e.g., voting). +We rely on reaching consensus on the hackers mailing list. Consensus +_must_ be reached for the DEP to be approved. Exactly what +"consensus" means here is left undefined, as we expect most cases to +be obvious and we wish to keep the process informal for now. At such +time as this becomes a problem we may implement a more formal scheme +(e.g., voting). Standards Track DEPs consist of two parts, a design document and a reference implementation. The DEP should be reviewed and accepted From dff415094a20b0c4e4133f9a939da2933a7cef69 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Jan 2012 12:40:41 -0500 Subject: [PATCH 112/519] pep -> dep --- documentation/website/source/proposals/dep-0001.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index e70d3e25ad..4f49e0bef0 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -303,7 +303,7 @@ Auxiliary Files =============== DEPs may include auxiliary files such as diagrams. Such files must be -named ``pep-XXXX-aaaa.ext``, where "XXXX" is the DEP number, "aaaa" is +named ``dep-XXXX-aaaa.ext``, where "XXXX" is the DEP number, "aaaa" is arbitrary text to indicate the file content (e.g., "state-diagram"), and "ext" is replaced by the actual file extension (e.g. "png"). From c48408ab7c659d64d48b31851f5b8ed461c04fbd Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 9 Jan 2012 01:22:31 -0500 Subject: [PATCH 113/519] Clarify that only Git branches are accepted for standard proposals --- documentation/website/source/proposals/dep-0001.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 4f49e0bef0..c3e486e032 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -115,8 +115,8 @@ Standards Track DEPs consist of two parts, a design document and a reference implementation. The DEP should be reviewed and accepted before a reference implementation is begun, unless a reference implementation will aid people in studying the DEP. Standards Track -DEPs must include an implementation -- in the form of code, a patch, -or a URL to same -- before it can be considered Final. +DEPs must include an implementation -- in the form of a Git branch URL +-- before it can be considered Final. DEP authors are responsible for collecting community feedback on a DEP before submitting it for review. However, wherever possible, long From 28ab3695ab473489d79f5b03a6bfc6e09410b419 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 9 Jan 2012 15:23:36 -0500 Subject: [PATCH 114/519] Move title above header to have a proper title on HTML page also, update dep-0001 proposal --- documentation/website/source/proposals/dep-0001.rst | 13 +++++++------ documentation/website/source/proposals/dep-0002.rst | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 4f49e0bef0..52c871e249 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -1,6 +1,8 @@ +DEP Purpose and Guidelines +========================== + ============== ============================================= DEP #: 1 -Title: DEP Purpose and Guidelines Type: Process Author: Carl Gay Status: Draft @@ -234,13 +236,12 @@ Fix any errors that are displayed. DEP Header Preamble =================== -Each DEP must begin with an RFC 822 style header preamble in simple -RST table format. The headers must appear in the following order. -Headers marked with "*" are optional and are described below. All -other headers are required. :: +Each DEP must begin with a title, followed by an RFC 822 style header +preamble in simple RST table format. The headers must appear in the +following order. Headers marked with "*" are optional and are +described below. All other headers are required. :: DEP: - Title: Version: Last-Modified: Author: diff --git a/documentation/website/source/proposals/dep-0002.rst b/documentation/website/source/proposals/dep-0002.rst index 5f1648b078..6d55df504c 100644 --- a/documentation/website/source/proposals/dep-0002.rst +++ b/documentation/website/source/proposals/dep-0002.rst @@ -1,6 +1,8 @@ +Define Function +=============== + ============== ============================================= DEP #: 2 -Title: Define Function Type: Standards Track Author: Bill Chiles Status: Accepted From cee4fced68d1344ebfe1857356a709d935616909 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 9 Jan 2012 15:24:48 -0500 Subject: [PATCH 115/519] Add C3 linearization proposal --- .../website/source/proposals/dep-0003.rst | 119 ++++++++++++++++++ .../website/source/proposals/index.rst | 2 + 2 files changed, 121 insertions(+) create mode 100644 documentation/website/source/proposals/dep-0003.rst diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst new file mode 100644 index 0000000000..43edc5dcbd --- /dev/null +++ b/documentation/website/source/proposals/dep-0003.rst @@ -0,0 +1,119 @@ +============== ============================================= +DEP #: 3 +Title: C3 superclass linearization +Type: Standards Track +Author: Hannes Mehnert +Status: Draft +Created: 09-Jan-2012 +Post-History: 09-Jan-2012 +============== ============================================= + +Abstract +======== + +The Dylan superclass linearization is sometimes counter-intuitive. The +C3 superclass linearization algorithm is more intuitive. + +Copyright +========= + +This DEP is public domain. + +Specification +============= + +The C3 superclass linearization has been proposed in 1996 by Kim +Barrett, Bob Cassels, Paul Haahr, David A. Moon, Keith Playford, and +P. Tucker Withington in a `paper +`_. + +A superclass linearization (also known as a class precedence list) is +used for resolving conflicts among multiply-inherited superclasses +which provide differing definitions of the same method. + +Unfortunately the algorithm presented in the Dylan Reference Manual +(`computing the class precedence list +`_) is not +consistent with the extended precedence graph, and may lead to +counter-intuitive linearizations. To fix that, C3 was developed. + +Motivation +========== + +In order to allow for more optimizations, especially compression of +dispatch tables, which requires monotonicity of method orderings, a +consistent superclass linearization algorithm is needed. + +C3 has been proposed in 1996 and was subsequently adapted to Python +2.3 (`article `__) +and Perl 6 (`article +`__). + +Rationale +========= + +C3 has been around for long enough, it does not break any existing +code, and it is the right thing to do according to the mailing list +discussions. + +Examples +======== + +The example from the paper is given here, consider the following Dylan classes: + +.. code-block:: dylan + + define class () end; + define class () end; + define class () end; + define class (, ) end; + define class (, ) end; + define class (, ) end; + + +The Dylan linearization is: + , , , , , , + +The C3 linearization is: + , , , , , , + + +Backwards Compatibility +======================= + +In the first release a serious warning will be issued for superclass +linearization which changed, in subsequent releases a warning should +be issued (depending on a strict compatibility to DRM switch). + +Experiments show that there are some differences in existing code; we +found so far three, two of them in duim-gadgets, one in +win32-duim. According to Scott McKay, the author of DUIM, the first +two look better when C3 is used (`mailing list post +`_). The +latter does not alter behaviour (`post +`_). + +The class precedence list of differ, Dylan: + #(, , , , , , , , , , , , , , , , , , ); +C3: + #(, , , , , , , , , , , , , , , , , , ) + + +The class precedence list of differ, Dylan: + #(, , , , , , , , , , , , , , , , , , ); +C3: + #(, , , , , , , , , , , , , , , , , , ) + + +The class precedence list of differ, Dylan: + #(, , , , , , , , , , , , , , , , , , , , , , , , , ); +C3: + #(, , , , , , , , , , , , , , , , , , , , , , , , , ) + + +Reference Implementation +======================== + +A reference implementation is available in the hannesm/c3 branch on +GitHub: `hannesm/c3 `_ + diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index feec658e9c..255c59a84a 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -15,6 +15,7 @@ Open Proposals (under consideration) ==== ============================================= 0001 `DEP Purpose and Guidelines `_ (`source `__) +0003 `C3 superclass linearization `_ (`source `__) ==== ============================================= @@ -38,5 +39,6 @@ All Proposals by Number ==== ============================================= 0001 `DEP Purpose and Guidelines `_ (`source `__) 0002 `define function `_ (`source `__) +0003 `C3 superclass linearization `_ (`source `__) ==== ============================================= From b826a66f86bcd34c451689b28f6b88f13844bec9 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 9 Jan 2012 15:51:27 -0500 Subject: [PATCH 116/519] Adjust to new title convention --- documentation/website/source/proposals/dep-0003.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index 43edc5dcbd..2355736d14 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -1,6 +1,8 @@ +C3 superclass linearization +=========================== + ============== ============================================= DEP #: 3 -Title: C3 superclass linearization Type: Standards Track Author: Hannes Mehnert Status: Draft From 7c8e0737f94332759daa4a814f25a90e55515eb6 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 10 Jan 2012 13:36:23 +0700 Subject: [PATCH 117/519] Add note about stuff that is currently Windows-only. --- documentation/website/source/documentation/index.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index b539e78d92..0ee5d76b86 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -41,7 +41,8 @@ Documentation [`epub `__] [`old HTML `__] - Describes Open Dylan's interactive development environment. + Describes Open Dylan's interactive development environment. This is + only useful if you are using the Open Dylan IDE on Windows. `Building Applications Using DUIM `_ [`pdf `__] @@ -49,7 +50,8 @@ Documentation [`old HTML `__] Describes how to use DUIM (Dylan User Interface Manager), - the portable window programming toolkit. + the portable window programming toolkit. This is only useful + if you are using Open Dylan on Windows. .. raw:: html From 121148b1543b2d3161ae5a141566557f4b71cd32 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 10 Jan 2012 13:36:55 +0700 Subject: [PATCH 118/519] Update to current version of sphinx-extensions. --- documentation/website/sphinx-extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/sphinx-extensions b/documentation/website/sphinx-extensions index cf0d61ae6f..195fed9240 160000 --- a/documentation/website/sphinx-extensions +++ b/documentation/website/sphinx-extensions @@ -1 +1 @@ -Subproject commit cf0d61ae6fd6963d90bec2e43fd60862edca6f19 +Subproject commit 195fed924012eae749cc44c21a5dc7d2fff946c8 From 7eaa2e07d0ce0ed45a4c5af48b8260ac773f3d18 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 10 Jan 2012 13:44:52 +0700 Subject: [PATCH 119/519] Use code-blocks in DEP-0002. --- documentation/website/source/proposals/dep-0002.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/proposals/dep-0002.rst b/documentation/website/source/proposals/dep-0002.rst index 6d55df504c..1821e8f390 100644 --- a/documentation/website/source/proposals/dep-0002.rst +++ b/documentation/website/source/proposals/dep-0002.rst @@ -62,7 +62,9 @@ Rationale says to other programmers that the function is not part of any generic operation; furthermore, the function won't be extended as a generic function, and calling it need not involve any generic - dispatch. The two main choices in current practice are:: + dispatch. The two main choices in current practice are: + + .. code-block:: dylan define constant cube = method (x) x * x * x end; @@ -83,13 +85,17 @@ Rationale Examples ======== - An example use:: + An example use: + + .. code-block:: dylan define function cube (x) x * x * x end; Below is one possible implementation of the macro. This implementation supports whatever adjectives are supported by "define constant". - Other implementations are possible. :: + Other implementations are possible. + + .. code-block:: dylan define macro function-definer { define ?adjectives:* function ?name:name From 9c476a767898359bdb4dc3c2e786f8b8f9d49f1f Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 10 Jan 2012 13:46:29 +0700 Subject: [PATCH 120/519] Correct links to source for DEP-*.rst. --- documentation/website/source/proposals/index.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index 255c59a84a..3ed6211ea7 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -14,8 +14,8 @@ Open Proposals (under consideration) ==================================== ==== ============================================= -0001 `DEP Purpose and Guidelines `_ (`source `__) -0003 `C3 superclass linearization `_ (`source `__) +0001 `DEP Purpose and Guidelines `_ (`source `__) +0003 `C3 superclass linearization `_ (`source `__) ==== ============================================= @@ -23,7 +23,7 @@ Accepted Proposals ================== ==== ============================================= -0002 `define function `_ (`source `__) +0002 `define function `_ (`source `__) ==== ============================================= @@ -37,8 +37,8 @@ All Proposals by Number ======================= ==== ============================================= -0001 `DEP Purpose and Guidelines `_ (`source `__) -0002 `define function `_ (`source `__) -0003 `C3 superclass linearization `_ (`source `__) +0001 `DEP Purpose and Guidelines `_ (`source `__) +0002 `define function `_ (`source `__) +0003 `C3 superclass linearization `_ (`source `__) ==== ============================================= From 716d8a01761ca55fd71a40bbd509a2b4d8a1bc04 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 10 Jan 2012 13:55:47 +0700 Subject: [PATCH 121/519] =?UTF-8?q?Link=20to=201998=20publication=20"Moder?= =?UTF-8?q?n=20languages=20and=20Microsoft=E2=80=99s=20component=20object?= =?UTF-8?q?=20model".?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/_static/documentation/gray1998.bib | 17 +++++++++++++++++ .../source/documentation/publications.rst | 15 +++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 documentation/website/source/_static/documentation/gray1998.bib diff --git a/documentation/website/source/_static/documentation/gray1998.bib b/documentation/website/source/_static/documentation/gray1998.bib new file mode 100644 index 0000000000..86669f43cc --- /dev/null +++ b/documentation/website/source/_static/documentation/gray1998.bib @@ -0,0 +1,17 @@ +@article{Gray:1998:MLM:274946.274957, + author = {Gray, David N. and Hotchkiss, John and LaForge, Seth and Shalit, Andrew and Weinberg, Toby}, + title = {Modern languages and Microsoft's component object model}, + journal = {Commun. ACM}, + volume = {41}, + issue = {5}, + month = {May}, + year = {1998}, + issn = {0001-0782}, + pages = {55--65}, + numpages = {11}, + url = {http://doi.acm.org/10.1145/274946.274957}, + doi = {http://doi.acm.org/10.1145/274946.274957}, + acmid = {274957}, + publisher = {ACM}, + address = {New York, NY, USA}, +} diff --git a/documentation/website/source/documentation/publications.rst b/documentation/website/source/documentation/publications.rst index f6219d41f0..7afd332981 100644 --- a/documentation/website/source/documentation/publications.rst +++ b/documentation/website/source/documentation/publications.rst @@ -109,6 +109,21 @@ detection** syntax, the approach taken to describe and represent that syntax is distinctly Lisp-like in philosophy. +**Modern languages and Microsoft's component object model** +(by David N. Gray, John Hotchkiss, Seth Laforge, Andrew Shalit and +Toby Weinberg - Communications of the ACM May 1998 +`bib <../_static/documentation/gray1998.bib>`__) + + As the computer industry's reliance on component software increases, + it becomes increasingly difficult to integrate complex component + systems. Modern development environments take a variety of approaches + to simplifying this programming problem. This article describes how + three programming language implementations provide access to Microsoft's + Component Object Model (COM), and how they attempt to reduce the + complexity of writing nad using COM objects. + + http://dl.acm.org/citation.cfm?id=274957 + **A Monotonic Superclass Linearization for Dylan** (by Kim Barrett and Bob Cassels and Paul Haahr and David A. Moon and Keith Playford and P. Tucker Withington at OOPSLA 1996 From 4692fe002bd400dfd09c14546e6f383275212048 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Tue, 10 Jan 2012 09:35:41 -0500 Subject: [PATCH 122/519] Add bibtex of Gray's article also to global bibtex file --- .../_static/documentation/publications.bib | 18 ++++++++++++++++++ documentation/website/sphinx-extensions | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/_static/documentation/publications.bib b/documentation/website/source/_static/documentation/publications.bib index a52567fcd9..19c4e8bbc6 100644 --- a/documentation/website/source/_static/documentation/publications.bib +++ b/documentation/website/source/_static/documentation/publications.bib @@ -66,6 +66,24 @@ @techreport{Bachrach:1999 source = {http://people.csail.mit.edu/jrb/Projects/dexprs.pdf}, } +@article{Gray:1998:MLM:274946.274957, + author = {Gray, David N. and Hotchkiss, John and LaForge, Seth and Shalit, Andrew and Weinberg, Toby}, + title = {Modern languages and Microsoft's component object model}, + journal = {Commun. ACM}, + volume = {41}, + issue = {5}, + month = {May}, + year = {1998}, + issn = {0001-0782}, + pages = {55--65}, + numpages = {11}, + url = {http://doi.acm.org/10.1145/274946.274957}, + doi = {http://doi.acm.org/10.1145/274946.274957}, + acmid = {274957}, + publisher = {ACM}, + address = {New York, NY, USA}, +} + @article{Barrett:1996:MSL:236338.236343, author = {Barrett, Kim and Cassels, Bob and Haahr, Paul and Moon, David A. and Playford, Keith and Withington, P. Tucker}, title = {A monotonic superclass linearization for Dylan}, diff --git a/documentation/website/sphinx-extensions b/documentation/website/sphinx-extensions index 195fed9240..cf0d61ae6f 160000 --- a/documentation/website/sphinx-extensions +++ b/documentation/website/sphinx-extensions @@ -1 +1 @@ -Subproject commit 195fed924012eae749cc44c21a5dc7d2fff946c8 +Subproject commit cf0d61ae6fd6963d90bec2e43fd60862edca6f19 From a010bda388dc8ff0540d0f31a519cbe6c5ba7ded Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 10 Jan 2012 14:24:45 -0500 Subject: [PATCH 123/519] Simplify dep index. --- .../website/source/proposals/index.rst | 43 +++++++------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index 3ed6211ea7..82cd86e389 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -5,40 +5,29 @@ Dylan Enhancement Proposals .. contents:: Contents :local: -.. NOTE: When adding a new proposal to this index be sure to add it in - two places: the "All Proposals by Number" section and at least one - other section depending on the proposal's current status. +.. NOTE: Each proposal must be in the "All Proposals by Number" table, + regardless of status. Open proposals must ADDITIONALLY be in the + "Open Proposals" table. +Key to proposal types: -Open Proposals (under consideration) -==================================== - -==== ============================================= -0001 `DEP Purpose and Guidelines `_ (`source `__) -0003 `C3 superclass linearization `_ (`source `__) -==== ============================================= - - -Accepted Proposals -================== + Proc = Process, Std = Standards Track, Info = Informational -==== ============================================= -0002 `define function `_ (`source `__) -==== ============================================= +Open Proposals (under consideration) +==================================== -Declined Proposals -================== - -There are no declined proposals. +==== ==== ========== ============================================= +0001 Proc Draft `DEP Purpose and Guidelines `_ (`source `__) +0003 Std Draft `C3 superclass linearization `_ (`source `__) +==== ==== ========== ============================================= All Proposals by Number ======================= -==== ============================================= -0001 `DEP Purpose and Guidelines `_ (`source `__) -0002 `define function `_ (`source `__) -0003 `C3 superclass linearization `_ (`source `__) -==== ============================================= - +==== ==== ========== ============================================= +0001 Proc Draft `DEP Purpose and Guidelines `_ (`source `__) +0002 Std Final `define function `_ (`source `__) +0003 Std Draft `C3 superclass linearization `_ (`source `__) +==== ==== ========== ============================================= From 7aaa2d244d9b67f88b6827bf9460c29d6a6df4ae Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 10 Jan 2012 14:29:30 -0500 Subject: [PATCH 124/519] Make dep titles like our other titles. --- documentation/website/source/proposals/dep-0001.rst | 3 ++- documentation/website/source/proposals/dep-0002.rst | 3 ++- documentation/website/source/proposals/dep-0003.rst | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 52c871e249..982880dc19 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -1,5 +1,6 @@ +************************** DEP Purpose and Guidelines -========================== +************************** ============== ============================================= DEP #: 1 diff --git a/documentation/website/source/proposals/dep-0002.rst b/documentation/website/source/proposals/dep-0002.rst index 1821e8f390..e910067301 100644 --- a/documentation/website/source/proposals/dep-0002.rst +++ b/documentation/website/source/proposals/dep-0002.rst @@ -1,5 +1,6 @@ +*************** Define Function -=============== +*************** ============== ============================================= DEP #: 2 diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index 2355736d14..db9f3c269e 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -1,5 +1,6 @@ +*************************** C3 superclass linearization -=========================== +*************************** ============== ============================================= DEP #: 3 @@ -10,6 +11,7 @@ Created: 09-Jan-2012 Post-History: 09-Jan-2012 ============== ============================================= + Abstract ======== From bf503fc84f53a157534223e16f60b1737bb33b02 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 10 Jan 2012 14:35:49 -0500 Subject: [PATCH 125/519] Add Last-Modified headers. More natural header order. --- .../website/source/proposals/dep-0001.rst | 17 +++++++++-------- .../website/source/proposals/dep-0002.rst | 1 + .../website/source/proposals/dep-0003.rst | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 982880dc19..5ad85c9780 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -7,7 +7,8 @@ DEP #: 1 Type: Process Author: Carl Gay Status: Draft -Created: 07-Jan-2011 +Created: 07-Jan-2012 +Last-Modified: 10-Jan-2012 Post-History: None ============== ============================================= @@ -240,19 +241,19 @@ DEP Header Preamble Each DEP must begin with a title, followed by an RFC 822 style header preamble in simple RST table format. The headers must appear in the following order. Headers marked with "*" are optional and are -described below. All other headers are required. :: +described below. All other headers are required. All dates must +be in dd-mm-yyyy format:: - DEP: - Version: - Last-Modified: + DEP #: Author: Status: Type: - * Requires: - Created: - * Dylan-Version: + Created: + Last-Modified: Post-History: + * Dylan-Version: + * Requires: * Replaces: * Superseded-By: * Resolution: diff --git a/documentation/website/source/proposals/dep-0002.rst b/documentation/website/source/proposals/dep-0002.rst index e910067301..d4a8bcc101 100644 --- a/documentation/website/source/proposals/dep-0002.rst +++ b/documentation/website/source/proposals/dep-0002.rst @@ -8,6 +8,7 @@ Type: Standards Track Author: Bill Chiles Status: Accepted Created: 26-Jan-1996 +Last-Modified: 26-Jan-1996 Post-History: None ============== ============================================= diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index db9f3c269e..41f5e5cf3f 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -8,6 +8,7 @@ Type: Standards Track Author: Hannes Mehnert Status: Draft Created: 09-Jan-2012 +Last-Modified: 09-Jan-2012 Post-History: 09-Jan-2012 ============== ============================================= From 62bcb79fae5bedc18680c196d76ae7751ae67790 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 10 Jan 2012 23:11:32 -0500 Subject: [PATCH 126/519] Fix typo --- documentation/website/source/news/2011/12/12/dswank.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/news/2011/12/12/dswank.rst b/documentation/website/source/news/2011/12/12/dswank.rst index 7ee83c1c93..82363e2ae9 100644 --- a/documentation/website/source/news/2011/12/12/dswank.rst +++ b/documentation/website/source/news/2011/12/12/dswank.rst @@ -60,5 +60,5 @@ Installation You need the following pieces: - * `dylan-mode `_, and extend your ``~/.emacs`` as documented in README) + * `dylan-mode `_, and extend your ``~/.emacs`` as documented in the README * dswank itself is shipped with the 2011.1 release From c4ceb40c7839686e3e64a154995b033096a88c49 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Wed, 11 Jan 2012 17:10:41 -0500 Subject: [PATCH 127/519] Updated URL to paper, thanks to housel --- documentation/website/source/proposals/dep-0003.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index 41f5e5cf3f..89a2b4da23 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -30,7 +30,8 @@ Specification The C3 superclass linearization has been proposed in 1996 by Kim Barrett, Bob Cassels, Paul Haahr, David A. Moon, Keith Playford, and P. Tucker Withington in a `paper -`_. +`_ (`html version +`_). A superclass linearization (also known as a class precedence list) is used for resolving conflicts among multiply-inherited superclasses From 8595fc64d0a06db823cc919282d50d9462d5f4d5 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Fri, 13 Jan 2012 01:11:04 -0500 Subject: [PATCH 128/519] Checkpoint a few minor changes. --- .../website/source/proposals/dep-0001.rst | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 32aab42918..36dc03824a 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -9,9 +9,12 @@ Author: Carl Gay Status: Draft Created: 07-Jan-2012 Last-Modified: 10-Jan-2012 -Post-History: None +Post-History: 10-Jan-2012 ============== ============================================= +.. changes to be made... + * Language-Change header + * Time period for feedback: 2 weeks? Preamble ======== @@ -25,13 +28,19 @@ the Dylan team to work from. What is a DEP? ============== -DEP stands for Dylan Enhancement Proposal. A DEP is a design -document providing information to the Dylan community, or describing -a new feature for Dylan or its processes or environment. The DEP -should provide a concise technical specification of the feature and a -rationale for the feature. +DEP stands for Dylan Enhancement Proposal. A DEP is a design document +which -We intend DEPs to be the primary mechanisms for proposing new + * provides information to the Dylan community, or + * describes a new feature for the Dylan language or its standard + libraries, or + * describes changes to the processes or environment surrounding + Dylan or its reference implementation, Open Dylan. + +The DEP should provide a concise technical specification of, and +rationale for, the feature or process. + +We intend DEPs to be the primary mechanism for proposing new features, for collecting community input on an issue, and for documenting the design decisions that have gone into Dylan. The DEP author is responsible for building consensus within the community and @@ -48,7 +57,7 @@ DEP Types There are three kinds of DEP: 1. A **Standards Track** DEP describes a new feature or implementation - for Dylan. + for Dylan or its standard libraries. 2. An **Informational** DEP describes a Dylan design issue, or provides general guidelines or information to the Dylan community, @@ -289,7 +298,7 @@ versions of the DEP are posted to the hackers list. Both headers should be in dd-mmm-yyyy format, e.g. 14-Aug-2001. Standards Track DEPs must have a Dylan-Version header which indicates -the version of Dylan that the feature will be released with. +the version of Open Dylan that the feature will be released with. Informational and Process DEPs do not need a Dylan-Version header. DEPs may have a Requires header, indicating the DEP numbers that this From 0699daf230dc87572ddf06c86311566d6af58fac Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 00:21:22 -0500 Subject: [PATCH 129/519] Add feedback time of 2 weeks. Add Affects-DRM header. Various small edits. --- .../website/source/proposals/dep-0001.rst | 213 +++++++++++------- 1 file changed, 136 insertions(+), 77 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 36dc03824a..2ca3210e01 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -3,7 +3,7 @@ DEP Purpose and Guidelines ************************** ============== ============================================= -DEP #: 1 +DEP Number: 1 Type: Process Author: Carl Gay Status: Draft @@ -12,9 +12,9 @@ Last-Modified: 10-Jan-2012 Post-History: 10-Jan-2012 ============== ============================================= -.. changes to be made... - * Language-Change header - * Time period for feedback: 2 weeks? +.. contents:: Contents + :local: + Preamble ======== @@ -81,48 +81,51 @@ There are three kinds of DEP: DEP Work Flow ============= -The DEP process begins with a new idea for Dylan. It is highly -recommended that a single DEP contain a single key proposal or new -idea. Small enhancements or patches often don't need a DEP and can be -injected into the Dylan development work flow with a patch submission -to the issue tracker for the appropriate repository on GitHub. The -more focussed the DEP, the more successful it tends to be. If in -doubt, split your DEP into several well-focussed ones. - -Each DEP must have a champion -- someone who writes the DEP using the -style and format described below, shepherds the discussions in the -appropriate forums, and attempts to build community consensus around -the idea. The DEP champion (a.k.a. Author) should first attempt to -ascertain whether the idea is DEP-able. Posting to -hackers@opendylan.org is the best way to go about this. - -Vetting an idea publicly before going as far as writing a DEP is meant -to save the potential author time. Many ideas have been brought -forward for changing Dylan that have been rejected for various -reasons. Asking the Dylan community first if an idea is original -helps prevent too much time being spent on something that is -guaranteed to be rejected based on prior discussions (searching -the internet does not always do the trick). It also helps to make sure -the idea is applicable to the entire community and not just the author. -Just because an idea sounds good to the author does not -mean it will work for most people in most areas where Dylan is used. - -Once the champion has asked the Dylan community whether an idea has -any chance of acceptance, a properly formatted draft DEP should be -presented to hackers@opendylan.org. The initial DEP status should be -"Draft". The DEP author should assign the next available DEP number -to the DEP by looking at the `DEP directory `_ to find the -highest used number. The DEP number is not assured until the DEP has -been committed to the `origin Git repository +**Have an idea** -- The DEP process begins with a new idea for Dylan. +It is highly recommended that a single DEP contain a **single key +proposal** or new idea. Small enhancements or patches often don't need +a DEP and can be injected into the Dylan development work flow with a +patch submission to the issue tracker for the appropriate repository +on GitHub. The more focussed the DEP, the more successful it tends to +be. If in doubt, split your DEP into several well-focussed ones. + +**Have a champion** -- Each DEP must have a champion -- someone who +writes the DEP using the style and format described below, shepherds +the discussions in the appropriate forums, and attempts to build +community consensus around the idea. The DEP champion (a.k.a. Author) +should first attempt to ascertain whether the idea is DEP-able. +Posting to hackers@opendylan.org is the best way to go about this. + +**Vet the idea publicly** -- Vetting an idea publicly before going as +far as writing a DEP is meant to save the potential author time. Many +ideas have been brought forward for changing Dylan that have been +rejected for various reasons. Asking the Dylan community first if an +idea is original helps prevent too much time being spent on something +that is guaranteed to be rejected based on prior discussions +(searching the internet does not always do the trick). It also helps +to make sure the idea is applicable to the entire community and not +just the author. Just because an idea sounds good to the author does +not mean it will work for most people in most areas where Dylan is +used. + +**Present a draft** -- Once the champion has asked the Dylan community +whether an idea has any chance of acceptance, a properly formatted +draft DEP should be presented to hackers@opendylan.org. The initial +DEP status should be **Draft**. The DEP author should assign the next +available DEP number to the DEP by looking at the `DEP directory +`_ to find the highest used number. The DEP number is not +assured until the DEP has been committed to the `origin Git repository `_. As updates are necessary, the DEP author may commit new versions. -We rely on reaching consensus on the hackers mailing list. Consensus -_must_ be reached for the DEP to be approved. Exactly what -"consensus" means here is left undefined, as we expect most cases to -be obvious and we wish to keep the process informal for now. At such -time as this becomes a problem we may implement a more formal scheme -(e.g., voting). +Wait for at least two weeks to receive feedback on each draft. + +**Reach consensus** -- We rely on reaching consensus on the hackers +mailing list. Consensus _must_ be reached for the DEP to be approved. +Exactly what "consensus" means here is left undefined, as we expect +most cases to be obvious and we wish to keep the process informal for +now. At such time as this becomes a problem we may implement a more +formal scheme (e.g., voting). Standards Track DEPs consist of two parts, a design document and a reference implementation. The DEP should be reviewed and accepted @@ -139,7 +142,7 @@ separate SIG mailing list for the topic, having the DEP author accept private comments in the early design phases, setting up a wiki page, etc. DEP authors should use their discretion here. -For a DEP to be accepted it must meet certain minimum criteria. It +For a DEP to be **Accepted** it must meet certain minimum criteria. It must be a clear and complete description of the proposed enhancement. The enhancement must represent a net improvement. The proposed implementation, if applicable, must be solid and must not unduly add @@ -147,18 +150,18 @@ complication. Once a DEP has been accepted, the reference implementation must be completed. When the reference implementation is complete and accepted -by the community, the status may be changed to "Final". +by the community, the status may be changed to **Final**. -A DEP can also be assigned status "Deferred". The DEP author or +A DEP can also be assigned status **Deferred**. The DEP author or editor can assign the DEP this status when no progress is being made on the DEP. Once a DEP is deferred, the DEP editor can re-assign it to draft status. -A DEP can also be "Rejected". Perhaps after all is said and done it +A DEP can also be **Rejected**. Perhaps after all is said and done it was not a good idea. It is still important to have a record of this fact. -DEPs can also be superseded by a different DEP, rendering the original +DEPs can also be **superseded by** a different DEP, rendering the original obsolete. This is intended for Informational DEPs, where version 2 of an API can replace version 1. @@ -166,8 +169,9 @@ The possible paths of the status of DEPs are as follows: .. image:: ../_static/dep-0001-states.png -Some Informational and Process DEPs may also have a status of "Active" -if they are never meant to be completed. E.g. DEP 1 (this DEP). +Some Informational and Process DEPs may also have a status of +**Active** if they are never meant to be completed. E.g. DEP 1 (this +DEP). What belongs in a successful DEP? @@ -175,30 +179,37 @@ What belongs in a successful DEP? Each DEP should have the following parts: -1. Preamble -- RFC 822 style headers containing meta-data about the +1. Title + +#. Preamble -- RFC 822 style headers containing meta-data about the DEP, including the DEP number, a short descriptive title (limited to a maximum of 44 characters), the names, and optionally the contact info for each author, etc. -2. Abstract -- a short (~200 word) description of the technical issue +#. Table of contents:: + + .. contents: Contents + :local: + +#. Abstract -- a short (~200 word) description of the technical issue being addressed. -3. Copyright/public domain -- Each DEP must either be explicitly +#. Copyright/public domain -- Each DEP must either be explicitly labelled as placed in the public domain (see this DEP as an example) or licensed under the `Open Publication License`_. -4. Specification -- The technical specification should describe the - syntax and semantics of any new language feature. The +#. Specification -- The technical specification should describe the + syntax and semantics of any new language or library feature. The specification should be detailed enough to allow competing, - interoperable implementations for any of the current Dylan - platforms. + interoperable Dylan implementations. If the DEP proposes changes + to the language itself it *must* clearly indicate all such changes. -5. Motivation -- The motivation is critical for DEPs that want to +#. Motivation -- The motivation is critical for DEPs that want to change the Dylan language. It should clearly explain why the existing language specification is inadequate to address the problem that the DEP solves. -6. Rationale -- The rationale fleshes out the specification by +#. Rationale -- The rationale fleshes out the specification by describing what motivated the design and why particular design decisions were made. It should describe alternate designs that were considered and related work, e.g. how the feature is supported @@ -208,12 +219,12 @@ Each DEP should have the following parts: community and discuss important objections or concerns raised during discussion. -7. Backwards Compatibility -- All DEPs that introduce backwards +#. Backwards Compatibility -- All DEPs that introduce backwards incompatibilities must include a section describing these incompatibilities and their severity. The DEP must explain how the author proposes to deal with these incompatibilities. -8. Reference Implementation -- The reference implementation must be +#. Reference Implementation -- The reference implementation must be completed before any DEP is given status "Final", but it need not be completed before the DEP is accepted. It is better to finish the specification and rationale first and reach consensus on it @@ -251,21 +262,34 @@ Each DEP must begin with a title, followed by an RFC 822 style header preamble in simple RST table format. The headers must appear in the following order. Headers marked with "*" are optional and are described below. All other headers are required. All dates must -be in dd-mm-yyyy format:: +be in dd-mm-yyyy format. :: - DEP #: + DEP-Number: Author: Status: Type: + Affects-DRM: Yes/No Created: Last-Modified: Post-History: - * Dylan-Version: + Resolution: [required for Standards Track DEPs only] + * Target-Version: * Requires: * Replaces: * Superseded-By: - * Resolution: + +DEP Number +~~~~~~~~~~ + +Authors may assign DEP numbers themselves by looking at the last +number in the `numerical list of DEPs +`_ and incrementing it by +one. To prevent collisions, the author should set the ``DEP-Number`` +header to "Unassigned" until just before the DEP is committed to git. + +Author +~~~~~~ The Author header lists the names, and optionally the email addresses of all the authors/owners of the DEP. The format of the Author header @@ -285,26 +309,60 @@ following RFC 2822 continuation line conventions. .. Not yet: Note that personal email addresses in DEPs will be obscured as a defense against spam harvesters. -*Note: The Resolution header is required for Standards Track DEPs -only. It contains a URL that should point to an email message or -other web resource where the pronouncement about the DEP is made.* +Status +~~~~~~ + +See `DEP Work Flow`_ for a description of this field. + +Type +~~~~ The Type header specifies the type of DEP: Standards Track, Informational, or Process. +Affects-DRM +~~~~~~~~~~~ + +This field is only required for Standards Track DEPs. The value +should be **Yes** if the DEP proposes a change to the Dylan language +definition, and otherwise **No**. The language definition is composed +of the Dylan Reference Manual plus any **Accepted** DEPs for which +this field is **Yes**. If this field is set to **Yes** then the DEP +*must* clearly list exactly how it affects the language definition. + +Created +~~~~~~~ + The Created header records the date that the DEP was assigned a number, while Post-History is used to record the dates of when new -versions of the DEP are posted to the hackers list. Both -headers should be in dd-mmm-yyyy format, e.g. 14-Aug-2001. +versions of the DEP are posted to the hackers list. Both headers +should be in dd-mmm-yyyy format, e.g. 14-Aug-2001. + +Resolution +~~~~~~~~~~ -Standards Track DEPs must have a Dylan-Version header which indicates -the version of Open Dylan that the feature will be released with. -Informational and Process DEPs do not need a Dylan-Version header. +The Resolution header is required for Standards Track DEPs only. It +contains a URL that should point to an email message or other web +resource where the pronouncement about the DEP is made. + +Target-Version +~~~~~~~~~~~~~~ + +Standards Track DEPs must have a Target-Version header which indicates +the version of Open Dylan in which the feature is expected to be +released. Informational and Process DEPs do not need a Target-Version +header. + +Requires +~~~~~~~~ DEPs may have a Requires header, indicating the DEP numbers that this DEP depends on. -DEPs may also have a Superseded-By header indicating that a DEP has +Superseded-By and Replaces +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +DEPs may also have a Superseded-By header indicating that they have been rendered obsolete by a later document; the value is the number of the DEP that replaces the current document. The newer DEP must have a Replaces header containing the number of the DEP that it rendered @@ -315,9 +373,10 @@ Auxiliary Files =============== DEPs may include auxiliary files such as diagrams. Such files must be -named ``dep-XXXX-aaaa.ext``, where "XXXX" is the DEP number, "aaaa" is -arbitrary text to indicate the file content (e.g., "state-diagram"), -and "ext" is replaced by the actual file extension (e.g. "png"). +named ``dep-XXXX-aaaa.ext``, where "XXXX" is the DEP number (padded +with leading zeros), "aaaa" is arbitrary text to indicate the file +content (e.g., "state-diagram"), and "ext" is replaced by the actual +file extension (e.g. "png"). Reporting DEP Bugs, or Submitting DEP Updates From eba2bb1c599a10c4bc12014a2c36df4741963768 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 00:23:45 -0500 Subject: [PATCH 130/519] Update Last-Modified --- documentation/website/source/proposals/dep-0001.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 2ca3210e01..07b0eb9056 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -8,7 +8,7 @@ Type: Process Author: Carl Gay Status: Draft Created: 07-Jan-2012 -Last-Modified: 10-Jan-2012 +Last-Modified: 16-Jan-2012 Post-History: 10-Jan-2012 ============== ============================================= From 4e2e52ed5e1b3603c118e755a99d3edce69c1646 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 16:12:38 -0500 Subject: [PATCH 131/519] 2 weeks -> 10 days. Compromise? Add terminology section. Add missed header sections. --- .../website/source/proposals/dep-0001.rst | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 07b0eb9056..5da2b9b2ad 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -25,6 +25,28 @@ author would like to thank them for providing an excellent base for the Dylan team to work from. +Terminology +=========== + +Dylan Reference Manual (DRM) + The manual written by Andrew Shallit, plus its errata. + +Dylan language specification + The DRM *plus* any **Accepted** DEPs that modify the Dylan + language specification. + +Open Dylan (OD) + The reference implementation of the Dylan language specification. + +Standard libraries + The set of libraries that are officially maintained alongside Open + Dylan. They are officially maintained in follow sense: + + * Commits are reviewed for bugs and style. + * They are tested prior to each OD release. + * They are packaged with each OD release. + + What is a DEP? ============== @@ -35,7 +57,7 @@ which * describes a new feature for the Dylan language or its standard libraries, or * describes changes to the processes or environment surrounding - Dylan or its reference implementation, Open Dylan. + the Dylan language or Open Dylan. The DEP should provide a concise technical specification of, and rationale for, the feature or process. @@ -118,7 +140,7 @@ assured until the DEP has been committed to the `origin Git repository `_. As updates are necessary, the DEP author may commit new versions. -Wait for at least two weeks to receive feedback on each draft. +Wait for at least ten days to receive feedback on each draft. **Reach consensus** -- We rely on reaching consensus on the hackers mailing list. Consensus _must_ be reached for the DEP to be approved. @@ -334,9 +356,21 @@ Created ~~~~~~~ The Created header records the date that the DEP was assigned a -number, while Post-History is used to record the dates of when new -versions of the DEP are posted to the hackers list. Both headers -should be in dd-mmm-yyyy format, e.g. 14-Aug-2001. +number. It should be in dd-mmm-yyyy format. + +Last-Modified +~~~~~~~~~~~~~ + +The Last-Modified header is included because it may be useful to those +reading DEPs without access to git. It should be updated when +substantive changes are made to the DEP. It need not be updated when +fixing typos, changed URLs, etc. It must be in dd-mmm-yyyy format. + +Post-History +~~~~~~~~~~~~ + +This field should list the dates when DEP drafts were posted to the +hackers mailing list, in dd-mmm-yyyy format. Resolution ~~~~~~~~~~ From 5531ad58c1f18f71e024900aaa6c6e65a261977d Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 18:01:47 -0500 Subject: [PATCH 132/519] typo --- documentation/website/source/proposals/dep-0001.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 5da2b9b2ad..4e735f1fa7 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -40,7 +40,7 @@ Open Dylan (OD) Standard libraries The set of libraries that are officially maintained alongside Open - Dylan. They are officially maintained in follow sense: + Dylan. They are officially maintained in the following sense: * Commits are reviewed for bugs and style. * They are tested prior to each OD release. From 63579027b3db4a9eae9f12eff674a6106bf97547 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 18:32:48 -0500 Subject: [PATCH 133/519] Reference the PEP-01 --- documentation/website/source/proposals/dep-0001.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 4e735f1fa7..6972960d8f 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -19,7 +19,8 @@ Post-History: 10-Jan-2012 Preamble ======== -This document is based heavily on Python PEP 1, "PEP Purpose and +This document is based heavily on Python `PEP 1 +`_, "PEP Purpose and Guidelines", by Barry Warsaw, Jeremy Hylton, and David Goodger. The author would like to thank them for providing an excellent base for the Dylan team to work from. From e0d2eb5b8c87a5267cb388c343cfbcde55791f0b Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 18:33:59 -0500 Subject: [PATCH 134/519] Fix typos --- documentation/website/source/proposals/dep-0001.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 6972960d8f..235704960a 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -30,7 +30,7 @@ Terminology =========== Dylan Reference Manual (DRM) - The manual written by Andrew Shallit, plus its errata. + The manual written by Andrew Shalit, plus its errata. Dylan language specification The DRM *plus* any **Accepted** DEPs that modify the Dylan @@ -161,7 +161,7 @@ DEP authors are responsible for collecting community feedback on a DEP before submitting it for review. However, wherever possible, long open-ended discussions on public mailing lists should be avoided. Strategies to keep the discussions efficient include: setting up a -separate SIG mailing list for the topic, having the DEP author accept +separate mailing list for the topic, having the DEP author accept private comments in the early design phases, setting up a wiki page, etc. DEP authors should use their discretion here. From 82c2e12d3ae2d21e77f55d2bdaa0497f7a1593ea Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 18:34:18 -0500 Subject: [PATCH 135/519] Clarify semantics --- documentation/website/source/proposals/dep-0001.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 235704960a..62bab1f538 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -33,7 +33,7 @@ Dylan Reference Manual (DRM) The manual written by Andrew Shalit, plus its errata. Dylan language specification - The DRM *plus* any **Accepted** DEPs that modify the Dylan + The DRM *plus* all **Accepted** DEPs that modify the Dylan language specification. Open Dylan (OD) From c7006efb680527f44ad1b86900c37789bf1b4166 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 18:34:44 -0500 Subject: [PATCH 136/519] Require a pull request rather than a patch --- documentation/website/source/proposals/dep-0001.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 62bab1f538..174dc112a0 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -108,9 +108,9 @@ DEP Work Flow It is highly recommended that a single DEP contain a **single key proposal** or new idea. Small enhancements or patches often don't need a DEP and can be injected into the Dylan development work flow with a -patch submission to the issue tracker for the appropriate repository -on GitHub. The more focussed the DEP, the more successful it tends to -be. If in doubt, split your DEP into several well-focussed ones. +pull request to the issue tracker for the appropriate repository on +GitHub. The more focussed the DEP, the more successful it tends to be. +If in doubt, split your DEP into several well-focussed ones. **Have a champion** -- Each DEP must have a champion -- someone who writes the DEP using the style and format described below, shepherds From 76c45d4450efb28c12e89fcf15aec61911386546 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 18:35:17 -0500 Subject: [PATCH 137/519] champion -> author --- documentation/website/source/proposals/dep-0001.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 174dc112a0..b1849912be 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -112,12 +112,12 @@ pull request to the issue tracker for the appropriate repository on GitHub. The more focussed the DEP, the more successful it tends to be. If in doubt, split your DEP into several well-focussed ones. -**Have a champion** -- Each DEP must have a champion -- someone who +**Have an author** -- Each DEP must have an author -- someone who writes the DEP using the style and format described below, shepherds the discussions in the appropriate forums, and attempts to build -community consensus around the idea. The DEP champion (a.k.a. Author) -should first attempt to ascertain whether the idea is DEP-able. -Posting to hackers@opendylan.org is the best way to go about this. +community consensus around the idea. The DEP author should first +attempt to ascertain whether the idea is DEP-able. Posting to +hackers@opendylan.org is the best way to go about this. **Vet the idea publicly** -- Vetting an idea publicly before going as far as writing a DEP is meant to save the potential author time. Many @@ -131,7 +131,7 @@ just the author. Just because an idea sounds good to the author does not mean it will work for most people in most areas where Dylan is used. -**Present a draft** -- Once the champion has asked the Dylan community +**Present a draft** -- Once the author has asked the Dylan community whether an idea has any chance of acceptance, a properly formatted draft DEP should be presented to hackers@opendylan.org. The initial DEP status should be **Draft**. The DEP author should assign the next From 0bd87ecb4ec1b29b398e564ea25ab0c82708436c Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 18:35:54 -0500 Subject: [PATCH 138/519] Link to hackers@ and http://opendylan.org --- .../website/source/proposals/dep-0001.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index b1849912be..a643ee96d5 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -143,12 +143,12 @@ As updates are necessary, the DEP author may commit new versions. Wait for at least ten days to receive feedback on each draft. -**Reach consensus** -- We rely on reaching consensus on the hackers -mailing list. Consensus _must_ be reached for the DEP to be approved. -Exactly what "consensus" means here is left undefined, as we expect -most cases to be obvious and we wish to keep the process informal for -now. At such time as this becomes a problem we may implement a more -formal scheme (e.g., voting). +**Reach consensus** -- We rely on reaching consensus on the +hackers@opendylan.org mailing list. Consensus _must_ be reached for +the DEP to be approved. Exactly what "consensus" means here is left +undefined, as we expect most cases to be obvious and we wish to keep +the process informal for now. At such time as this becomes a problem +we may implement a more formal scheme (e.g., voting). Standards Track DEPs consist of two parts, a design document and a reference implementation. The DEP should be reviewed and accepted @@ -464,8 +464,8 @@ Once the DEP is ready for the repository, the DEP author will: Commit your changes, push them to your fork of the repository and submit a pull request. -* Monitor opendylan.org to make sure the DEP gets added to the site - properly. +* Monitor `opendylan.org `_ to make sure the DEP + gets added to the site properly. Resources: From 9e882e02c0a05ce3b010e039f9fdd97600bac0dd Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 18:36:46 -0500 Subject: [PATCH 139/519] Remove superfluous comment on date (already 'must be in dd-mm-yyyy format') --- documentation/website/source/proposals/dep-0001.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index a643ee96d5..9962f2731a 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -357,7 +357,7 @@ Created ~~~~~~~ The Created header records the date that the DEP was assigned a -number. It should be in dd-mmm-yyyy format. +number. Last-Modified ~~~~~~~~~~~~~ @@ -365,13 +365,13 @@ Last-Modified The Last-Modified header is included because it may be useful to those reading DEPs without access to git. It should be updated when substantive changes are made to the DEP. It need not be updated when -fixing typos, changed URLs, etc. It must be in dd-mmm-yyyy format. +fixing typos, changed URLs, etc. Post-History ~~~~~~~~~~~~ This field should list the dates when DEP drafts were posted to the -hackers mailing list, in dd-mmm-yyyy format. +hackers mailing list. Resolution ~~~~~~~~~~ From 72c59284870651360aee7ca0c54d404f50cab785 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 18:37:10 -0500 Subject: [PATCH 140/519] Clarify Target-Version header --- documentation/website/source/proposals/dep-0001.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 9962f2731a..780382a74c 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -384,9 +384,8 @@ Target-Version ~~~~~~~~~~~~~~ Standards Track DEPs must have a Target-Version header which indicates -the version of Open Dylan in which the feature is expected to be -released. Informational and Process DEPs do not need a Target-Version -header. +the version of Open Dylan in which the feature will be released. +Informational and Process DEPs do not need a Target-Version header. Requires ~~~~~~~~ From d35d3aa03bbc72902444533212d4fca1c34bb3c0 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 19:05:44 -0500 Subject: [PATCH 141/519] focussed -> focused (boy does that look like /fo-kyuzed/ to me) --- documentation/website/source/proposals/dep-0001.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 780382a74c..37da1631fb 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -109,8 +109,8 @@ It is highly recommended that a single DEP contain a **single key proposal** or new idea. Small enhancements or patches often don't need a DEP and can be injected into the Dylan development work flow with a pull request to the issue tracker for the appropriate repository on -GitHub. The more focussed the DEP, the more successful it tends to be. -If in doubt, split your DEP into several well-focussed ones. +GitHub. The more focused the DEP, the more successful it tends to be. +If in doubt, split your DEP into several well-focused ones. **Have an author** -- Each DEP must have an author -- someone who writes the DEP using the style and format described below, shepherds From 378d36e2c181b12291b95930f757589cbf254680 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 19:12:41 -0500 Subject: [PATCH 142/519] capitalize "superseded by" --- documentation/website/source/proposals/dep-0001.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 37da1631fb..e83ff1094f 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -184,7 +184,7 @@ A DEP can also be **Rejected**. Perhaps after all is said and done it was not a good idea. It is still important to have a record of this fact. -DEPs can also be **superseded by** a different DEP, rendering the original +DEPs can also be **Superseded-By** a different DEP, rendering the original obsolete. This is intended for Informational DEPs, where version 2 of an API can replace version 1. From 2df81a30a01b8344788b522939593d5146e38693 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 19:14:56 -0500 Subject: [PATCH 143/519] More precision in the headers --- .../website/source/proposals/dep-0001.rst | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index e83ff1094f..08733668c9 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -284,22 +284,23 @@ DEP Header Preamble Each DEP must begin with a title, followed by an RFC 822 style header preamble in simple RST table format. The headers must appear in the following order. Headers marked with "*" are optional and are -described below. All other headers are required. All dates must -be in dd-mm-yyyy format. :: +described below. All other headers are required. All dates must be +in dd-mm-yyyy format. A list of values must use a comma as +separator. :: DEP-Number: - Author: + Author: Status: Type: - Affects-DRM: Yes/No + Affects-DRM: Created: Last-Modified: - Post-History: - Resolution: [required for Standards Track DEPs only] + Post-History: + * Resolution: * Target-Version: - * Requires: - * Replaces: + * Requires: + * Replaces: * Superseded-By: DEP Number From c90d78ffee022e4bc6ce25722c905a3b05d1fe53 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 16 Jan 2012 19:46:48 -0500 Subject: [PATCH 144/519] Don't use abbreviations here. Link to history. --- .../website/source/proposals/index.rst | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index 82cd86e389..f09daad7ba 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -9,25 +9,31 @@ Dylan Enhancement Proposals regardless of status. Open proposals must ADDITIONALLY be in the "Open Proposals" table. -Key to proposal types: +Introduction +============ + +This is the index of all Dylan Enhancement Proposals, known as DEPs. A +DEP number is never changed. The historical record of the DEP texts +is in the `GitHub website repository +`_ +. - Proc = Process, Std = Standards Track, Info = Informational Open Proposals (under consideration) ==================================== -==== ==== ========== ============================================= -0001 Proc Draft `DEP Purpose and Guidelines `_ (`source `__) -0003 Std Draft `C3 superclass linearization `_ (`source `__) -==== ==== ========== ============================================= +==== ======== ========== ============================================= +1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) +3 Standard Draft `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) +==== ======== ========== ============================================= All Proposals by Number ======================= -==== ==== ========== ============================================= -0001 Proc Draft `DEP Purpose and Guidelines `_ (`source `__) -0002 Std Final `define function `_ (`source `__) -0003 Std Draft `C3 superclass linearization `_ (`source `__) -==== ==== ========== ============================================= +==== ======== ========== ============================================= +1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) +2 Standard Final `define function `_ (`source <../_sources/proposals/dep-0002.txt>`__) +3 Standard Draft `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) +==== ======== ========== ============================================= From fa8d5f908feb4366e96a229b159ed40247050d27 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 20:14:40 -0500 Subject: [PATCH 145/519] Update Post-History header and Post-History description. Add date example. --- documentation/website/source/proposals/dep-0001.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/website/source/proposals/dep-0001.rst b/documentation/website/source/proposals/dep-0001.rst index 08733668c9..f20ffe06d9 100644 --- a/documentation/website/source/proposals/dep-0001.rst +++ b/documentation/website/source/proposals/dep-0001.rst @@ -9,7 +9,7 @@ Author: Carl Gay Status: Draft Created: 07-Jan-2012 Last-Modified: 16-Jan-2012 -Post-History: 10-Jan-2012 +Post-History: 16-Jan-2012, 10-Jan-2012 ============== ============================================= .. contents:: Contents @@ -285,8 +285,8 @@ Each DEP must begin with a title, followed by an RFC 822 style header preamble in simple RST table format. The headers must appear in the following order. Headers marked with "*" are optional and are described below. All other headers are required. All dates must be -in dd-mm-yyyy format. A list of values must use a comma as -separator. :: +in dd-mm-yyyy format (e.g., 14-Jan-2012). A list of values must use a +comma as separator. :: DEP-Number: Author: @@ -372,7 +372,7 @@ Post-History ~~~~~~~~~~~~ This field should list the dates when DEP drafts were posted to the -hackers mailing list. +hackers mailing list. List the dates from newest to oldest. Resolution ~~~~~~~~~~ From 99dac248321a382c940421cf6c9244b52d922413 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 22:08:40 -0500 Subject: [PATCH 146/519] Add "Affects-DRM: Yes" --- documentation/website/source/proposals/dep-0002.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/website/source/proposals/dep-0002.rst b/documentation/website/source/proposals/dep-0002.rst index d4a8bcc101..822f103451 100644 --- a/documentation/website/source/proposals/dep-0002.rst +++ b/documentation/website/source/proposals/dep-0002.rst @@ -5,6 +5,7 @@ Define Function ============== ============================================= DEP #: 2 Type: Standards Track +Affects-DRM: Yes Author: Bill Chiles Status: Accepted Created: 26-Jan-1996 From 745aa09b406fe0308b4d4c3e4a0fdf11cea65500 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 22:10:25 -0500 Subject: [PATCH 147/519] Add "Affects-DRM: Yes" --- documentation/website/source/proposals/dep-0003.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index 89a2b4da23..075ce60cb1 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -5,6 +5,7 @@ C3 superclass linearization ============== ============================================= DEP #: 3 Type: Standards Track +Affects-DRM: Yes Author: Hannes Mehnert Status: Draft Created: 09-Jan-2012 From bf5dd1a89115a3454c5982d94c82bc53cdbdae24 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 16 Jan 2012 22:11:24 -0500 Subject: [PATCH 148/519] Leave room for "Informational" in the type column. --- .../website/source/proposals/index.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index f09daad7ba..cd56e6ade8 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -23,17 +23,17 @@ is in the `GitHub website repository Open Proposals (under consideration) ==================================== -==== ======== ========== ============================================= -1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) -3 Standard Draft `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) -==== ======== ========== ============================================= +==== ============= ========== ============================================= +1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) +3 Standard Draft `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) +==== ============= ========== ============================================= All Proposals by Number ======================= -==== ======== ========== ============================================= -1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) -2 Standard Final `define function `_ (`source <../_sources/proposals/dep-0002.txt>`__) -3 Standard Draft `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) -==== ======== ========== ============================================= +==== ============= ========== ============================================= +1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) +2 Standard Final `define function `_ (`source <../_sources/proposals/dep-0002.txt>`__) +3 Standard Draft `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) +==== ============= ========== ============================================= From 2475bcf9cec092907d37ccf4de5ab1ab59eaab0e Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 20 Jan 2012 19:31:37 -0500 Subject: [PATCH 149/519] Rename package to project - in the source both is supported --- documentation/website/source/news/2011/12/12/dswank.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/news/2011/12/12/dswank.rst b/documentation/website/source/news/2011/12/12/dswank.rst index 82363e2ae9..b8d899a137 100644 --- a/documentation/website/source/news/2011/12/12/dswank.rst +++ b/documentation/website/source/news/2011/12/12/dswank.rst @@ -33,7 +33,7 @@ subclass hierarchy. +===================+==========================================+ |M-x dime |start dime | +-------------------+------------------------------------------+ -| , change-package | select project (in the repl buffer) | +| , change-project | select project (in the repl buffer) | +-------------------+------------------------------------------+ | M-. | jump to definition | +-------------------+------------------------------------------+ From 7bd088e25bc366b27288ace7bbb28e35549e7b28 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sun, 22 Jan 2012 09:57:47 +0700 Subject: [PATCH 150/519] Some minor improvements to the C3 DEP. --- .../website/source/proposals/dep-0003.rst | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index 075ce60cb1..b3ff74d43e 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -18,7 +18,8 @@ Abstract ======== The Dylan superclass linearization is sometimes counter-intuitive. The -C3 superclass linearization algorithm is more intuitive. +C3 superclass linearization algorithm is more intuitive and allows for +greater optimization. Copyright ========= @@ -32,7 +33,7 @@ The C3 superclass linearization has been proposed in 1996 by Kim Barrett, Bob Cassels, Paul Haahr, David A. Moon, Keith Playford, and P. Tucker Withington in a `paper `_ (`html version -`_). +`_). A superclass linearization (also known as a class precedence list) is used for resolving conflicts among multiply-inherited superclasses @@ -42,7 +43,8 @@ Unfortunately the algorithm presented in the Dylan Reference Manual (`computing the class precedence list `_) is not consistent with the extended precedence graph, and may lead to -counter-intuitive linearizations. To fix that, C3 was developed. +counter-intuitive linearizations. To fix that, the C3 linearization +was developed. Motivation ========== @@ -51,17 +53,17 @@ In order to allow for more optimizations, especially compression of dispatch tables, which requires monotonicity of method orderings, a consistent superclass linearization algorithm is needed. -C3 has been proposed in 1996 and was subsequently adapted to Python -2.3 (`article `__) +After the C3 linearization was proposed in 1996, it was subsequently +adapted in Python 2.3 (`article `__) and Perl 6 (`article `__). Rationale ========= -C3 has been around for long enough, it does not break any existing -code, and it is the right thing to do according to the mailing list -discussions. +The C3 linearization has been around for a long time, does not break +any existing code, and is commonly agreed upon as being the right thing +to do (in mailing list discussions). Examples ======== @@ -79,11 +81,21 @@ The example from the paper is given here, consider the following Dylan classes: The Dylan linearization is: + +.. code-block:: dylan + , , , , , , The C3 linearization is: + +.. code-block:: dylan + , , , , , , +The difference in the ordering of ```` and +```` and having that match the ordering of +```` and ```` is clearly +more intuitive and consistent. Backwards Compatibility ======================= From 5c2ad39a842ac5b7a3fd2e286ddfa3413d9bcbbd Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 20 Jan 2012 20:50:24 -0500 Subject: [PATCH 151/519] Add news item for C3 --- .../website/source/news/2012/01/21/c3.rst | 20 +++++++++++++++++++ .../website/source/news/recent.rst.inc | 11 +++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 documentation/website/source/news/2012/01/21/c3.rst diff --git a/documentation/website/source/news/2012/01/21/c3.rst b/documentation/website/source/news/2012/01/21/c3.rst new file mode 100644 index 0000000000..d2d5aca3ca --- /dev/null +++ b/documentation/website/source/news/2012/01/21/c3.rst @@ -0,0 +1,20 @@ +:Author: Hannes Mehnert +:Date: 2012-01-21 00:00:00 + +C3 linearization +================ + +We implemented the C3 superclass linearization algorithm in the Open +Dylan compiler. This is more intuitive in some corner cases, and +allows further performance improvements, especially compression of +dispatch tables. It has been merged into the `opendylan GitHub +repository `_ and will be +the default in the next release (2012.1). A serious warning will be +issued if the new C3 linearization is different from the old +`linearization specified in the DRM +`_. + +Further information is available in the accepted Dylan enhancement +proposal `here `_ and in the original `paper +`_ (`doi +`_). diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index fb1b5ba5b8..28f2045679 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,5 +1,14 @@ -**Dswank - emacs and SLIME** +**C3 superclass linearization** +*2012-01-21* + +We implemented the C3 superclass linearization algorithm and +enabled it by default. This is more intuitive and will allow for +further performance improvements. + +:doc:`Read more... ` + +**Dswank - emacs and DIME** *2011-12-12* We developed DIME, the Dylan interaction mode for emacs, based From 93ca9ebbe01d6749a3cb1b1e26424307c4a4cbd3 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sat, 21 Jan 2012 23:24:37 -0500 Subject: [PATCH 152/519] Reflect C3 being final --- .../website/source/proposals/dep-0003.rst | 21 ++++++++++--------- .../website/source/proposals/index.rst | 3 +-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index 075ce60cb1..cc8aa6268f 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -2,16 +2,17 @@ C3 superclass linearization *************************** -============== ============================================= -DEP #: 3 -Type: Standards Track -Affects-DRM: Yes -Author: Hannes Mehnert -Status: Draft -Created: 09-Jan-2012 -Last-Modified: 09-Jan-2012 -Post-History: 09-Jan-2012 -============== ============================================= +=============== ============================================= +DEP-Number: 3 +Type: Standards Track +Affects-DRM: Yes +Author: Hannes Mehnert +Status: Accepted +Created: 09-Jan-2012 +Last-Modified: 09-Jan-2012 +Post-History: 09-Jan-2012 +Target-Version: 2012.1 +=============== ============================================= Abstract diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index cd56e6ade8..d417869fa6 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -25,7 +25,6 @@ Open Proposals (under consideration) ==== ============= ========== ============================================= 1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) -3 Standard Draft `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) ==== ============= ========== ============================================= @@ -35,5 +34,5 @@ All Proposals by Number ==== ============= ========== ============================================= 1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) 2 Standard Final `define function `_ (`source <../_sources/proposals/dep-0002.txt>`__) -3 Standard Draft `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) +3 Standard Final `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) ==== ============= ========== ============================================= From 4ccddb6347b457790ddfd3ee99d3ddf25b172018 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 25 Jan 2012 06:59:14 +0700 Subject: [PATCH 153/519] Point to the library-reference instead of the old docs. --- .../website/source/documentation/index.rst | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index 0ee5d76b86..ed13be3bd6 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -113,25 +113,19 @@ Documentation The official definition of the Dylan language and standard library. -`Core library reference `_ -[`pdf `__] -[`epub `__] -[`old HTML `__] +`Dylan Library Reference `_ +[`pdf `__] +[`epub `__] Describes the Open Dylan implementation of the Dylan language, a core set of Dylan libraries, and a library interchange mechanism. The core libraries provide many language extensions, a threads - interface, and object finalization. - -`System and I/O library reference `_ -[`pdf `__] -[`epub `__] -[`old HTML `__] - - Describes Open Dylan's printing and output formatting modules, + interface, and object finalization, printing and output formatting modules, a streams module, a sockets module, and modules providing an interface to operating system features such as the file system, - time and date information, and the host machine environment. + time and date information, the host machine environment, as well + as a foreign function interface and some low-level access to the + Microsoft Win32 API. `DUIM library reference `_ @@ -140,15 +134,6 @@ Documentation the portable window programming toolkit. It complements Building Applications Using DUIM. -`C FFI and Win32 library reference `_ -[`pdf `__] -[`epub `__] -[`old HTML `__] - - Describes a foreign function interface library for interoperation - with C programs, and several libraries providing a low-level interface - to the Microsoft Win32 API. - .. raw:: html
From 3aa9dd3213384ede176ae5ee49f272a485b884ad Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Wed, 25 Jan 2012 00:04:21 -0500 Subject: [PATCH 154/519] Update date to reflect reality --- documentation/website/source/news/2012/01/{21 => 25}/c3.rst | 2 +- documentation/website/source/news/recent.rst.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename documentation/website/source/news/2012/01/{21 => 25}/c3.rst (96%) diff --git a/documentation/website/source/news/2012/01/21/c3.rst b/documentation/website/source/news/2012/01/25/c3.rst similarity index 96% rename from documentation/website/source/news/2012/01/21/c3.rst rename to documentation/website/source/news/2012/01/25/c3.rst index d2d5aca3ca..c8bb23c5b4 100644 --- a/documentation/website/source/news/2012/01/21/c3.rst +++ b/documentation/website/source/news/2012/01/25/c3.rst @@ -1,5 +1,5 @@ :Author: Hannes Mehnert -:Date: 2012-01-21 00:00:00 +:Date: 2012-01-25 00:00:00 C3 linearization ================ diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index 28f2045679..bdf9fa4845 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,6 +1,6 @@ **C3 superclass linearization** -*2012-01-21* +*2012-01-25* We implemented the C3 superclass linearization algorithm and enabled it by default. This is more intuitive and will allow for From 9a02ab5a8f4f09bd837c0a968efdbff7d277405f Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Wed, 25 Jan 2012 00:10:34 -0500 Subject: [PATCH 155/519] Update link to implementation --- documentation/website/source/proposals/dep-0003.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index a4f54d806d..0e487cb715 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -134,6 +134,7 @@ C3: Reference Implementation ======================== -A reference implementation is available in the hannesm/c3 branch on -GitHub: `hannesm/c3 `_ +The `pull request #168 +`_ +was finally merged into master. From aa97382348744626f70c3c42a1f12abd88bf5d42 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Wed, 25 Jan 2012 00:17:28 -0500 Subject: [PATCH 156/519] Move some old news items away from the frontpage; fix link to c3 (25, not 21) --- documentation/website/source/news/index.rst | 20 +++++++++++++++++ .../website/source/news/recent.rst.inc | 22 +------------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/documentation/website/source/news/index.rst b/documentation/website/source/news/index.rst index 5854ca46e6..411e4f4ee9 100644 --- a/documentation/website/source/news/index.rst +++ b/documentation/website/source/news/index.rst @@ -11,6 +11,26 @@ News & Articles .. include:: recent.rst.inc +**New Documentation** +*2011-11-22* + +We're revitalizing our documentation and moving to a new +publishing system. We'll soon be able to provide our +documentation in PDF and ePub as well as HTML, with it +looking much better and being more maintainable than +in the past. + +:doc:`Read more... ` + +**Welcome to the New Website!** +*2011-11-22* + +As part of recharging Open Dylan development, we've re-done the +website and cleaned up a lot of the old, out-dated material here. + +If you're looking for some of the old material, it can be found +over at ``_. + .. raw:: html diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index bdf9fa4845..d9158e81e5 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -6,7 +6,7 @@ We implemented the C3 superclass linearization algorithm and enabled it by default. This is more intuitive and will allow for further performance improvements. -:doc:`Read more... ` +:doc:`Read more... ` **Dswank - emacs and DIME** *2011-12-12* @@ -28,23 +28,3 @@ and new features. :doc:`Read more... ` -**New Documentation** -*2011-11-22* - -We're revitalizing our documentation and moving to a new -publishing system. We'll soon be able to provide our -documentation in PDF and ePub as well as HTML, with it -looking much better and being more maintainable than -in the past. - -:doc:`Read more... ` - -**Welcome to the New Website!** -*2011-11-22* - -As part of recharging Open Dylan development, we've re-done the -website and cleaned up a lot of the old, out-dated material here. - -If you're looking for some of the old material, it can be found -over at ``_. - From 752dc15a8a3a54c1b82b00f5e99ad77a8f18d72d Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 26 Jan 2012 20:11:07 +0700 Subject: [PATCH 157/519] Improve CSS minorly: headerlink and li content. --- .../opendylan/static/opendylan.org/css/opendylan.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css index c5489e226c..7a3fc9c8ec 100644 --- a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css +++ b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css @@ -17,3 +17,12 @@ body { -moz-border-radius:3px; border-radius:3px; } +/* Make the headerlink less obnoxiously visible */ +a.headerlink { + color: silver; +} +/* Undo an annoyance from Bootstrap */ +li { + color: black; +} + From ea77108cbe42522c7e034395308517b5b0220751 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 1 Feb 2012 18:05:08 +0700 Subject: [PATCH 158/519] Update to Bootstrap 2.0 and jQuery 1.7.1. --- .../source/_themes/opendylan/layout.html | 34 +- .../static/bootstrap/2.0/css/bootstrap.css | 3363 +++++++++++++++++ .../bootstrap/2.0/css/bootstrap.min.css | 610 +++ .../2.0/css/bootstrap.min.responsive | 3 + .../bootstrap/2.0/css/bootstrap.responsive | 567 +++ .../2.0/img/glyphicons-halflings-white.png | Bin 0 -> 4352 bytes .../2.0/img/glyphicons-halflings.png | Bin 0 -> 4352 bytes .../static/bootstrap/2.0/js/bootstrap.js | 1722 +++++++++ .../static/bootstrap/2.0/js/bootstrap.min.js | 1 + .../source/_themes/opendylan/static/jquery.js | 4 + .../css/bootstrap/1.4.0/bootstrap.min.css | 356 -- .../static/opendylan.org/css/opendylan.css | 27 +- .../opendylan.org/js/bootstrap-dropdown.js | 55 - .../opendylan.org/js/bootstrap-scrollspy.js | 107 - .../website/source/documentation/index.rst | 18 +- .../website/source/download/index.rst | 6 +- documentation/website/source/index.rst | 8 +- documentation/website/source/news/index.rst | 4 +- 18 files changed, 6330 insertions(+), 555 deletions(-) create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.css create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.css create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.responsive create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.responsive create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/img/glyphicons-halflings-white.png create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/img/glyphicons-halflings.png create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.js create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.min.js create mode 100644 documentation/website/source/_themes/opendylan/static/jquery.js delete mode 100644 documentation/website/source/_themes/opendylan/static/opendylan.org/css/bootstrap/1.4.0/bootstrap.min.css delete mode 100644 documentation/website/source/_themes/opendylan/static/opendylan.org/js/bootstrap-dropdown.js delete mode 100644 documentation/website/source/_themes/opendylan/static/opendylan.org/js/bootstrap-scrollspy.js diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index f7660e36a5..e2e30c3268 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -9,9 +9,10 @@ {% block doctype %} {% endblock %} -{% set css_files = css_files + ['_static/opendylan.org/css/bootstrap/1.4.0/bootstrap.min.css', +{% set css_files = css_files + ['_static/bootstrap/2.0/css/bootstrap.min.css', + '_static/bootstrap/2.0/css/bootstrap.min.responsive', '_static/opendylan.org/css/opendylan.css'] -%} -{% set script_files = script_files + ['_static/opendylan.org/js/bootstrap-scrollspy.js'] -%} +{% set script_files = script_files + ['_static/bootstrap/2.0/js/bootstrap.min.js'] -%} {% set navigation_bar = [ ('index', 'Home'), ('about/index', 'About'), @@ -31,22 +32,25 @@ {% endblock %} {% block header %} -
-
+
+
+ + + + + Open Dylan - -
-
-

- - -

+
+
    + {% for page, caption in navigation_bar -%} + {{ caption|e }} + {% endfor -%} +
+ + +
diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.css new file mode 100644 index 0000000000..7babce5eb2 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.css @@ -0,0 +1,3363 @@ +/*! + * Bootstrap v2.0.0 + * + * 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. + */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { + display: block; +} +audio, canvas, video { + display: inline-block; + *display: inline; + *zoom: 1; +} +audio:not([controls]) { + display: none; +} +html { + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +a:focus { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +a:hover, a:active { + outline: 0; +} +sub, sup { + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} +img { + max-width: 100%; + height: auto; + border: 0; + -ms-interpolation-mode: bicubic; +} +button, +input, +select, +textarea { + margin: 0; + font-size: 100%; + vertical-align: middle; +} +button, input { + *overflow: visible; + line-height: normal; +} +button::-moz-focus-inner, input::-moz-focus-inner { + padding: 0; + border: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + -webkit-appearance: button; +} +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { + -webkit-appearance: none; +} +textarea { + overflow: auto; + vertical-align: top; +} +body { + margin: 0; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + line-height: 18px; + color: #333333; + background-color: #ffffff; +} +a { + color: #0088cc; + text-decoration: none; +} +a:hover { + color: #005580; + text-decoration: underline; +} +.row { + margin-left: -20px; + *zoom: 1; +} +.row:before, .row:after { + display: table; + content: ""; +} +.row:after { + clear: both; +} +[class*="span"] { + float: left; + margin-left: 20px; +} +.span1 { + width: 60px; +} +.span2 { + width: 140px; +} +.span3 { + width: 220px; +} +.span4 { + width: 300px; +} +.span5 { + width: 380px; +} +.span6 { + width: 460px; +} +.span7 { + width: 540px; +} +.span8 { + width: 620px; +} +.span9 { + width: 700px; +} +.span10 { + width: 780px; +} +.span11 { + width: 860px; +} +.span12, .container { + width: 940px; +} +.offset1 { + margin-left: 100px; +} +.offset2 { + margin-left: 180px; +} +.offset3 { + margin-left: 260px; +} +.offset4 { + margin-left: 340px; +} +.offset5 { + margin-left: 420px; +} +.offset6 { + margin-left: 500px; +} +.offset7 { + margin-left: 580px; +} +.offset8 { + margin-left: 660px; +} +.offset9 { + margin-left: 740px; +} +.offset10 { + margin-left: 820px; +} +.offset11 { + margin-left: 900px; +} +.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.127659574%; +} +.row-fluid > [class*="span"]:first-child { + margin-left: 0; +} +.row-fluid .span1 { + width: 6.382978723%; +} +.row-fluid .span2 { + width: 14.89361702%; +} +.row-fluid .span3 { + width: 23.404255317%; +} +.row-fluid .span4 { + width: 31.914893614%; +} +.row-fluid .span5 { + width: 40.425531911%; +} +.row-fluid .span6 { + width: 48.93617020799999%; +} +.row-fluid .span7 { + width: 57.446808505%; +} +.row-fluid .span8 { + width: 65.95744680199999%; +} +.row-fluid .span9 { + width: 74.468085099%; +} +.row-fluid .span10 { + width: 82.97872339599999%; +} +.row-fluid .span11 { + width: 91.489361693%; +} +.row-fluid .span12 { + width: 99.99999998999999%; +} +.container { + width: 940px; + margin-left: auto; + margin-right: auto; + *zoom: 1; +} +.container:before, .container:after { + display: table; + content: ""; +} +.container:after { + clear: both; +} +.container-fluid { + padding-left: 20px; + padding-right: 20px; + *zoom: 1; +} +.container-fluid:before, .container-fluid:after { + display: table; + content: ""; +} +.container-fluid:after { + clear: both; +} +p { + margin: 0 0 9px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + line-height: 18px; +} +p small { + font-size: 11px; + color: #999999; +} +.lead { + margin-bottom: 18px; + font-size: 20px; + font-weight: 200; + line-height: 27px; +} +h1, +h2, +h3, +h4, +h5, +h6 { + margin: 0; + font-weight: bold; + color: #333333; + text-rendering: optimizelegibility; +} +h1 small, +h2 small, +h3 small, +h4 small, +h5 small, +h6 small { + font-weight: normal; + color: #999999; +} +h1 { + font-size: 30px; + line-height: 36px; +} +h1 small { + font-size: 18px; +} +h2 { + font-size: 24px; + line-height: 36px; +} +h2 small { + font-size: 18px; +} +h3 { + line-height: 27px; + font-size: 18px; +} +h3 small { + font-size: 14px; +} +h4, h5, h6 { + line-height: 18px; +} +h4 { + font-size: 14px; +} +h4 small { + font-size: 12px; +} +h5 { + font-size: 12px; +} +h6 { + font-size: 11px; + color: #999999; + text-transform: uppercase; +} +.page-header { + padding-bottom: 17px; + margin: 18px 0; + border-bottom: 1px solid #eeeeee; +} +.page-header h1 { + line-height: 1; +} +ul, ol { + padding: 0; + margin: 0 0 9px 25px; +} +ul ul, +ul ol, +ol ol, +ol ul { + margin-bottom: 0; +} +ul { + list-style: disc; +} +ol { + list-style: decimal; +} +li { + line-height: 18px; +} +ul.unstyled { + margin-left: 0; + list-style: none; +} +dl { + margin-bottom: 18px; +} +dt, dd { + line-height: 18px; +} +dt { + font-weight: bold; +} +dd { + margin-left: 9px; +} +hr { + margin: 18px 0; + border: 0; + border-top: 1px solid #e5e5e5; + border-bottom: 1px solid #ffffff; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +.muted { + color: #999999; +} +abbr { + font-size: 90%; + text-transform: uppercase; + border-bottom: 1px dotted #ddd; + cursor: help; +} +blockquote { + padding: 0 0 0 15px; + margin: 0 0 18px; + border-left: 5px solid #eeeeee; +} +blockquote p { + margin-bottom: 0; + font-size: 16px; + font-weight: 300; + line-height: 22.5px; +} +blockquote small { + display: block; + line-height: 18px; + color: #999999; +} +blockquote small:before { + content: '\2014 \00A0'; +} +blockquote.pull-right { + float: right; + padding-left: 0; + padding-right: 15px; + border-left: 0; + border-right: 5px solid #eeeeee; +} +blockquote.pull-right p, blockquote.pull-right small { + text-align: right; +} +q:before, +q:after, +blockquote:before, +blockquote:after { + content: ""; +} +address { + display: block; + margin-bottom: 18px; + line-height: 18px; + font-style: normal; +} +small { + font-size: 100%; +} +cite { + font-style: normal; +} +code, pre { + padding: 0 3px 2px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 12px; + color: #333333; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +code { + padding: 3px 4px; + color: #d14; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; +} +pre { + display: block; + padding: 8.5px; + margin: 0 0 9px; + font-size: 12px; + line-height: 18px; + background-color: #f5f5f5; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + white-space: pre; + white-space: pre-wrap; + word-break: break-all; +} +pre.prettyprint { + margin-bottom: 18px; +} +pre code { + padding: 0; + background-color: transparent; +} +form { + margin: 0 0 18px; +} +fieldset { + padding: 0; + margin: 0; + border: 0; +} +legend { + display: block; + width: 100%; + padding: 0; + margin-bottom: 27px; + font-size: 19.5px; + line-height: 36px; + color: #333333; + border: 0; + border-bottom: 1px solid #eee; +} +label, +input, +button, +select, +textarea { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: 18px; +} +label { + display: block; + margin-bottom: 5px; + color: #333333; +} +input, +textarea, +select, +.uneditable-input { + display: inline-block; + width: 210px; + height: 18px; + padding: 4px; + margin-bottom: 9px; + font-size: 13px; + line-height: 18px; + color: #555555; + border: 1px solid #ccc; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.uneditable-textarea { + width: auto; + height: auto; +} +label input, label textarea, label select { + display: block; +} +input[type="image"], input[type="checkbox"], input[type="radio"] { + width: auto; + height: auto; + padding: 0; + margin: 3px 0; + *margin-top: 0; + /* IE7 */ + + line-height: normal; + border: 0; + cursor: pointer; + border-radius: 0 \0/; +} +input[type="file"] { + padding: initial; + line-height: initial; + border: initial; + background-color: #ffffff; + background-color: initial; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +input[type="button"], input[type="reset"], input[type="submit"] { + width: auto; + height: auto; +} +select, input[type="file"] { + height: 28px; + /* In IE7, the height of the select element cannot be changed by height, only font-size */ + + *margin-top: 4px; + /* For IE7, add top margin to align select with labels */ + + line-height: 28px; +} +select { + width: 220px; + background-color: #ffffff; +} +select[multiple], select[size] { + height: auto; +} +input[type="image"] { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +textarea { + height: auto; +} +input[type="hidden"] { + display: none; +} +.radio, .checkbox { + padding-left: 18px; +} +.radio input[type="radio"], .checkbox input[type="checkbox"] { + float: left; + margin-left: -18px; +} +.controls > .radio:first-child, .controls > .checkbox:first-child { + padding-top: 5px; +} +.radio.inline, .checkbox.inline { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; +} +.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { + margin-left: 10px; +} +.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { + padding-top: 0; +} +input, textarea { + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -ms-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; +} +input:focus, textarea:focus { + border-color: rgba(82, 168, 236, 0.8); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + outline: 0; + outline: thin dotted \9; + /* IE6-8 */ + +} +input[type="file"]:focus, input[type="checkbox"]:focus, select:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.input-mini { + width: 60px; +} +.input-small { + width: 90px; +} +.input-medium { + width: 150px; +} +.input-large { + width: 210px; +} +.input-xlarge { + width: 270px; +} +.input-xxlarge { + width: 530px; +} +input[class*="span"], +select[class*="span"], +textarea[class*="span"], +.uneditable-input { + float: none; + margin-left: 0; +} +input.span1, textarea.span1, .uneditable-input.span1 { + width: 50px; +} +input.span2, textarea.span2, .uneditable-input.span2 { + width: 130px; +} +input.span3, textarea.span3, .uneditable-input.span3 { + width: 210px; +} +input.span4, textarea.span4, .uneditable-input.span4 { + width: 290px; +} +input.span5, textarea.span5, .uneditable-input.span5 { + width: 370px; +} +input.span6, textarea.span6, .uneditable-input.span6 { + width: 450px; +} +input.span7, textarea.span7, .uneditable-input.span7 { + width: 530px; +} +input.span8, textarea.span8, .uneditable-input.span8 { + width: 610px; +} +input.span9, textarea.span9, .uneditable-input.span9 { + width: 690px; +} +input.span10, textarea.span10, .uneditable-input.span10 { + width: 770px; +} +input.span11, textarea.span11, .uneditable-input.span11 { + width: 850px; +} +input.span12, textarea.span12, .uneditable-input.span12 { + width: 930px; +} +input[disabled], +select[disabled], +textarea[disabled], +input[readonly], +select[readonly], +textarea[readonly] { + background-color: #f5f5f5; + border-color: #ddd; + cursor: not-allowed; +} +.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { + color: #c09853; +} +.control-group.warning input, .control-group.warning select, .control-group.warning textarea { + color: #c09853; + border-color: #c09853; +} +.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { + border-color: #a47e3c; + -webkit-box-shadow: 0 0 6px #dbc59e; + -moz-box-shadow: 0 0 6px #dbc59e; + box-shadow: 0 0 6px #dbc59e; +} +.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { + color: #c09853; + background-color: #fcf8e3; + border-color: #c09853; +} +.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { + color: #b94a48; +} +.control-group.error input, .control-group.error select, .control-group.error textarea { + color: #b94a48; + border-color: #b94a48; +} +.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { + border-color: #953b39; + -webkit-box-shadow: 0 0 6px #d59392; + -moz-box-shadow: 0 0 6px #d59392; + box-shadow: 0 0 6px #d59392; +} +.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { + color: #b94a48; + background-color: #f2dede; + border-color: #b94a48; +} +.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { + color: #468847; +} +.control-group.success input, .control-group.success select, .control-group.success textarea { + color: #468847; + border-color: #468847; +} +.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { + border-color: #356635; + -webkit-box-shadow: 0 0 6px #7aba7b; + -moz-box-shadow: 0 0 6px #7aba7b; + box-shadow: 0 0 6px #7aba7b; +} +.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { + color: #468847; + background-color: #dff0d8; + border-color: #468847; +} +input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { + color: #b94a48; + border-color: #ee5f5b; +} +input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { + border-color: #e9322d; + -webkit-box-shadow: 0 0 6px #f8b9b7; + -moz-box-shadow: 0 0 6px #f8b9b7; + box-shadow: 0 0 6px #f8b9b7; +} +.form-actions { + padding: 17px 20px 18px; + margin-top: 18px; + margin-bottom: 18px; + background-color: #f5f5f5; + border-top: 1px solid #ddd; +} +.uneditable-input { + display: block; + background-color: #ffffff; + border-color: #eee; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +:-moz-placeholder { + color: #999999; +} +::-webkit-input-placeholder { + color: #999999; +} +.help-block { + margin-top: 5px; + margin-bottom: 0; + color: #999999; +} +.help-inline { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-bottom: 9px; + vertical-align: middle; + padding-left: 5px; +} +.input-prepend, .input-append { + margin-bottom: 5px; + *zoom: 1; +} +.input-prepend:before, +.input-append:before, +.input-prepend:after, +.input-append:after { + display: table; + content: ""; +} +.input-prepend:after, .input-append:after { + clear: both; +} +.input-prepend input, +.input-append input, +.input-prepend .uneditable-input, +.input-append .uneditable-input { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-prepend input:focus, +.input-append input:focus, +.input-prepend .uneditable-input:focus, +.input-append .uneditable-input:focus { + position: relative; + z-index: 2; +} +.input-prepend .uneditable-input, .input-append .uneditable-input { + border-left-color: #ccc; +} +.input-prepend .add-on, .input-append .add-on { + float: left; + display: block; + width: auto; + min-width: 16px; + height: 18px; + margin-right: -1px; + padding: 4px 5px; + font-weight: normal; + line-height: 18px; + color: #999999; + text-align: center; + text-shadow: 0 1px 0 #ffffff; + background-color: #f5f5f5; + border: 1px solid #ccc; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} +.input-prepend .active, .input-append .active { + background-color: #a9dba9; + border-color: #46a546; +} +.input-prepend .add-on { + *margin-top: 1px; + /* IE6-7 */ + +} +.input-append input, .input-append .uneditable-input { + float: left; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} +.input-append .uneditable-input { + border-right-color: #ccc; +} +.input-append .add-on { + margin-right: 0; + margin-left: -1px; + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-append input:first-child { + *margin-left: -160px; +} +.input-append input:first-child + .add-on { + *margin-left: -21px; +} +.search-query { + padding-left: 14px; + padding-right: 14px; + margin-bottom: 0; + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; +} +.form-search input, +.form-inline input, +.form-horizontal input, +.form-search textarea, +.form-inline textarea, +.form-horizontal textarea, +.form-search select, +.form-inline select, +.form-horizontal select, +.form-search .help-inline, +.form-inline .help-inline, +.form-horizontal .help-inline, +.form-search .uneditable-input, +.form-inline .uneditable-input, +.form-horizontal .uneditable-input { + display: inline-block; + margin-bottom: 0; +} +.form-search label, +.form-inline label, +.form-search .input-append, +.form-inline .input-append, +.form-search .input-prepend, +.form-inline .input-prepend { + display: inline-block; +} +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on, +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on { + vertical-align: middle; +} +.control-group { + margin-bottom: 9px; +} +.form-horizontal legend + .control-group { + margin-top: 18px; + -webkit-margin-top-collapse: separate; +} +.form-horizontal .control-group { + margin-bottom: 18px; + *zoom: 1; +} +.form-horizontal .control-group:before, .form-horizontal .control-group:after { + display: table; + content: ""; +} +.form-horizontal .control-group:after { + clear: both; +} +.form-horizontal .control-group > label { + float: left; + width: 140px; + padding-top: 5px; + text-align: right; +} +.form-horizontal .controls { + margin-left: 160px; +} +.form-horizontal .form-actions { + padding-left: 160px; +} +table { + max-width: 100%; + border-collapse: collapse; + border-spacing: 0; +} +.table { + width: 100%; + margin-bottom: 18px; +} +.table th, .table td { + padding: 8px; + line-height: 18px; + text-align: left; + border-top: 1px solid #ddd; +} +.table th { + font-weight: bold; + vertical-align: bottom; +} +.table td { + vertical-align: top; +} +.table thead:first-child tr th, .table thead:first-child tr td { + border-top: 0; +} +.table tbody + tbody { + border-top: 2px solid #ddd; +} +.table-condensed th, .table-condensed td { + padding: 4px 5px; +} +.table-bordered { + border: 1px solid #ddd; + border-collapse: separate; + *border-collapse: collapsed; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.table-bordered th + th, +.table-bordered td + td, +.table-bordered th + td, +.table-bordered td + th { + border-left: 1px solid #ddd; +} +.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { + border-top: 0; +} +.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-radius: 4px 0 0 0; + -moz-border-radius: 4px 0 0 0; + border-radius: 4px 0 0 0; +} +.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-radius: 0 4px 0 0; + -moz-border-radius: 0 4px 0 0; + border-radius: 0 4px 0 0; +} +.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 4px; + -moz-border-radius: 0 0 0 4px; + border-radius: 0 0 0 4px; +} +.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-radius: 0 0 4px 0; + -moz-border-radius: 0 0 4px 0; + border-radius: 0 0 4px 0; +} +.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { + background-color: #f9f9f9; +} +table .span1 { + float: none; + width: 44px; + margin-left: 0; +} +table .span2 { + float: none; + width: 124px; + margin-left: 0; +} +table .span3 { + float: none; + width: 204px; + margin-left: 0; +} +table .span4 { + float: none; + width: 284px; + margin-left: 0; +} +table .span5 { + float: none; + width: 364px; + margin-left: 0; +} +table .span6 { + float: none; + width: 444px; + margin-left: 0; +} +table .span7 { + float: none; + width: 524px; + margin-left: 0; +} +table .span8 { + float: none; + width: 604px; + margin-left: 0; +} +table .span9 { + float: none; + width: 684px; + margin-left: 0; +} +table .span10 { + float: none; + width: 764px; + margin-left: 0; +} +table .span11 { + float: none; + width: 844px; + margin-left: 0; +} +table .span12 { + float: none; + width: 924px; + margin-left: 0; +} +[class^="icon-"] { + display: inline-block; + width: 14px; + height: 14px; + vertical-align: text-top; + background-image: url(../img/glyphicons-halflings.png); + background-position: 14px 14px; + background-repeat: no-repeat; + *margin-right: .3em; +} +[class^="icon-"]:last-child { + *margin-left: 0; +} +.icon-white { + background-image: url(../img/glyphicons-halflings-white.png); +} +.icon-glass { + background-position: 0 0; +} +.icon-music { + background-position: -24px 0; +} +.icon-search { + background-position: -48px 0; +} +.icon-envelope { + background-position: -72px 0; +} +.icon-heart { + background-position: -96px 0; +} +.icon-star { + background-position: -120px 0; +} +.icon-star-empty { + background-position: -144px 0; +} +.icon-user { + background-position: -168px 0; +} +.icon-film { + background-position: -192px 0; +} +.icon-th-large { + background-position: -216px 0; +} +.icon-th { + background-position: -240px 0; +} +.icon-th-list { + background-position: -264px 0; +} +.icon-ok { + background-position: -288px 0; +} +.icon-remove { + background-position: -312px 0; +} +.icon-zoom-in { + background-position: -336px 0; +} +.icon-zoom-out { + background-position: -360px 0; +} +.icon-off { + background-position: -384px 0; +} +.icon-signal { + background-position: -408px 0; +} +.icon-cog { + background-position: -432px 0; +} +.icon-trash { + background-position: -456px 0; +} +.icon-home { + background-position: 0 -24px; +} +.icon-file { + background-position: -24px -24px; +} +.icon-time { + background-position: -48px -24px; +} +.icon-road { + background-position: -72px -24px; +} +.icon-download-alt { + background-position: -96px -24px; +} +.icon-download { + background-position: -120px -24px; +} +.icon-upload { + background-position: -144px -24px; +} +.icon-inbox { + background-position: -168px -24px; +} +.icon-play-circle { + background-position: -192px -24px; +} +.icon-repeat { + background-position: -216px -24px; +} +.icon-refresh { + background-position: -240px -24px; +} +.icon-list-alt { + background-position: -264px -24px; +} +.icon-lock { + background-position: -287px -24px; +} +.icon-flag { + background-position: -312px -24px; +} +.icon-headphones { + background-position: -336px -24px; +} +.icon-volume-off { + background-position: -360px -24px; +} +.icon-volume-down { + background-position: -384px -24px; +} +.icon-volume-up { + background-position: -408px -24px; +} +.icon-qrcode { + background-position: -432px -24px; +} +.icon-barcode { + background-position: -456px -24px; +} +.icon-tag { + background-position: 0 -48px; +} +.icon-tags { + background-position: -25px -48px; +} +.icon-book { + background-position: -48px -48px; +} +.icon-bookmark { + background-position: -72px -48px; +} +.icon-print { + background-position: -96px -48px; +} +.icon-camera { + background-position: -120px -48px; +} +.icon-font { + background-position: -144px -48px; +} +.icon-bold { + background-position: -167px -48px; +} +.icon-italic { + background-position: -192px -48px; +} +.icon-text-height { + background-position: -216px -48px; +} +.icon-text-width { + background-position: -240px -48px; +} +.icon-align-left { + background-position: -264px -48px; +} +.icon-align-center { + background-position: -288px -48px; +} +.icon-align-right { + background-position: -312px -48px; +} +.icon-align-justify { + background-position: -336px -48px; +} +.icon-list { + background-position: -360px -48px; +} +.icon-indent-left { + background-position: -384px -48px; +} +.icon-indent-right { + background-position: -408px -48px; +} +.icon-facetime-video { + background-position: -432px -48px; +} +.icon-picture { + background-position: -456px -48px; +} +.icon-pencil { + background-position: 0 -72px; +} +.icon-map-marker { + background-position: -24px -72px; +} +.icon-adjust { + background-position: -48px -72px; +} +.icon-tint { + background-position: -72px -72px; +} +.icon-edit { + background-position: -96px -72px; +} +.icon-share { + background-position: -120px -72px; +} +.icon-check { + background-position: -144px -72px; +} +.icon-move { + background-position: -168px -72px; +} +.icon-step-backward { + background-position: -192px -72px; +} +.icon-fast-backward { + background-position: -216px -72px; +} +.icon-backward { + background-position: -240px -72px; +} +.icon-play { + background-position: -264px -72px; +} +.icon-pause { + background-position: -288px -72px; +} +.icon-stop { + background-position: -312px -72px; +} +.icon-forward { + background-position: -336px -72px; +} +.icon-fast-forward { + background-position: -360px -72px; +} +.icon-step-forward { + background-position: -384px -72px; +} +.icon-eject { + background-position: -408px -72px; +} +.icon-chevron-left { + background-position: -432px -72px; +} +.icon-chevron-right { + background-position: -456px -72px; +} +.icon-plus-sign { + background-position: 0 -96px; +} +.icon-minus-sign { + background-position: -24px -96px; +} +.icon-remove-sign { + background-position: -48px -96px; +} +.icon-ok-sign { + background-position: -72px -96px; +} +.icon-question-sign { + background-position: -96px -96px; +} +.icon-info-sign { + background-position: -120px -96px; +} +.icon-screenshot { + background-position: -144px -96px; +} +.icon-remove-circle { + background-position: -168px -96px; +} +.icon-ok-circle { + background-position: -192px -96px; +} +.icon-ban-circle { + background-position: -216px -96px; +} +.icon-arrow-left { + background-position: -240px -96px; +} +.icon-arrow-right { + background-position: -264px -96px; +} +.icon-arrow-up { + background-position: -289px -96px; +} +.icon-arrow-down { + background-position: -312px -96px; +} +.icon-share-alt { + background-position: -336px -96px; +} +.icon-resize-full { + background-position: -360px -96px; +} +.icon-resize-small { + background-position: -384px -96px; +} +.icon-plus { + background-position: -408px -96px; +} +.icon-minus { + background-position: -433px -96px; +} +.icon-asterisk { + background-position: -456px -96px; +} +.icon-exclamation-sign { + background-position: 0 -120px; +} +.icon-gift { + background-position: -24px -120px; +} +.icon-leaf { + background-position: -48px -120px; +} +.icon-fire { + background-position: -72px -120px; +} +.icon-eye-open { + background-position: -96px -120px; +} +.icon-eye-close { + background-position: -120px -120px; +} +.icon-warning-sign { + background-position: -144px -120px; +} +.icon-plane { + background-position: -168px -120px; +} +.icon-calendar { + background-position: -192px -120px; +} +.icon-random { + background-position: -216px -120px; +} +.icon-comment { + background-position: -240px -120px; +} +.icon-magnet { + background-position: -264px -120px; +} +.icon-chevron-up { + background-position: -288px -120px; +} +.icon-chevron-down { + background-position: -313px -119px; +} +.icon-retweet { + background-position: -336px -120px; +} +.icon-shopping-cart { + background-position: -360px -120px; +} +.icon-folder-close { + background-position: -384px -120px; +} +.icon-folder-open { + background-position: -408px -120px; +} +.icon-resize-vertical { + background-position: -432px -119px; +} +.icon-resize-horizontal { + background-position: -456px -118px; +} +.dropdown { + position: relative; +} +.dropdown-toggle { + *margin-bottom: -3px; +} +.dropdown-toggle:active, .open .dropdown-toggle { + outline: 0; +} +.caret { + display: inline-block; + width: 0; + height: 0; + text-indent: -99999px; + *text-indent: 0; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #000000; + opacity: 0.3; + filter: alpha(opacity=30); + content: "\2193"; +} +.dropdown .caret { + margin-top: 8px; + margin-left: 2px; +} +.dropdown:hover .caret, .open.dropdown .caret { + opacity: 1; + filter: alpha(opacity=100); +} +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + float: left; + display: none; + min-width: 160px; + max-width: 220px; + _width: 160px; + padding: 4px 0; + margin: 0; + list-style: none; + background-color: #ffffff; + border-color: #ccc; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 1px; + -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + *border-right-width: 2px; + *border-bottom-width: 2px; +} +.dropdown-menu.bottom-up { + top: auto; + bottom: 100%; + margin-bottom: 2px; +} +.dropdown-menu .divider { + height: 1px; + margin: 5px 1px; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid #ffffff; + *width: 100%; + *margin: -5px 0 5px; +} +.dropdown-menu a { + display: block; + padding: 3px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: #555555; + white-space: nowrap; +} +.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { + color: #ffffff; + text-decoration: none; + background-color: #0088cc; +} +.dropdown.open { + *z-index: 1000; +} +.dropdown.open .dropdown-toggle { + color: #ffffff; + background: #ccc; + background: rgba(0, 0, 0, 0.3); +} +.dropdown.open .dropdown-menu { + display: block; +} +.typeahead { + margin-top: 2px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #eee; + border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.fade { + -webkit-transition: opacity 0.15s linear; + -moz-transition: opacity 0.15s linear; + -ms-transition: opacity 0.15s linear; + -o-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; + opacity: 0; +} +.fade.in { + opacity: 1; +} +.collapse { + -webkit-transition: height 0.35s ease; + -moz-transition: height 0.35s ease; + -ms-transition: height 0.35s ease; + -o-transition: height 0.35s ease; + transition: height 0.35s ease; + position: relative; + overflow: hidden; + height: 0; +} +.collapse.in { + height: auto; +} +.close { + float: right; + font-size: 20px; + font-weight: bold; + line-height: 18px; + color: #000000; + text-shadow: 0 1px 0 #ffffff; + opacity: 0.2; + filter: alpha(opacity=20); +} +.close:hover { + color: #000000; + text-decoration: none; + opacity: 0.4; + filter: alpha(opacity=40); + cursor: pointer; +} +.btn { + display: inline-block; + padding: 4px 10px 4px; + font-size: 13px; + line-height: 18px; + color: #333333; + text-align: center; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: #fafafa; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); + background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-repeat: no-repeat; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + border: 1px solid #ccc; + border-bottom-color: #bbb; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + cursor: pointer; + *margin-left: .3em; +} +.btn:first-child { + *margin-left: 0; +} +.btn:hover { + color: #333333; + text-decoration: none; + background-color: #e6e6e6; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -ms-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} +.btn:focus { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +.btn.active, .btn:active { + background-image: none; + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + background-color: #e6e6e6; + background-color: #d9d9d9 \9; + color: rgba(0, 0, 0, 0.5); + outline: 0; +} +.btn.disabled, .btn[disabled] { + cursor: default; + background-image: none; + background-color: #e6e6e6; + opacity: 0.65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-large { + padding: 9px 14px; + font-size: 15px; + line-height: normal; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +.btn-large .icon { + margin-top: 1px; +} +.btn-small { + padding: 5px 9px; + font-size: 11px; + line-height: 16px; +} +.btn-small .icon { + margin-top: -1px; +} +.btn-primary, +.btn-primary:hover, +.btn-warning, +.btn-warning:hover, +.btn-danger, +.btn-danger:hover, +.btn-success, +.btn-success:hover, +.btn-info, +.btn-info:hover { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + color: #ffffff; +} +.btn-primary.active, +.btn-warning.active, +.btn-danger.active, +.btn-success.active, +.btn-info.active { + color: rgba(255, 255, 255, 0.75); +} +.btn-primary { + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -ms-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(top, #0088cc, #0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.btn-primary:hover, +.btn-primary:active, +.btn-primary.active, +.btn-primary.disabled, +.btn-primary[disabled] { + background-color: #0044cc; +} +.btn-primary:active, .btn-primary.active { + background-color: #003399 \9; +} +.btn-warning { + background-color: #faa732; + background-image: -moz-linear-gradient(top, #fbb450, #f89406); + background-image: -ms-linear-gradient(top, #fbb450, #f89406); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); + background-image: -webkit-linear-gradient(top, #fbb450, #f89406); + background-image: -o-linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(top, #fbb450, #f89406); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + border-color: #f89406 #f89406 #ad6704; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.btn-warning:hover, +.btn-warning:active, +.btn-warning.active, +.btn-warning.disabled, +.btn-warning[disabled] { + background-color: #f89406; +} +.btn-warning:active, .btn-warning.active { + background-color: #c67605 \9; +} +.btn-danger { + background-color: #da4f49; + background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(top, #ee5f5b, #bd362f); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + border-color: #bd362f #bd362f #802420; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.btn-danger:hover, +.btn-danger:active, +.btn-danger.active, +.btn-danger.disabled, +.btn-danger[disabled] { + background-color: #bd362f; +} +.btn-danger:active, .btn-danger.active { + background-color: #942a25 \9; +} +.btn-success { + background-color: #5bb75b; + background-image: -moz-linear-gradient(top, #62c462, #51a351); + background-image: -ms-linear-gradient(top, #62c462, #51a351); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); + background-image: -webkit-linear-gradient(top, #62c462, #51a351); + background-image: -o-linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(top, #62c462, #51a351); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + border-color: #51a351 #51a351 #387038; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.btn-success:hover, +.btn-success:active, +.btn-success.active, +.btn-success.disabled, +.btn-success[disabled] { + background-color: #51a351; +} +.btn-success:active, .btn-success.active { + background-color: #408140 \9; +} +.btn-info { + background-color: #49afcd; + background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); + background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); + background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(top, #5bc0de, #2f96b4); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + border-color: #2f96b4 #2f96b4 #1f6377; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.btn-info:hover, +.btn-info:active, +.btn-info.active, +.btn-info.disabled, +.btn-info[disabled] { + background-color: #2f96b4; +} +.btn-info:active, .btn-info.active { + background-color: #24748c \9; +} +button.btn, input[type="submit"].btn { + *padding-top: 2px; + *padding-bottom: 2px; +} +button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { + padding: 0; + border: 0; +} +button.btn.large, input[type="submit"].btn.large { + *padding-top: 7px; + *padding-bottom: 7px; +} +button.btn.small, input[type="submit"].btn.small { + *padding-top: 3px; + *padding-bottom: 3px; +} +.btn-group { + position: relative; + *zoom: 1; + *margin-left: .3em; +} +.btn-group:before, .btn-group:after { + display: table; + content: ""; +} +.btn-group:after { + clear: both; +} +.btn-group:first-child { + *margin-left: 0; +} +.btn-group + .btn-group { + margin-left: 5px; +} +.btn-toolbar { + margin-top: 9px; + margin-bottom: 9px; +} +.btn-toolbar .btn-group { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group .btn { + position: relative; + float: left; + margin-left: -1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group .btn:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; +} +.btn-group .btn:last-child, .btn-group .dropdown-toggle { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; +} +.btn-group .btn.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} +.btn-group .btn:hover, +.btn-group .btn:focus, +.btn-group .btn:active, +.btn-group .btn.active { + z-index: 2; +} +.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { + outline: 0; +} +.btn-group .dropdown-toggle { + padding-left: 8px; + padding-right: 8px; + -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + *padding-top: 5px; + *padding-bottom: 5px; +} +.btn-group.open { + *z-index: 1000; +} +.btn-group.open .dropdown-menu { + display: block; + margin-top: 1px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +.btn-group.open .dropdown-toggle { + background-image: none; + -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn .caret { + margin-top: 7px; + margin-left: 0; +} +.btn:hover .caret, .open.btn-group .caret { + opacity: 1; + filter: alpha(opacity=100); +} +.btn-primary .caret, +.btn-danger .caret, +.btn-info .caret, +.btn-success .caret { + border-top-color: #ffffff; + opacity: 0.75; + filter: alpha(opacity=75); +} +.btn-small .caret { + margin-top: 4px; +} +.alert { + padding: 8px 35px 8px 14px; + margin-bottom: 18px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #fcf8e3; + border: 1px solid #fbeed5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.alert, .alert-heading { + color: #c09853; +} +.alert .close { + position: relative; + top: -2px; + right: -21px; + line-height: 18px; +} +.alert-success { + background-color: #dff0d8; + border-color: #d6e9c6; +} +.alert-success, .alert-success .alert-heading { + color: #468847; +} +.alert-danger, .alert-error { + background-color: #f2dede; + border-color: #eed3d7; +} +.alert-danger, +.alert-error, +.alert-danger .alert-heading, +.alert-error .alert-heading { + color: #b94a48; +} +.alert-info { + background-color: #d9edf7; + border-color: #bce8f1; +} +.alert-info, .alert-info .alert-heading { + color: #3a87ad; +} +.alert-block { + padding-top: 14px; + padding-bottom: 14px; +} +.alert-block > p, .alert-block > ul { + margin-bottom: 0; +} +.alert-block p + p { + margin-top: 5px; +} +.nav { + margin-left: 0; + margin-bottom: 18px; + list-style: none; +} +.nav > li > a { + display: block; +} +.nav > li > a:hover { + text-decoration: none; + background-color: #eeeeee; +} +.nav-list { + padding-left: 14px; + padding-right: 14px; + margin-bottom: 0; +} +.nav-list > li > a, .nav-list .nav-header { + display: block; + padding: 3px 15px; + margin-left: -15px; + margin-right: -15px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} +.nav-list .nav-header { + font-size: 11px; + font-weight: bold; + line-height: 18px; + color: #999999; + text-transform: uppercase; +} +.nav-list > li + .nav-header { + margin-top: 9px; +} +.nav-list .active > a { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); + background-color: #0088cc; +} +.nav-list .icon { + margin-right: 2px; +} +.nav-tabs, .nav-pills { + *zoom: 1; +} +.nav-tabs:before, +.nav-pills:before, +.nav-tabs:after, +.nav-pills:after { + display: table; + content: ""; +} +.nav-tabs:after, .nav-pills:after { + clear: both; +} +.nav-tabs > li, .nav-pills > li { + float: left; +} +.nav-tabs > li > a, .nav-pills > li > a { + padding-right: 12px; + padding-left: 12px; + margin-right: 2px; + line-height: 14px; +} +.nav-tabs { + border-bottom: 1px solid #ddd; +} +.nav-tabs > li { + margin-bottom: -1px; +} +.nav-tabs > li > a { + padding-top: 9px; + padding-bottom: 9px; + border: 1px solid transparent; + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.nav-tabs > li > a:hover { + border-color: #eeeeee #eeeeee #dddddd; +} +.nav-tabs > .active > a, .nav-tabs > .active > a:hover { + color: #555555; + background-color: #ffffff; + border: 1px solid #ddd; + border-bottom-color: transparent; + cursor: default; +} +.nav-pills > li > a { + padding-top: 8px; + padding-bottom: 8px; + margin-top: 2px; + margin-bottom: 2px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +.nav-pills .active > a, .nav-pills .active > a:hover { + color: #ffffff; + background-color: #0088cc; +} +.nav-stacked > li { + float: none; +} +.nav-stacked > li > a { + margin-right: 0; +} +.nav-tabs.nav-stacked { + border-bottom: 0; +} +.nav-tabs.nav-stacked > li > a { + border: 1px solid #ddd; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.nav-tabs.nav-stacked > li:first-child > a { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.nav-tabs.nav-stacked > li:last-child > a { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.nav-tabs.nav-stacked > li > a:hover { + border-color: #ddd; + z-index: 2; +} +.nav-pills.nav-stacked > li > a { + margin-bottom: 3px; +} +.nav-pills.nav-stacked > li:last-child > a { + margin-bottom: 1px; +} +.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu { + margin-top: 1px; + border-width: 1px; +} +.nav-pills .dropdown-menu { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { + border-top-color: #0088cc; + margin-top: 6px; +} +.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { + border-top-color: #005580; +} +.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret { + border-top-color: #333333; +} +.nav > .dropdown.active > a:hover { + color: #000000; + cursor: pointer; +} +.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover { + color: #ffffff; + background-color: #999999; + border-color: #999999; +} +.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { + border-top-color: #ffffff; + opacity: 1; + filter: alpha(opacity=100); +} +.tabs-stacked .open > a:hover { + border-color: #999999; +} +.tabbable { + *zoom: 1; +} +.tabbable:before, .tabbable:after { + display: table; + content: ""; +} +.tabbable:after { + clear: both; +} +.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { + border-bottom: 0; +} +.tab-content > .tab-pane, .pill-content > .pill-pane { + display: none; +} +.tab-content > .active, .pill-content > .active { + display: block; +} +.tabs-below .nav-tabs { + border-top: 1px solid #ddd; +} +.tabs-below .nav-tabs > li { + margin-top: -1px; + margin-bottom: 0; +} +.tabs-below .nav-tabs > li > a { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.tabs-below .nav-tabs > li > a:hover { + border-bottom-color: transparent; + border-top-color: #ddd; +} +.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover { + border-color: transparent #ddd #ddd #ddd; +} +.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li { + float: none; +} +.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a { + min-width: 74px; + margin-right: 0; + margin-bottom: 3px; +} +.tabs-left .nav-tabs { + float: left; + margin-right: 19px; + border-right: 1px solid #ddd; +} +.tabs-left .nav-tabs > li > a { + margin-right: -1px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} +.tabs-left .nav-tabs > li > a:hover { + border-color: #eeeeee #dddddd #eeeeee #eeeeee; +} +.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { + border-color: #ddd transparent #ddd #ddd; + *border-right-color: #ffffff; +} +.tabs-right .nav-tabs { + float: right; + margin-left: 19px; + border-left: 1px solid #ddd; +} +.tabs-right .nav-tabs > li > a { + margin-left: -1px; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} +.tabs-right .nav-tabs > li > a:hover { + border-color: #eeeeee #eeeeee #eeeeee #dddddd; +} +.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { + border-color: #ddd #ddd #ddd transparent; + *border-left-color: #ffffff; +} +.navbar { + overflow: visible; + margin-bottom: 18px; +} +.navbar-inner { + padding-left: 20px; + padding-right: 20px; + background-color: #2c2c2c; + background-image: -moz-linear-gradient(top, #333333, #222222); + background-image: -ms-linear-gradient(top, #333333, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); + background-image: -webkit-linear-gradient(top, #333333, #222222); + background-image: -o-linear-gradient(top, #333333, #222222); + background-image: linear-gradient(top, #333333, #222222); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); +} +.btn-navbar { + display: none; + float: right; + padding: 7px 10px; + margin-left: 5px; + margin-right: 5px; + background-color: #2c2c2c; + background-image: -moz-linear-gradient(top, #333333, #222222); + background-image: -ms-linear-gradient(top, #333333, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); + background-image: -webkit-linear-gradient(top, #333333, #222222); + background-image: -o-linear-gradient(top, #333333, #222222); + background-image: linear-gradient(top, #333333, #222222); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + border-color: #222222 #222222 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); +} +.btn-navbar:hover, +.btn-navbar:active, +.btn-navbar.active, +.btn-navbar.disabled, +.btn-navbar[disabled] { + background-color: #222222; +} +.btn-navbar:active, .btn-navbar.active { + background-color: #080808 \9; +} +.btn-navbar .icon-bar { + display: block; + width: 18px; + height: 2px; + background-color: #f5f5f5; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; + -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); +} +.btn-navbar .icon-bar + .icon-bar { + margin-top: 3px; +} +.nav-collapse.collapse { + height: auto; +} +.navbar .brand:hover { + text-decoration: none; +} +.navbar .brand { + float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; + font-size: 20px; + font-weight: 200; + line-height: 1; + color: #ffffff; +} +.navbar .navbar-text { + margin-bottom: 0; + line-height: 40px; + color: #999999; +} +.navbar .navbar-text a:hover { + color: #ffffff; + background-color: transparent; +} +.navbar .btn, .navbar .btn-group { + margin-top: 5px; +} +.navbar .btn-group .btn { + margin-top: 0; +} +.navbar-form { + margin-bottom: 0; + *zoom: 1; +} +.navbar-form:before, .navbar-form:after { + display: table; + content: ""; +} +.navbar-form:after { + clear: both; +} +.navbar-form input, .navbar-form select { + display: inline-block; + margin-top: 5px; + margin-bottom: 0; +} +.navbar-form .radio, .navbar-form .checkbox { + margin-top: 5px; +} +.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { + margin-top: 3px; +} +.navbar-search { + position: relative; + float: left; + margin-top: 6px; + margin-bottom: 0; +} +.navbar-search .search-query { + padding: 4px 9px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: normal; + line-height: 1; + color: #ffffff; + color: rgba(255, 255, 255, 0.75); + background: #666; + background: rgba(255, 255, 255, 0.3); + border: 1px solid #111; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + -webkit-transition: none; + -moz-transition: none; + -ms-transition: none; + -o-transition: none; + transition: none; +} +.navbar-search .search-query :-moz-placeholder { + color: #eeeeee; +} +.navbar-search .search-query::-webkit-input-placeholder { + color: #eeeeee; +} +.navbar-search .search-query:hover { + color: #ffffff; + background-color: #999999; + background-color: rgba(255, 255, 255, 0.5); +} +.navbar-search .search-query:focus, .navbar-search .search-query.focused { + padding: 5px 10px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-fixed-top { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: 1030; +} +.navbar-fixed-top .navbar-inner { + padding-left: 0; + padding-right: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.navbar .nav { + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; +} +.navbar .nav.pull-right { + float: right; +} +.navbar .nav > li { + display: block; + float: left; +} +.navbar .nav > li > a { + float: none; + padding: 10px 10px 11px; + line-height: 19px; + color: #999999; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.navbar .nav > li > a:hover { + background-color: transparent; + color: #ffffff; + text-decoration: none; +} +.navbar .nav .active > a, .navbar .nav .active > a:hover { + color: #ffffff; + text-decoration: none; + background-color: #222222; + background-color: rgba(0, 0, 0, 0.5); +} +.navbar .divider-vertical { + height: 40px; + width: 1px; + margin: 0 9px; + overflow: hidden; + background-color: #222222; + border-right: 1px solid #333333; +} +.navbar .nav.pull-right { + margin-left: 10px; + margin-right: 0; +} +.navbar .dropdown-menu { + margin-top: 1px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.navbar .dropdown-menu:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + position: absolute; + top: -7px; + left: 9px; +} +.navbar .dropdown-menu:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid #ffffff; + position: absolute; + top: -6px; + left: 10px; +} +.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { + border-top-color: #ffffff; +} +.navbar .nav .active .caret { + opacity: 1; + filter: alpha(opacity=100); +} +.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { + background-color: transparent; +} +.navbar .nav .active > .dropdown-toggle:hover { + color: #ffffff; +} +.navbar .nav.pull-right .dropdown-menu { + left: auto; + right: 0; +} +.navbar .nav.pull-right .dropdown-menu:before { + left: auto; + right: 12px; +} +.navbar .nav.pull-right .dropdown-menu:after { + left: auto; + right: 13px; +} +.breadcrumb { + padding: 7px 14px; + margin: 0 0 18px; + background-color: #fbfbfb; + background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); + background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); + background-image: linear-gradient(top, #ffffff, #f5f5f5); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); + border: 1px solid #ddd; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; +} +.breadcrumb li { + display: inline; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb .divider { + padding: 0 5px; + color: #999999; +} +.breadcrumb .active a { + color: #333333; +} +.pagination { + height: 36px; + margin: 18px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.pagination li { + display: inline; +} +.pagination a { + float: left; + padding: 0 14px; + line-height: 34px; + text-decoration: none; + border: 1px solid #ddd; + border-left-width: 0; +} +.pagination a:hover, .pagination .active a { + background-color: #f5f5f5; +} +.pagination .active a { + color: #999999; + cursor: default; +} +.pagination .disabled a, .pagination .disabled a:hover { + color: #999999; + background-color: transparent; + cursor: default; +} +.pagination li:first-child a { + border-left-width: 1px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} +.pagination li:last-child a { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.pagination-centered { + text-align: center; +} +.pagination-right { + text-align: right; +} +.pager { + margin-left: 0; + margin-bottom: 18px; + list-style: none; + text-align: center; + *zoom: 1; +} +.pager:before, .pager:after { + display: table; + content: ""; +} +.pager:after { + clear: both; +} +.pager li { + display: inline; +} +.pager a { + display: inline-block; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #ddd; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +.pager a:hover { + text-decoration: none; + background-color: #f5f5f5; +} +.pager .next a { + float: right; +} +.pager .previous a { + float: left; +} +.modal-open .dropdown-menu { + z-index: 2050; +} +.modal-open .dropdown.open { + *z-index: 2050; +} +.modal-open .popover { + z-index: 2060; +} +.modal-open .tooltip { + z-index: 2070; +} +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + background-color: #000000; +} +.modal-backdrop.fade { + opacity: 0; +} +.modal-backdrop, .modal-backdrop.fade.in { + opacity: 0.8; + filter: alpha(opacity=80); +} +.modal { + position: fixed; + top: 50%; + left: 50%; + z-index: 1050; + max-height: 500px; + overflow: auto; + width: 560px; + margin: -250px 0 0 -280px; + background-color: #ffffff; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, 0.3); + *border: 1px solid #999; + /* IE6-7 */ + + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.modal.fade { + -webkit-transition: opacity .3s linear, top .3s ease-out; + -moz-transition: opacity .3s linear, top .3s ease-out; + -ms-transition: opacity .3s linear, top .3s ease-out; + -o-transition: opacity .3s linear, top .3s ease-out; + transition: opacity .3s linear, top .3s ease-out; + top: -25%; +} +.modal.fade.in { + top: 50%; +} +.modal-header { + padding: 9px 15px; + border-bottom: 1px solid #eee; +} +.modal-header .close { + margin-top: 2px; +} +.modal-body { + padding: 15px; +} +.modal-footer { + padding: 14px 15px 15px; + margin-bottom: 0; + background-color: #f5f5f5; + border-top: 1px solid #ddd; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; + *zoom: 1; +} +.modal-footer:before, .modal-footer:after { + display: table; + content: ""; +} +.modal-footer:after { + clear: both; +} +.modal-footer .btn { + float: right; + margin-left: 5px; + margin-bottom: 0; +} +.tooltip { + position: absolute; + z-index: 1020; + display: block; + visibility: visible; + padding: 5px; + font-size: 11px; + opacity: 0; + filter: alpha(opacity=0); +} +.tooltip.in { + opacity: 0.8; + filter: alpha(opacity=80); +} +.tooltip.top { + margin-top: -2px; +} +.tooltip.right { + margin-left: 2px; +} +.tooltip.bottom { + margin-top: 2px; +} +.tooltip.left { + margin-left: -2px; +} +.tooltip.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; +} +.tooltip.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid #000000; +} +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-bottom: 5px solid #000000; +} +.tooltip.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-right: 5px solid #000000; +} +.tooltip-inner { + max-width: 200px; + padding: 3px 8px; + color: #ffffff; + text-align: center; + text-decoration: none; + background-color: #000000; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; +} +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; + display: none; + padding: 5px; +} +.popover.top { + margin-top: -5px; +} +.popover.right { + margin-left: 5px; +} +.popover.bottom { + margin-top: 5px; +} +.popover.left { + margin-left: -5px; +} +.popover.top .arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; +} +.popover.right .arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-right: 5px solid #000000; +} +.popover.bottom .arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-bottom: 5px solid #000000; +} +.popover.left .arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid #000000; +} +.popover .arrow { + position: absolute; + width: 0; + height: 0; +} +.popover-inner { + padding: 3px; + width: 280px; + overflow: hidden; + background: #000000; + background: rgba(0, 0, 0, 0.8); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); +} +.popover-title { + padding: 9px 15px; + line-height: 1; + background-color: #f5f5f5; + border-bottom: 1px solid #eee; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; +} +.popover-content { + padding: 14px; + background-color: #ffffff; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.popover-content p, .popover-content ul, .popover-content ol { + margin-bottom: 0; +} +.thumbnails { + margin-left: -20px; + list-style: none; + *zoom: 1; +} +.thumbnails:before, .thumbnails:after { + display: table; + content: ""; +} +.thumbnails:after { + clear: both; +} +.thumbnails > li { + float: left; + margin: 0 0 18px 20px; +} +.thumbnail { + display: block; + padding: 4px; + line-height: 1; + border: 1px solid #ddd; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); +} +a.thumbnail:hover { + border-color: #0088cc; + -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); +} +.thumbnail > img { + display: block; + max-width: 100%; + margin-left: auto; + margin-right: auto; +} +.thumbnail .caption { + padding: 9px; +} +.label { + padding: 1px 3px 2px; + font-size: 9.75px; + font-weight: bold; + color: #ffffff; + text-transform: uppercase; + background-color: #999999; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.label-important { + background-color: #b94a48; +} +.label-warning { + background-color: #f89406; +} +.label-success { + background-color: #468847; +} +.label-info { + background-color: #3a87ad; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +@-moz-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +@keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} +.progress { + overflow: hidden; + height: 18px; + margin-bottom: 18px; + background-color: #f7f7f7; + background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.progress .bar { + width: 0%; + height: 18px; + color: #ffffff; + font-size: 12px; + text-align: center; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e90d2; + background-image: -moz-linear-gradient(top, #149bdf, #0480be); + background-image: -ms-linear-gradient(top, #149bdf, #0480be); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); + background-image: -webkit-linear-gradient(top, #149bdf, #0480be); + background-image: -o-linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(top, #149bdf, #0480be); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: width 0.6s ease; + -moz-transition: width 0.6s ease; + -ms-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; +} +.progress-striped .bar { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; +} +.progress.active .bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} +.progress-danger .bar { + background-color: #dd514c; + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); +} +.progress-danger.progress-striped .bar { + background-color: #ee5f5b; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.progress-success .bar { + background-color: #5eb95e; + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); +} +.progress-success.progress-striped .bar { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.progress-info .bar { + background-color: #4bb1cf; + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); +} +.progress-info.progress-striped .bar { + background-color: #5bc0de; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} +.accordion { + margin-bottom: 18px; +} +.accordion-group { + margin-bottom: 2px; + border: 1px solid #e5e5e5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.accordion-heading { + border-bottom: 0; +} +.accordion-heading .accordion-toggle { + display: block; + padding: 8px 15px; +} +.accordion-inner { + padding: 9px 15px; + border-top: 1px solid #e5e5e5; +} +.carousel { + position: relative; + margin-bottom: 18px; + line-height: 1; +} +.carousel-inner { + overflow: hidden; + width: 100%; + position: relative; +} +.carousel .item { + display: none; + position: relative; + -webkit-transition: 0.6s ease-in-out left; + -moz-transition: 0.6s ease-in-out left; + -ms-transition: 0.6s ease-in-out left; + -o-transition: 0.6s ease-in-out left; + transition: 0.6s ease-in-out left; +} +.carousel .item > img { + display: block; + line-height: 1; +} +.carousel .active, .carousel .next, .carousel .prev { + display: block; +} +.carousel .active { + left: 0; +} +.carousel .next, .carousel .prev { + position: absolute; + top: 0; + width: 100%; +} +.carousel .next { + left: 100%; +} +.carousel .prev { + left: -100%; +} +.carousel .next.left, .carousel .prev.right { + left: 0; +} +.carousel .active.left { + left: -100%; +} +.carousel .active.right { + left: 100%; +} +.carousel-control { + position: absolute; + top: 40%; + left: 15px; + width: 40px; + height: 40px; + margin-top: -20px; + font-size: 60px; + font-weight: 100; + line-height: 30px; + color: #ffffff; + text-align: center; + background: #222222; + border: 3px solid #ffffff; + -webkit-border-radius: 23px; + -moz-border-radius: 23px; + border-radius: 23px; + opacity: 0.5; + filter: alpha(opacity=50); +} +.carousel-control.right { + left: auto; + right: 15px; +} +.carousel-control:hover { + color: #ffffff; + text-decoration: none; + opacity: 0.9; + filter: alpha(opacity=90); +} +.carousel-caption { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 10px 15px 5px; + background: #333333; + background: rgba(0, 0, 0, 0.75); +} +.carousel-caption h4, .carousel-caption p { + color: #ffffff; +} +.hero-unit { + padding: 60px; + margin-bottom: 30px; + background-color: #f5f5f5; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.hero-unit h1 { + margin-bottom: 0; + font-size: 60px; + line-height: 1; + letter-spacing: -1px; +} +.hero-unit p { + font-size: 18px; + font-weight: 200; + line-height: 27px; +} +.pull-right { + float: right; +} +.pull-left { + float: left; +} +.hide { + display: none; +} +.show { + display: block; +} +.invisible { + visibility: hidden; +} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.css new file mode 100644 index 0000000000..5e1aee0948 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.css @@ -0,0 +1,610 @@ +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} +audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} +audio:not([controls]){display:none;} +html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} +a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +a:hover,a:active{outline:0;} +sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} +sup{top:-0.5em;} +sub{bottom:-0.25em;} +img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;} +button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} +button,input{*overflow:visible;line-height:normal;} +button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} +button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} +input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} +input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} +textarea{overflow:auto;vertical-align:top;} +body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;} +a{color:#0088cc;text-decoration:none;} +a:hover{color:#005580;text-decoration:underline;} +.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} +.row:after{clear:both;} +[class*="span"]{float:left;margin-left:20px;} +.span1{width:60px;} +.span2{width:140px;} +.span3{width:220px;} +.span4{width:300px;} +.span5{width:380px;} +.span6{width:460px;} +.span7{width:540px;} +.span8{width:620px;} +.span9{width:700px;} +.span10{width:780px;} +.span11{width:860px;} +.span12,.container{width:940px;} +.offset1{margin-left:100px;} +.offset2{margin-left:180px;} +.offset3{margin-left:260px;} +.offset4{margin-left:340px;} +.offset5{margin-left:420px;} +.offset6{margin-left:500px;} +.offset7{margin-left:580px;} +.offset8{margin-left:660px;} +.offset9{margin-left:740px;} +.offset10{margin-left:820px;} +.offset11{margin-left:900px;} +.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.127659574%;} +.row-fluid>[class*="span"]:first-child{margin-left:0;} +.row-fluid .span1{width:6.382978723%;} +.row-fluid .span2{width:14.89361702%;} +.row-fluid .span3{width:23.404255317%;} +.row-fluid .span4{width:31.914893614%;} +.row-fluid .span5{width:40.425531911%;} +.row-fluid .span6{width:48.93617020799999%;} +.row-fluid .span7{width:57.446808505%;} +.row-fluid .span8{width:65.95744680199999%;} +.row-fluid .span9{width:74.468085099%;} +.row-fluid .span10{width:82.97872339599999%;} +.row-fluid .span11{width:91.489361693%;} +.row-fluid .span12{width:99.99999998999999%;} +.container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";} +.container:after{clear:both;} +.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";} +.container-fluid:after{clear:both;} +p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;} +.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;} +h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} +h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} +h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} +h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;} +h4,h5,h6{line-height:18px;} +h4{font-size:14px;}h4 small{font-size:12px;} +h5{font-size:12px;} +h6{font-size:11px;color:#999999;text-transform:uppercase;} +.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;} +.page-header h1{line-height:1;} +ul,ol{padding:0;margin:0 0 9px 25px;} +ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} +ul{list-style:disc;} +ol{list-style:decimal;} +li{line-height:18px;} +ul.unstyled{margin-left:0;list-style:none;} +dl{margin-bottom:18px;} +dt,dd{line-height:18px;} +dt{font-weight:bold;} +dd{margin-left:9px;} +hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;} +strong{font-weight:bold;} +em{font-style:italic;} +.muted{color:#999999;} +abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} +blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} +blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} +blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +q:before,q:after,blockquote:before,blockquote:after{content:"";} +address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} +small{font-size:100%;} +cite{font-style:normal;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} +pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} +pre code{padding:0;background-color:transparent;} +form{margin:0 0 18px;} +fieldset{padding:0;margin:0;border:0;} +legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;} +label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;} +label{display:block;margin-bottom:5px;color:#333333;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.uneditable-textarea{width:auto;height:auto;} +label input,label textarea,label select{display:block;} +input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:0;cursor:pointer;border-radius:0 \0/;} +input[type="file"]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;} +select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;} +select{width:220px;background-color:#ffffff;} +select[multiple],select[size]{height:auto;} +input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +textarea{height:auto;} +input[type="hidden"]{display:none;} +.radio,.checkbox{padding-left:18px;} +.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} +.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} +.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;vertical-align:middle;} +.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} +.controls>.radio.inline:first-child,.controls>.checkbox.inline:first-child{padding-top:0;} +input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} +input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} +input[type="file"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.input-mini{width:60px;} +.input-small{width:90px;} +.input-medium{width:150px;} +.input-large{width:210px;} +.input-xlarge{width:270px;} +.input-xxlarge{width:530px;} +input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;} +input.span1,textarea.span1,.uneditable-input.span1{width:50px;} +input.span2,textarea.span2,.uneditable-input.span2{width:130px;} +input.span3,textarea.span3,.uneditable-input.span3{width:210px;} +input.span4,textarea.span4,.uneditable-input.span4{width:290px;} +input.span5,textarea.span5,.uneditable-input.span5{width:370px;} +input.span6,textarea.span6,.uneditable-input.span6{width:450px;} +input.span7,textarea.span7,.uneditable-input.span7{width:530px;} +input.span8,textarea.span8,.uneditable-input.span8{width:610px;} +input.span9,textarea.span9,.uneditable-input.span9{width:690px;} +input.span10,textarea.span10,.uneditable-input.span10{width:770px;} +input.span11,textarea.span11,.uneditable-input.span11{width:850px;} +input.span12,textarea.span12,.uneditable-input.span12{width:930px;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} +.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} +.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} +.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} +.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} +.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} +input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} +.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} +.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} +:-moz-placeholder{color:#999999;} +::-webkit-input-placeholder{color:#999999;} +.help-block{margin-top:5px;margin-bottom:0;color:#999999;} +.help-inline{display:inline-block;*display:inline;*zoom:1;margin-bottom:9px;vertical-align:middle;padding-left:5px;} +.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";} +.input-prepend:after,.input-append:after{clear:both;} +.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} +.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} +.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} +.input-prepend .add-on{*margin-top:1px;} +.input-append input,.input-append .uneditable-input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .uneditable-input{border-right-color:#ccc;} +.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-append input:first-child{*margin-left:-160px;}.input-append input:first-child+.add-on{*margin-left:-21px;} +.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} +.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;} +.form-search label,.form-inline label,.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{display:inline-block;} +.form-search .input-append .add-on,.form-inline .input-prepend .add-on,.form-search .input-append .add-on,.form-inline .input-prepend .add-on{vertical-align:middle;} +.control-group{margin-bottom:9px;} +.form-horizontal legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;} +.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";} +.form-horizontal .control-group:after{clear:both;} +.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;} +.form-horizontal .controls{margin-left:160px;} +.form-horizontal .form-actions{padding-left:160px;} +table{max-width:100%;border-collapse:collapse;border-spacing:0;} +.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} +.table th{font-weight:bold;vertical-align:bottom;} +.table td{vertical-align:top;} +.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;} +.table tbody+tbody{border-top:2px solid #ddd;} +.table-condensed th,.table-condensed td{padding:4px 5px;} +.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;} +.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} +.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} +.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} +.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} +.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} +.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} +table .span1{float:none;width:44px;margin-left:0;} +table .span2{float:none;width:124px;margin-left:0;} +table .span3{float:none;width:204px;margin-left:0;} +table .span4{float:none;width:284px;margin-left:0;} +table .span5{float:none;width:364px;margin-left:0;} +table .span6{float:none;width:444px;margin-left:0;} +table .span7{float:none;width:524px;margin-left:0;} +table .span8{float:none;width:604px;margin-left:0;} +table .span9{float:none;width:684px;margin-left:0;} +table .span10{float:none;width:764px;margin-left:0;} +table .span11{float:none;width:844px;margin-left:0;} +table .span12{float:none;width:924px;margin-left:0;} +[class^="icon-"]{display:inline-block;width:14px;height:14px;vertical-align:text-top;background-image:url(../img/glyphicons-halflings.png);background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child{*margin-left:0;} +.icon-white{background-image:url(../img/glyphicons-halflings-white.png);} +.icon-glass{background-position:0 0;} +.icon-music{background-position:-24px 0;} +.icon-search{background-position:-48px 0;} +.icon-envelope{background-position:-72px 0;} +.icon-heart{background-position:-96px 0;} +.icon-star{background-position:-120px 0;} +.icon-star-empty{background-position:-144px 0;} +.icon-user{background-position:-168px 0;} +.icon-film{background-position:-192px 0;} +.icon-th-large{background-position:-216px 0;} +.icon-th{background-position:-240px 0;} +.icon-th-list{background-position:-264px 0;} +.icon-ok{background-position:-288px 0;} +.icon-remove{background-position:-312px 0;} +.icon-zoom-in{background-position:-336px 0;} +.icon-zoom-out{background-position:-360px 0;} +.icon-off{background-position:-384px 0;} +.icon-signal{background-position:-408px 0;} +.icon-cog{background-position:-432px 0;} +.icon-trash{background-position:-456px 0;} +.icon-home{background-position:0 -24px;} +.icon-file{background-position:-24px -24px;} +.icon-time{background-position:-48px -24px;} +.icon-road{background-position:-72px -24px;} +.icon-download-alt{background-position:-96px -24px;} +.icon-download{background-position:-120px -24px;} +.icon-upload{background-position:-144px -24px;} +.icon-inbox{background-position:-168px -24px;} +.icon-play-circle{background-position:-192px -24px;} +.icon-repeat{background-position:-216px -24px;} +.icon-refresh{background-position:-240px -24px;} +.icon-list-alt{background-position:-264px -24px;} +.icon-lock{background-position:-287px -24px;} +.icon-flag{background-position:-312px -24px;} +.icon-headphones{background-position:-336px -24px;} +.icon-volume-off{background-position:-360px -24px;} +.icon-volume-down{background-position:-384px -24px;} +.icon-volume-up{background-position:-408px -24px;} +.icon-qrcode{background-position:-432px -24px;} +.icon-barcode{background-position:-456px -24px;} +.icon-tag{background-position:0 -48px;} +.icon-tags{background-position:-25px -48px;} +.icon-book{background-position:-48px -48px;} +.icon-bookmark{background-position:-72px -48px;} +.icon-print{background-position:-96px -48px;} +.icon-camera{background-position:-120px -48px;} +.icon-font{background-position:-144px -48px;} +.icon-bold{background-position:-167px -48px;} +.icon-italic{background-position:-192px -48px;} +.icon-text-height{background-position:-216px -48px;} +.icon-text-width{background-position:-240px -48px;} +.icon-align-left{background-position:-264px -48px;} +.icon-align-center{background-position:-288px -48px;} +.icon-align-right{background-position:-312px -48px;} +.icon-align-justify{background-position:-336px -48px;} +.icon-list{background-position:-360px -48px;} +.icon-indent-left{background-position:-384px -48px;} +.icon-indent-right{background-position:-408px -48px;} +.icon-facetime-video{background-position:-432px -48px;} +.icon-picture{background-position:-456px -48px;} +.icon-pencil{background-position:0 -72px;} +.icon-map-marker{background-position:-24px -72px;} +.icon-adjust{background-position:-48px -72px;} +.icon-tint{background-position:-72px -72px;} +.icon-edit{background-position:-96px -72px;} +.icon-share{background-position:-120px -72px;} +.icon-check{background-position:-144px -72px;} +.icon-move{background-position:-168px -72px;} +.icon-step-backward{background-position:-192px -72px;} +.icon-fast-backward{background-position:-216px -72px;} +.icon-backward{background-position:-240px -72px;} +.icon-play{background-position:-264px -72px;} +.icon-pause{background-position:-288px -72px;} +.icon-stop{background-position:-312px -72px;} +.icon-forward{background-position:-336px -72px;} +.icon-fast-forward{background-position:-360px -72px;} +.icon-step-forward{background-position:-384px -72px;} +.icon-eject{background-position:-408px -72px;} +.icon-chevron-left{background-position:-432px -72px;} +.icon-chevron-right{background-position:-456px -72px;} +.icon-plus-sign{background-position:0 -96px;} +.icon-minus-sign{background-position:-24px -96px;} +.icon-remove-sign{background-position:-48px -96px;} +.icon-ok-sign{background-position:-72px -96px;} +.icon-question-sign{background-position:-96px -96px;} +.icon-info-sign{background-position:-120px -96px;} +.icon-screenshot{background-position:-144px -96px;} +.icon-remove-circle{background-position:-168px -96px;} +.icon-ok-circle{background-position:-192px -96px;} +.icon-ban-circle{background-position:-216px -96px;} +.icon-arrow-left{background-position:-240px -96px;} +.icon-arrow-right{background-position:-264px -96px;} +.icon-arrow-up{background-position:-289px -96px;} +.icon-arrow-down{background-position:-312px -96px;} +.icon-share-alt{background-position:-336px -96px;} +.icon-resize-full{background-position:-360px -96px;} +.icon-resize-small{background-position:-384px -96px;} +.icon-plus{background-position:-408px -96px;} +.icon-minus{background-position:-433px -96px;} +.icon-asterisk{background-position:-456px -96px;} +.icon-exclamation-sign{background-position:0 -120px;} +.icon-gift{background-position:-24px -120px;} +.icon-leaf{background-position:-48px -120px;} +.icon-fire{background-position:-72px -120px;} +.icon-eye-open{background-position:-96px -120px;} +.icon-eye-close{background-position:-120px -120px;} +.icon-warning-sign{background-position:-144px -120px;} +.icon-plane{background-position:-168px -120px;} +.icon-calendar{background-position:-192px -120px;} +.icon-random{background-position:-216px -120px;} +.icon-comment{background-position:-240px -120px;} +.icon-magnet{background-position:-264px -120px;} +.icon-chevron-up{background-position:-288px -120px;} +.icon-chevron-down{background-position:-313px -119px;} +.icon-retweet{background-position:-336px -120px;} +.icon-shopping-cart{background-position:-360px -120px;} +.icon-folder-close{background-position:-384px -120px;} +.icon-folder-open{background-position:-408px -120px;} +.icon-resize-vertical{background-position:-432px -119px;} +.icon-resize-horizontal{background-position:-456px -118px;} +.dropdown{position:relative;} +.dropdown-toggle{*margin-bottom:-3px;} +.dropdown-toggle:active,.open .dropdown-toggle{outline:0;} +.caret{display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";} +.dropdown .caret{margin-top:8px;margin-left:2px;} +.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;} +.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} +.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;} +.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;} +.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} +.dropdown.open .dropdown-menu{display:block;} +.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} +.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} +.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;} +.btn{display:inline-block;padding:4px 10px 4px;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} +.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} +.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;color:rgba(0, 0, 0, 0.5);outline:0;} +.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.btn-large .icon{margin-top:1px;} +.btn-small{padding:5px 9px;font-size:11px;line-height:16px;} +.btn-small .icon{margin-top:-1px;} +.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;} +.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active{color:rgba(255, 255, 255, 0.75);} +.btn-primary{background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-ms-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(top, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0044cc;} +.btn-primary:active,.btn-primary.active{background-color:#003399 \9;} +.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;} +.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} +.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;} +.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} +.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;} +.btn-success:active,.btn-success.active{background-color:#408140 \9;} +.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;} +.btn-info:active,.btn-info.active{background-color:#24748c \9;} +button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} +button.btn.large,input[type="submit"].btn.large{*padding-top:7px;*padding-bottom:7px;} +button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom:3px;} +.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";} +.btn-group:after{clear:both;} +.btn-group:first-child{*margin-left:0;} +.btn-group+.btn-group{margin-left:5px;} +.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} +.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} +.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} +.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} +.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} +.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;} +.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} +.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:5px;*padding-bottom:5px;} +.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn .caret{margin-top:7px;margin-left:0;} +.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);} +.btn-primary .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} +.btn-small .caret{margin-top:4px;} +.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.alert,.alert-heading{color:#c09853;} +.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;} +.alert-success{background-color:#dff0d8;border-color:#d6e9c6;} +.alert-success,.alert-success .alert-heading{color:#468847;} +.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;} +.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;} +.alert-info{background-color:#d9edf7;border-color:#bce8f1;} +.alert-info,.alert-info .alert-heading{color:#3a87ad;} +.alert-block{padding-top:14px;padding-bottom:14px;} +.alert-block>p,.alert-block>ul{margin-bottom:0;} +.alert-block p+p{margin-top:5px;} +.nav{margin-left:0;margin-bottom:18px;list-style:none;} +.nav>li>a{display:block;} +.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} +.nav-list{padding-left:14px;padding-right:14px;margin-bottom:0;} +.nav-list>li>a,.nav-list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.nav-list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;} +.nav-list>li+.nav-header{margin-top:9px;} +.nav-list .active>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} +.nav-list .icon{margin-right:2px;} +.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";} +.nav-tabs:after,.nav-pills:after{clear:both;} +.nav-tabs>li,.nav-pills>li{float:left;} +.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} +.nav-tabs{border-bottom:1px solid #ddd;} +.nav-tabs>li{margin-bottom:-1px;} +.nav-tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} +.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.nav-pills .active>a,.nav-pills .active>a:hover{color:#ffffff;background-color:#0088cc;} +.nav-stacked>li{float:none;} +.nav-stacked>li>a{margin-right:0;} +.nav-tabs.nav-stacked{border-bottom:0;} +.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} +.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} +.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;} +.nav-pills.nav-stacked>li>a{margin-bottom:3px;} +.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} +.nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;} +.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;} +.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;} +.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;} +.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;} +.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;} +.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;opacity:1;filter:alpha(opacity=100);} +.tabs-stacked .open>a:hover{border-color:#999999;} +.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";} +.tabbable:after{clear:both;} +.tabs-below .nav-tabs,.tabs-right .nav-tabs,.tabs-left .nav-tabs{border-bottom:0;} +.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} +.tab-content>.active,.pill-content>.active{display:block;} +.tabs-below .nav-tabs{border-top:1px solid #ddd;} +.tabs-below .nav-tabs>li{margin-top:-1px;margin-bottom:0;} +.tabs-below .nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} +.tabs-below .nav-tabs .active>a,.tabs-below .nav-tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;} +.tabs-left .nav-tabs>li,.tabs-right .nav-tabs>li{float:none;} +.tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} +.tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} +.tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} +.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} +.tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} +.tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} +.tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} +.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} +.tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} +.navbar{overflow:visible;margin-bottom:18px;} +.navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;} +.btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;} +.btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} +.btn-navbar .icon-bar+.icon-bar{margin-top:3px;} +.nav-collapse.collapse{height:auto;} +.navbar .brand:hover{text-decoration:none;} +.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} +.navbar .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}.navbar .navbar-text a:hover{color:#ffffff;background-color:transparent;} +.navbar .btn,.navbar .btn-group{margin-top:5px;} +.navbar .btn-group .btn{margin-top:0;} +.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";} +.navbar-form:after{clear:both;} +.navbar-form input,.navbar-form select{display:inline-block;margin-top:5px;margin-bottom:0;} +.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} +.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} +.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#666;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;} +.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;} +.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);} +.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} +.navbar-fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030;} +.navbar-fixed-top .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} +.navbar .nav.pull-right{float:right;} +.navbar .nav>li{display:block;float:left;} +.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;} +.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);} +.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;} +.navbar .nav.pull-right{margin-left:10px;margin-right:0;} +.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} +.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} +.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;} +.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);} +.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;} +.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;} +.navbar .nav.pull-right .dropdown-menu{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;} +.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;} +.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} +.breadcrumb .divider{padding:0 5px;color:#999999;} +.breadcrumb .active a{color:#333333;} +.pagination{height:36px;margin:18px 0;} +.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} +.pagination li{display:inline;} +.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} +.pagination a:hover,.pagination .active a{background-color:#f5f5f5;} +.pagination .active a{color:#999999;cursor:default;} +.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} +.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.pagination-centered{text-align:center;} +.pagination-right{text-align:right;} +.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";} +.pager:after{clear:both;} +.pager li{display:inline;} +.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} +.pager a:hover{text-decoration:none;background-color:#f5f5f5;} +.pager .next a{float:right;} +.pager .previous a{float:left;} +.modal-open .dropdown-menu{z-index:2050;} +.modal-open .dropdown.open{*z-index:2050;} +.modal-open .popover{z-index:2060;} +.modal-open .tooltip{z-index:2070;} +.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} +.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} +.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} +.modal.fade.in{top:50%;} +.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} +.modal-body{padding:15px;} +.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";} +.modal-footer:after{clear:both;} +.modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;} +.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} +.tooltip.top{margin-top:-2px;} +.tooltip.right{margin-left:2px;} +.tooltip.bottom{margin-top:2px;} +.tooltip.left{margin-left:-2px;} +.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.tooltip-arrow{position:absolute;width:0;height:0;} +.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;} +.popover.right{margin-left:5px;} +.popover.bottom{margin-top:5px;} +.popover.left{margin-left:-5px;} +.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.popover .arrow{position:absolute;width:0;height:0;} +.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} +.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;} +.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";} +.thumbnails:after{clear:both;} +.thumbnails>li{float:left;margin:0 0 18px 20px;} +.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);} +a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} +.thumbnail .caption{padding:9px;} +.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.label-important{background-color:#b94a48;} +.label-warning{background-color:#f89406;} +.label-success{background-color:#468847;} +.label-info{background-color:#3a87ad;} +@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} +.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} +.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} +.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);} +.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);} +.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} +.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.accordion{margin-bottom:18px;} +.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.accordion-heading{border-bottom:0;} +.accordion-heading .accordion-toggle{display:block;padding:8px 15px;} +.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} +.carousel{position:relative;margin-bottom:18px;line-height:1;} +.carousel-inner{overflow:hidden;width:100%;position:relative;} +.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} +.carousel .item>img{display:block;line-height:1;} +.carousel .active,.carousel .next,.carousel .prev{display:block;} +.carousel .active{left:0;} +.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} +.carousel .next{left:100%;} +.carousel .prev{left:-100%;} +.carousel .next.left,.carousel .prev.right{left:0;} +.carousel .active.left{left:-100%;} +.carousel .active.right{left:100%;} +.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} +.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} +.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} +.carousel-caption h4,.carousel-caption p{color:#ffffff;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit p{font-size:18px;font-weight:200;line-height:27px;} +.pull-right{float:right;} +.pull-left{float:left;} +.hide{display:none;} +.show{display:block;} +.invisible{visibility:hidden;} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.responsive b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.responsive new file mode 100644 index 0000000000..bc3f2ab71a --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.responsive @@ -0,0 +1,3 @@ + +.hidden{display:none;visibility:hidden;} +@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:18px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;height:28px;-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;} 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:768px){.container{width:auto;padding:0 20px;} .row-fluid{width:100%;} .row{margin-left:0;} .row>[class*="span"],.row-fluid>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:980px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} .span1{width:42px;} .span2{width:104px;} .span3{width:166px;} .span4{width:228px;} .span5{width:290px;} .span6{width:352px;} .span7{width:414px;} .span8{width:476px;} .span9{width:538px;} .span10{width:600px;} .span11{width:662px;} .span12,.container{width:724px;} .offset1{margin-left:82px;} .offset2{margin-left:144px;} .offset3{margin-left:206px;} .offset4{margin-left:268px;} .offset5{margin-left:330px;} .offset6{margin-left:392px;} .offset7{margin-left:454px;} .offset8{margin-left:516px;} .offset9{margin-left:578px;} .offset10{margin-left:640px;} .offset11{margin-left:702px;} .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 .span1{width:5.801104972%;} .row-fluid .span2{width:14.364640883%;} .row-fluid .span3{width:22.928176794%;} .row-fluid .span4{width:31.491712705%;} .row-fluid .span5{width:40.055248616%;} .row-fluid .span6{width:48.618784527%;} .row-fluid .span7{width:57.182320438000005%;} .row-fluid .span8{width:65.74585634900001%;} .row-fluid .span9{width:74.30939226%;} .row-fluid .span10{width:82.87292817100001%;} .row-fluid .span11{width:91.436464082%;} .row-fluid .span12{width:99.999999993%;} input.span1,textarea.span1,.uneditable-input.span1{width:32px;} input.span2,textarea.span2,.uneditable-input.span2{width:94px;} input.span3,textarea.span3,.uneditable-input.span3{width:156px;} input.span4,textarea.span4,.uneditable-input.span4{width:218px;} input.span5,textarea.span5,.uneditable-input.span5{width:280px;} input.span6,textarea.span6,.uneditable-input.span6{width:342px;} input.span7,textarea.span7,.uneditable-input.span7{width:404px;} input.span8,textarea.span8,.uneditable-input.span8{width:466px;} input.span9,textarea.span9,.uneditable-input.span9{width:528px;} input.span10,textarea.span10,.uneditable-input.span10{width:590px;} input.span11,textarea.span11,.uneditable-input.span11{width:652px;} input.span12,textarea.span12,.uneditable-input.span12{width:714px;}}@media (max-width:980px){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>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;}}@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;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12,.container{width:1170px;} .offset1{margin-left:130px;} .offset2{margin-left:230px;} .offset3{margin-left:330px;} .offset4{margin-left:430px;} .offset5{margin-left:530px;} .offset6{margin-left:630px;} .offset7{margin-left:730px;} .offset8{margin-left:830px;} .offset9{margin-left:930px;} .offset10{margin-left:1030px;} .offset11{margin-left:1130px;} .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 .span1{width:5.982905983%;} .row-fluid .span2{width:14.529914530000001%;} .row-fluid .span3{width:23.076923077%;} .row-fluid .span4{width:31.623931624%;} .row-fluid .span5{width:40.170940171000005%;} .row-fluid .span6{width:48.717948718%;} .row-fluid .span7{width:57.264957265%;} .row-fluid .span8{width:65.81196581200001%;} .row-fluid .span9{width:74.358974359%;} .row-fluid .span10{width:82.905982906%;} .row-fluid .span11{width:91.45299145300001%;} .row-fluid .span12{width:100%;} input.span1,textarea.span1,.uneditable-input.span1{width:60px;} input.span2,textarea.span2,.uneditable-input.span2{width:160px;} input.span3,textarea.span3,.uneditable-input.span3{width:260px;} input.span4,textarea.span4,.uneditable-input.span4{width:360px;} input.span5,textarea.span5,.uneditable-input.span5{width:460px;} input.span6,textarea.span6,.uneditable-input.span6{width:560px;} input.span7,textarea.span7,.uneditable-input.span7{width:660px;} input.span8,textarea.span8,.uneditable-input.span8{width:760px;} input.span9,textarea.span9,.uneditable-input.span9{width:860px;} input.span10,textarea.span10,.uneditable-input.span10{width:960px;} input.span11,textarea.span11,.uneditable-input.span11{width:1060px;} input.span12,textarea.span12,.uneditable-input.span12{width:1160px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;}} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.responsive b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.responsive new file mode 100644 index 0000000000..4b032cdb55 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.responsive @@ -0,0 +1,567 @@ +/*! + * Bootstrap Responsive v2.0.0 + * + * 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. + */ +.hidden { + display: none; + visibility: hidden; +} +@media (max-width: 480px) { + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); + } + .page-header h1 small { + display: block; + line-height: 18px; + } + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + 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; + /* Older Webkit */ + + -moz-box-sizing: border-box; + /* Older FF */ + + -ms-box-sizing: border-box; + /* IE8 */ + + box-sizing: border-box; + /* CSS3 spec*/ + + } + .input-prepend input[class*="span"], .input-append input[class*="span"] { + width: auto; + } + 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: 768px) { + .container { + width: auto; + padding: 0 20px; + } + .row-fluid { + width: 100%; + } + .row { + margin-left: 0; + } + .row > [class*="span"], .row-fluid > [class*="span"] { + float: none; + display: block; + width: auto; + margin: 0; + } +} +@media (min-width: 768px) and (max-width: 980px) { + .row { + margin-left: -20px; + *zoom: 1; + } + .row:before, .row:after { + display: table; + content: ""; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + margin-left: 20px; + } + .span1 { + width: 42px; + } + .span2 { + width: 104px; + } + .span3 { + width: 166px; + } + .span4 { + width: 228px; + } + .span5 { + width: 290px; + } + .span6 { + width: 352px; + } + .span7 { + width: 414px; + } + .span8 { + width: 476px; + } + .span9 { + width: 538px; + } + .span10 { + width: 600px; + } + .span11 { + width: 662px; + } + .span12, .container { + width: 724px; + } + .offset1 { + margin-left: 82px; + } + .offset2 { + margin-left: 144px; + } + .offset3 { + margin-left: 206px; + } + .offset4 { + margin-left: 268px; + } + .offset5 { + margin-left: 330px; + } + .offset6 { + margin-left: 392px; + } + .offset7 { + margin-left: 454px; + } + .offset8 { + margin-left: 516px; + } + .offset9 { + margin-left: 578px; + } + .offset10 { + margin-left: 640px; + } + .offset11 { + margin-left: 702px; + } + .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 .span1 { + width: 5.801104972%; + } + .row-fluid .span2 { + width: 14.364640883%; + } + .row-fluid .span3 { + width: 22.928176794%; + } + .row-fluid .span4 { + width: 31.491712705%; + } + .row-fluid .span5 { + width: 40.055248616%; + } + .row-fluid .span6 { + width: 48.618784527%; + } + .row-fluid .span7 { + width: 57.182320438000005%; + } + .row-fluid .span8 { + width: 65.74585634900001%; + } + .row-fluid .span9 { + width: 74.30939226%; + } + .row-fluid .span10 { + width: 82.87292817100001%; + } + .row-fluid .span11 { + width: 91.436464082%; + } + .row-fluid .span12 { + width: 99.999999993%; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 32px; + } + input.span2, textarea.span2, .uneditable-input.span2 { + width: 94px; + } + input.span3, textarea.span3, .uneditable-input.span3 { + width: 156px; + } + input.span4, textarea.span4, .uneditable-input.span4 { + width: 218px; + } + input.span5, textarea.span5, .uneditable-input.span5 { + width: 280px; + } + input.span6, textarea.span6, .uneditable-input.span6 { + width: 342px; + } + input.span7, textarea.span7, .uneditable-input.span7 { + width: 404px; + } + input.span8, textarea.span8, .uneditable-input.span8 { + width: 466px; + } + input.span9, textarea.span9, .uneditable-input.span9 { + width: 528px; + } + input.span10, textarea.span10, .uneditable-input.span10 { + width: 590px; + } + input.span11, textarea.span11, .uneditable-input.span11 { + width: 652px; + } + input.span12, textarea.span12, .uneditable-input.span12 { + width: 714px; + } +} +@media (max-width: 980px) { + 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 > 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; + } +} +@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; + } + .span1 { + width: 70px; + } + .span2 { + width: 170px; + } + .span3 { + width: 270px; + } + .span4 { + width: 370px; + } + .span5 { + width: 470px; + } + .span6 { + width: 570px; + } + .span7 { + width: 670px; + } + .span8 { + width: 770px; + } + .span9 { + width: 870px; + } + .span10 { + width: 970px; + } + .span11 { + width: 1070px; + } + .span12, .container { + width: 1170px; + } + .offset1 { + margin-left: 130px; + } + .offset2 { + margin-left: 230px; + } + .offset3 { + margin-left: 330px; + } + .offset4 { + margin-left: 430px; + } + .offset5 { + margin-left: 530px; + } + .offset6 { + margin-left: 630px; + } + .offset7 { + margin-left: 730px; + } + .offset8 { + margin-left: 830px; + } + .offset9 { + margin-left: 930px; + } + .offset10 { + margin-left: 1030px; + } + .offset11 { + margin-left: 1130px; + } + .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 .span1 { + width: 5.982905983%; + } + .row-fluid .span2 { + width: 14.529914530000001%; + } + .row-fluid .span3 { + width: 23.076923077%; + } + .row-fluid .span4 { + width: 31.623931624%; + } + .row-fluid .span5 { + width: 40.170940171000005%; + } + .row-fluid .span6 { + width: 48.717948718%; + } + .row-fluid .span7 { + width: 57.264957265%; + } + .row-fluid .span8 { + width: 65.81196581200001%; + } + .row-fluid .span9 { + width: 74.358974359%; + } + .row-fluid .span10 { + width: 82.905982906%; + } + .row-fluid .span11 { + width: 91.45299145300001%; + } + .row-fluid .span12 { + width: 100%; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 60px; + } + input.span2, textarea.span2, .uneditable-input.span2 { + width: 160px; + } + input.span3, textarea.span3, .uneditable-input.span3 { + width: 260px; + } + input.span4, textarea.span4, .uneditable-input.span4 { + width: 360px; + } + input.span5, textarea.span5, .uneditable-input.span5 { + width: 460px; + } + input.span6, textarea.span6, .uneditable-input.span6 { + width: 560px; + } + input.span7, textarea.span7, .uneditable-input.span7 { + width: 660px; + } + input.span8, textarea.span8, .uneditable-input.span8 { + width: 760px; + } + input.span9, textarea.span9, .uneditable-input.span9 { + width: 860px; + } + input.span10, textarea.span10, .uneditable-input.span10 { + width: 960px; + } + input.span11, textarea.span11, .uneditable-input.span11 { + width: 1060px; + } + input.span12, textarea.span12, .uneditable-input.span12 { + width: 1160px; + } + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; + } +} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/img/glyphicons-halflings-white.png b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/img/glyphicons-halflings-white.png new file mode 100644 index 0000000000000000000000000000000000000000..a20760bfde58d1c92cee95116059fba03c68d689 GIT binary patch literal 4352 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 literal 0 HcmV?d00001 diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.js b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.js new file mode 100644 index 0000000000..c832ccb2e6 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.js @@ -0,0 +1,1722 @@ +/* =================================================== + * bootstrap-transition.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#transitions + * =================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +!function( $ ) { + + $(function () { + + "use strict" + + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + * ======================================================= */ + + $.support.transition = (function () { + var thisBody = document.body || document.documentElement + , thisStyle = thisBody.style + , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined + + return support && { + end: (function () { + var transitionEnd = "TransitionEnd" + if ( $.browser.webkit ) { + transitionEnd = "webkitTransitionEnd" + } else if ( $.browser.mozilla ) { + transitionEnd = "transitionend" + } else if ( $.browser.opera ) { + transitionEnd = "oTransitionEnd" + } + return transitionEnd + }()) + } + })() + + }) + +}( window.jQuery ) +/* ========================================================== + * bootstrap-alert.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#alerts + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function( $ ){ + + "use strict" + + /* ALERT CLASS DEFINITION + * ====================== */ + + var dismiss = '[data-dismiss="alert"]' + , Alert = function ( el ) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype = { + + constructor: Alert + + , close: function ( e ) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = $(selector) + $parent.trigger('close') + + e && e.preventDefault() + + $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) + + $parent.removeClass('in') + + function removeElement() { + $parent.remove() + $parent.trigger('closed') + } + + $.support.transition && $parent.hasClass('fade') ? + $parent.on($.support.transition.end, removeElement) : + removeElement() + } + + } + + + /* ALERT PLUGIN DEFINITION + * ======================= */ + + $.fn.alert = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('alert') + if (!data) $this.data('alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + /* ALERT DATA-API + * ============== */ + + $(function () { + $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) + }) + +}( window.jQuery ) +/* ============================================================ + * bootstrap-button.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#buttons + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + +!function( $ ){ + + "use strict" + + /* BUTTON PUBLIC CLASS DEFINITION + * ============================== */ + + var Button = function ( element, options ) { + this.$element = $(element) + this.options = $.extend({}, $.fn.button.defaults, options) + } + + Button.prototype = { + + constructor: Button + + , setState: function ( state ) { + var d = 'disabled' + , $el = this.$element + , data = $el.data() + , val = $el.is('input') ? 'val' : 'html' + + state = state + 'Text' + data.resetText || $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d) + }, 0) + } + + , toggle: function () { + var $parent = this.$element.parent('[data-toggle="buttons-radio"]') + + $parent && $parent + .find('.active') + .removeClass('active') + + this.$element.toggleClass('active') + } + + } + + + /* BUTTON PLUGIN DEFINITION + * ======================== */ + + $.fn.button = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('button') + , options = typeof option == 'object' && option + if (!data) $this.data('button', (data = new Button(this, options))) + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.defaults = { + loadingText: 'loading...' + } + + $.fn.button.Constructor = Button + + + /* BUTTON DATA-API + * =============== */ + + $(function () { + $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { + $(e.target).button('toggle') + }) + }) + +}( window.jQuery ) +/* ========================================================== + * bootstrap-carousel.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#carousel + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function( $ ){ + + "use strict" + + /* CAROUSEL CLASS DEFINITION + * ========================= */ + + var Carousel = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.carousel.defaults, options) + this.options.slide && this.slide(this.options.slide) + } + + Carousel.prototype = { + + cycle: function () { + this.interval = setInterval($.proxy(this.next, this), this.options.interval) + return this + } + + , to: function (pos) { + var $active = this.$element.find('.active') + , children = $active.parent().children() + , activePos = children.index($active) + , that = this + + if (pos > (children.length - 1) || pos < 0) return + + if (this.sliding) { + return this.$element.one('slid', function () { + that.to(pos) + }) + } + + if (activePos == pos) { + return this.pause().cycle() + } + + return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) + } + + , pause: function () { + clearInterval(this.interval) + return this + } + + , next: function () { + if (this.sliding) return + return this.slide('next') + } + + , prev: function () { + if (this.sliding) return + return this.slide('prev') + } + + , slide: function (type, next) { + var $active = this.$element.find('.active') + , $next = next || $active[type]() + , isCycling = this.interval + , direction = type == 'next' ? 'left' : 'right' + , fallback = type == 'next' ? 'first' : 'last' + , that = this + + this.sliding = true + + isCycling && this.pause() + + $next = $next.length ? $next : this.$element.find('.item')[fallback]() + + if (!$.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger('slide') + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } else { + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + this.$element.trigger('slide') + this.$element.one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + } + + isCycling && this.cycle() + + return this + } + + } + + + /* CAROUSEL PLUGIN DEFINITION + * ========================== */ + + $.fn.carousel = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('carousel') + , options = typeof option == 'object' && option + if (!data) $this.data('carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (typeof option == 'string' || (option = options.slide)) data[option]() + else data.cycle() + }) + } + + $.fn.carousel.defaults = { + interval: 5000 + } + + $.fn.carousel.Constructor = Carousel + + + /* CAROUSEL DATA-API + * ================= */ + + $(function () { + $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) + $target.carousel(options) + e.preventDefault() + }) + }) + +}( window.jQuery ) +/* ============================================================= + * bootstrap-collapse.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#collapse + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + +!function( $ ){ + + "use strict" + + var Collapse = function ( element, options ) { + this.$element = $(element) + this.options = $.extend({}, $.fn.collapse.defaults, options) + + if (this.options["parent"]) { + this.$parent = $(this.options["parent"]) + } + + this.options.toggle && this.toggle() + } + + Collapse.prototype = { + + constructor: Collapse + + , dimension: function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + , show: function () { + var dimension = this.dimension() + , scroll = $.camelCase(['scroll', dimension].join('-')) + , actives = this.$parent && this.$parent.find('.in') + , hasData + + if (actives && actives.length) { + hasData = actives.data('collapse') + actives.collapse('hide') + hasData || actives.data('collapse', null) + } + + this.$element[dimension](0) + this.transition('addClass', 'show', 'shown') + this.$element[dimension](this.$element[0][scroll]) + + } + + , hide: function () { + var dimension = this.dimension() + this.reset(this.$element[dimension]()) + this.transition('removeClass', 'hide', 'hidden') + this.$element[dimension](0) + } + + , reset: function ( size ) { + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + [dimension](size || 'auto') + [0].offsetWidth + + this.$element.addClass('collapse') + } + + , transition: function ( method, startEvent, completeEvent ) { + var that = this + , complete = function () { + if (startEvent == 'show') that.reset() + that.$element.trigger(completeEvent) + } + + this.$element + .trigger(startEvent) + [method]('in') + + $.support.transition && this.$element.hasClass('collapse') ? + this.$element.one($.support.transition.end, complete) : + complete() + } + + , toggle: function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + } + + /* COLLAPSIBLE PLUGIN DEFINITION + * ============================== */ + + $.fn.collapse = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('collapse') + , options = typeof option == 'object' && option + if (!data) $this.data('collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.defaults = { + toggle: true + } + + $.fn.collapse.Constructor = Collapse + + + /* COLLAPSIBLE DATA-API + * ==================== */ + + $(function () { + $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { + var $this = $(this), href + , target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + , option = $(target).data('collapse') ? 'toggle' : $this.data() + $(target).collapse(option) + }) + }) + +}( window.jQuery ) +/* ============================================================ + * bootstrap-dropdown.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function( $ ){ + + "use strict" + + /* DROPDOWN CLASS DEFINITION + * ========================= */ + + var toggle = '[data-toggle="dropdown"]' + , Dropdown = function ( element ) { + var $el = $(element).on('click.dropdown.data-api', this.toggle) + $('html').on('click.dropdown.data-api', function () { + $el.parent().removeClass('open') + }) + } + + Dropdown.prototype = { + + constructor: Dropdown + + , toggle: function ( e ) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent + , isActive + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = $(selector) + $parent.length || ($parent = $this.parent()) + + isActive = $parent.hasClass('open') + + clearMenus() + !isActive && $parent.toggleClass('open') + + return false + } + + } + + function clearMenus() { + $(toggle).parent().removeClass('open') + } + + + /* DROPDOWN PLUGIN DEFINITION + * ========================== */ + + $.fn.dropdown = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('dropdown') + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + /* APPLY TO STANDARD DROPDOWN ELEMENTS + * =================================== */ + + $(function () { + $('html').on('click.dropdown.data-api', clearMenus) + $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) + }) + +}( window.jQuery ) +/* ========================================================= + * bootstrap-modal.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#modals + * ========================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= */ + + +!function( $ ){ + + "use strict" + + /* MODAL CLASS DEFINITION + * ====================== */ + + var Modal = function ( content, options ) { + this.options = $.extend({}, $.fn.modal.defaults, options) + this.$element = $(content) + .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + } + + Modal.prototype = { + + constructor: Modal + + , toggle: function () { + return this[!this.isShown ? 'show' : 'hide']() + } + + , show: function () { + var that = this + + if (this.isShown) return + + $('body').addClass('modal-open') + + this.isShown = true + this.$element.trigger('show') + + escape.call(this) + backdrop.call(this, function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position + + that.$element + .show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element.addClass('in') + + transition ? + that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : + that.$element.trigger('shown') + + }) + } + + , hide: function ( e ) { + e && e.preventDefault() + + if (!this.isShown) return + + var that = this + this.isShown = false + + $('body').removeClass('modal-open') + + escape.call(this) + + this.$element + .trigger('hide') + .removeClass('in') + + $.support.transition && this.$element.hasClass('fade') ? + hideWithTransition.call(this) : + hideModal.call(this) + } + + } + + + /* MODAL PRIVATE METHODS + * ===================== */ + + function hideWithTransition() { + var that = this + , timeout = setTimeout(function () { + that.$element.off($.support.transition.end) + hideModal.call(that) + }, 500) + + this.$element.one($.support.transition.end, function () { + clearTimeout(timeout) + hideModal.call(that) + }) + } + + function hideModal( that ) { + this.$element + .hide() + .trigger('hidden') + + backdrop.call(this) + } + + function backdrop( callback ) { + var that = this + , animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
') + .appendTo(document.body) + + if (this.options.backdrop != 'static') { + this.$backdrop.click($.proxy(this.hide, this)) + } + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + doAnimate ? + this.$backdrop.one($.support.transition.end, callback) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade')? + this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : + removeBackdrop.call(this) + + } else if (callback) { + callback() + } + } + + function removeBackdrop() { + this.$backdrop.remove() + this.$backdrop = null + } + + function escape() { + var that = this + if (this.isShown && this.options.keyboard) { + $(document).on('keyup.dismiss.modal', function ( e ) { + e.which == 27 && that.hide() + }) + } else if (!this.isShown) { + $(document).off('keyup.dismiss.modal') + } + } + + + /* MODAL PLUGIN DEFINITION + * ======================= */ + + $.fn.modal = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('modal') + , options = typeof option == 'object' && option + if (!data) $this.data('modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option]() + else data.show() + }) + } + + $.fn.modal.defaults = { + backdrop: true + , keyboard: true + } + + $.fn.modal.Constructor = Modal + + + /* MODAL DATA-API + * ============== */ + + $(function () { + $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) + + e.preventDefault() + $target.modal(option) + }) + }) + +}( window.jQuery ) +/* =========================================================== + * bootstrap-tooltip.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#tooltips + * Inspired by the original jQuery.tipsy by Jason Frame + * =========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +!function( $ ) { + + "use strict" + + /* TOOLTIP PUBLIC CLASS DEFINITION + * =============================== */ + + var Tooltip = function ( element, options ) { + this.init('tooltip', element, options) + } + + Tooltip.prototype = { + + constructor: Tooltip + + , init: function ( type, element, options ) { + var eventIn + , eventOut + + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + this.enabled = true + + if (this.options.trigger != 'manual') { + eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' + eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' + this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + , getOptions: function ( options ) { + options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + + return options + } + + , enter: function ( e ) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + + if (!self.options.delay || !self.options.delay.show) { + self.show() + } else { + self.hoverState = 'in' + setTimeout(function() { + if (self.hoverState == 'in') { + self.show() + } + }, self.options.delay.show) + } + } + + , leave: function ( e ) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + + if (!self.options.delay || !self.options.delay.hide) { + self.hide() + } else { + self.hoverState = 'out' + setTimeout(function() { + if (self.hoverState == 'out') { + self.hide() + } + }, self.options.delay.hide) + } + } + + , show: function () { + var $tip + , inside + , pos + , actualWidth + , actualHeight + , placement + , tp + + if (this.hasContent() && this.enabled) { + $tip = this.tip() + this.setContent() + + if (this.options.animation) { + $tip.addClass('fade') + } + + placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + inside = /in/.test(placement) + + $tip + .remove() + .css({ top: 0, left: 0, display: 'block' }) + .appendTo(inside ? this.$element : document.body) + + pos = this.getPosition(inside) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + + switch (inside ? placement.split(' ')[1] : placement) { + case 'bottom': + tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'top': + tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'left': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} + break + case 'right': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} + break + } + + $tip + .css(tp) + .addClass(placement) + .addClass('in') + } + } + + , setContent: function () { + var $tip = this.tip() + $tip.find('.tooltip-inner').html(this.getTitle()) + $tip.removeClass('fade in top bottom left right') + } + + , hide: function () { + var that = this + , $tip = this.tip() + + $tip.removeClass('in') + + function removeWithAnimation() { + var timeout = setTimeout(function () { + $tip.off($.support.transition.end).remove() + }, 500) + + $tip.one($.support.transition.end, function () { + clearTimeout(timeout) + $tip.remove() + }) + } + + $.support.transition && this.$tip.hasClass('fade') ? + removeWithAnimation() : + $tip.remove() + } + + , fixTitle: function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') + } + } + + , hasContent: function () { + return this.getTitle() + } + + , getPosition: function (inside) { + return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { + width: this.$element[0].offsetWidth + , height: this.$element[0].offsetHeight + }) + } + + , getTitle: function () { + var title + , $e = this.$element + , o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + title = title.toString().replace(/(^\s*|\s*$)/, "") + + return title + } + + , tip: function () { + return this.$tip = this.$tip || $(this.options.template) + } + + , validate: function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + , enable: function () { + this.enabled = true + } + + , disable: function () { + this.enabled = false + } + + , toggleEnabled: function () { + this.enabled = !this.enabled + } + + , toggle: function () { + this[this.tip().hasClass('in') ? 'hide' : 'show']() + } + + } + + + /* TOOLTIP PLUGIN DEFINITION + * ========================= */ + + $.fn.tooltip = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tooltip') + , options = typeof option == 'object' && option + if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + $.fn.tooltip.defaults = { + animation: true + , delay: 0 + , selector: false + , placement: 'top' + , trigger: 'hover' + , title: '' + , template: '
' + } + +}( window.jQuery ) +/* =========================================================== + * bootstrap-popover.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#popovers + * =========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =========================================================== */ + + +!function( $ ) { + + "use strict" + + var Popover = function ( element, options ) { + this.init('popover', element, options) + } + + /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js + ========================================== */ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { + + constructor: Popover + + , setContent: function () { + var $tip = this.tip() + , title = this.getTitle() + , content = this.getContent() + + $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) + $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) + + $tip.removeClass('fade top bottom left right in') + } + + , hasContent: function () { + return this.getTitle() || this.getContent() + } + + , getContent: function () { + var content + , $e = this.$element + , o = this.options + + content = $e.attr('data-content') + || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) + + content = content.toString().replace(/(^\s*|\s*$)/, "") + + return content + } + + , tip: function() { + if (!this.$tip) { + this.$tip = $(this.options.template) + } + return this.$tip + } + + }) + + + /* POPOVER PLUGIN DEFINITION + * ======================= */ + + $.fn.popover = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('popover') + , options = typeof option == 'object' && option + if (!data) $this.data('popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.popover.Constructor = Popover + + $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { + placement: 'right' + , content: '' + , template: '

' + }) + +}( window.jQuery ) +/* ============================================================= + * bootstrap-scrollspy.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================== */ + +!function ( $ ) { + + "use strict" + + /* SCROLLSPY CLASS DEFINITION + * ========================== */ + + function ScrollSpy( element, options) { + var process = $.proxy(this.process, this) + , $element = $(element).is('body') ? $(window) : $(element) + , href + this.options = $.extend({}, $.fn.scrollspy.defaults, options) + this.$scrollElement = $element.on('scroll.scroll.data-api', process) + this.selector = (this.options.target + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + || '') + ' .nav li > a' + this.$body = $('body').on('click.scroll.data-api', this.selector, process) + this.refresh() + this.process() + } + + ScrollSpy.prototype = { + + constructor: ScrollSpy + + , refresh: function () { + this.targets = this.$body + .find(this.selector) + .map(function () { + var href = $(this).attr('href') + return /^#\w/.test(href) && $(href).length ? href : null + }) + + this.offsets = $.map(this.targets, function (id) { + return $(id).position().top + }) + } + + , process: function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + , offsets = this.offsets + , targets = this.targets + , activeTarget = this.activeTarget + , i + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate( targets[i] ) + } + } + + , activate: function (target) { + var active + + this.activeTarget = target + + this.$body + .find(this.selector).parent('.active') + .removeClass('active') + + active = this.$body + .find(this.selector + '[href="' + target + '"]') + .parent('li') + .addClass('active') + + if ( active.parent('.dropdown-menu') ) { + active.closest('li.dropdown').addClass('active') + } + } + + } + + + /* SCROLLSPY PLUGIN DEFINITION + * =========================== */ + + $.fn.scrollspy = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('scrollspy') + , options = typeof option == 'object' && option + if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.scrollspy.Constructor = ScrollSpy + + $.fn.scrollspy.defaults = { + offset: 10 + } + + + /* SCROLLSPY DATA-API + * ================== */ + + $(function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + $spy.scrollspy($spy.data()) + }) + }) + +}( window.jQuery ) +/* ======================================================== + * bootstrap-tab.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#tabs + * ======================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================== */ + + +!function( $ ){ + + "use strict" + + /* TAB CLASS DEFINITION + * ==================== */ + + var Tab = function ( element ) { + this.element = $(element) + } + + Tab.prototype = { + + constructor: Tab + + , show: function () { + var $this = this.element + , $ul = $this.closest('ul:not(.dropdown-menu)') + , selector = $this.attr('data-target') + , previous + , $target + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ( $this.parent('li').hasClass('active') ) return + + previous = $ul.find('.active a').last()[0] + + $this.trigger({ + type: 'show' + , relatedTarget: previous + }) + + $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown' + , relatedTarget: previous + }) + }) + } + + , activate: function ( element, container, callback) { + var $active = container.find('> .active') + , transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if ( element.parent('.dropdown-menu') ) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active.one($.support.transition.end, next) : + next() + + $active.removeClass('in') + } + } + + + /* TAB PLUGIN DEFINITION + * ===================== */ + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tab') + if (!data) $this.data('tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + /* TAB DATA-API + * ============ */ + + $(function () { + $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + }) + +}( window.jQuery ) +/* ============================================================= + * bootstrap-typeahead.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#typeahead + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + +!function( $ ){ + + "use strict" + + var Typeahead = function ( element, options ) { + this.$element = $(element) + this.options = $.extend({}, $.fn.typeahead.defaults, options) + this.matcher = this.options.matcher || this.matcher + this.sorter = this.options.sorter || this.sorter + this.highlighter = this.options.highlighter || this.highlighter + this.$menu = $(this.options.menu).appendTo('body') + this.source = this.options.source + this.shown = false + this.listen() + } + + Typeahead.prototype = { + + constructor: Typeahead + + , select: function () { + var val = this.$menu.find('.active').attr('data-value') + this.$element.val(val) + return this.hide() + } + + , show: function () { + var pos = $.extend({}, this.$element.offset(), { + height: this.$element[0].offsetHeight + }) + + this.$menu.css({ + top: pos.top + pos.height + , left: pos.left + }) + + this.$menu.show() + this.shown = true + return this + } + + , hide: function () { + this.$menu.hide() + this.shown = false + return this + } + + , lookup: function (event) { + var that = this + , items + , q + + this.query = this.$element.val() + + if (!this.query) { + return this.shown ? this.hide() : this + } + + items = $.grep(this.source, function (item) { + if (that.matcher(item)) return item + }) + + items = this.sorter(items) + + if (!items.length) { + return this.shown ? this.hide() : this + } + + return this.render(items.slice(0, this.options.items)).show() + } + + , matcher: function (item) { + return ~item.toLowerCase().indexOf(this.query.toLowerCase()) + } + + , sorter: function (items) { + var beginswith = [] + , caseSensitive = [] + , caseInsensitive = [] + , item + + while (item = items.shift()) { + if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) + else if (~item.indexOf(this.query)) caseSensitive.push(item) + else caseInsensitive.push(item) + } + + return beginswith.concat(caseSensitive, caseInsensitive) + } + + , highlighter: function (item) { + return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) { + return '' + match + '' + }) + } + + , render: function (items) { + var that = this + + items = $(items).map(function (i, item) { + i = $(that.options.item).attr('data-value', item) + i.find('a').html(that.highlighter(item)) + return i[0] + }) + + items.first().addClass('active') + this.$menu.html(items) + return this + } + + , next: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , next = active.next() + + if (!next.length) { + next = $(this.$menu.find('li')[0]) + } + + next.addClass('active') + } + + , prev: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , prev = active.prev() + + if (!prev.length) { + prev = this.$menu.find('li').last() + } + + prev.addClass('active') + } + + , listen: function () { + this.$element + .on('blur', $.proxy(this.blur, this)) + .on('keypress', $.proxy(this.keypress, this)) + .on('keyup', $.proxy(this.keyup, this)) + + if ($.browser.webkit || $.browser.msie) { + this.$element.on('keydown', $.proxy(this.keypress, this)) + } + + this.$menu + .on('click', $.proxy(this.click, this)) + .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) + } + + , keyup: function (e) { + e.stopPropagation() + e.preventDefault() + + switch(e.keyCode) { + case 40: // down arrow + case 38: // up arrow + break + + case 9: // tab + case 13: // enter + if (!this.shown) return + this.select() + break + + case 27: // escape + this.hide() + break + + default: + this.lookup() + } + + } + + , keypress: function (e) { + e.stopPropagation() + if (!this.shown) return + + switch(e.keyCode) { + case 9: // tab + case 13: // enter + case 27: // escape + e.preventDefault() + break + + case 38: // up arrow + e.preventDefault() + this.prev() + break + + case 40: // down arrow + e.preventDefault() + this.next() + break + } + } + + , blur: function (e) { + var that = this + e.stopPropagation() + e.preventDefault() + setTimeout(function () { that.hide() }, 150) + } + + , click: function (e) { + e.stopPropagation() + e.preventDefault() + this.select() + } + + , mouseenter: function (e) { + this.$menu.find('.active').removeClass('active') + $(e.currentTarget).addClass('active') + } + + } + + + /* TYPEAHEAD PLUGIN DEFINITION + * =========================== */ + + $.fn.typeahead = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('typeahead') + , options = typeof option == 'object' && option + if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.typeahead.defaults = { + source: [] + , items: 8 + , menu: '
    ' + , item: '
    • ' + } + + $.fn.typeahead.Constructor = Typeahead + + + /* TYPEAHEAD DATA-API + * ================== */ + + $(function () { + $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { + var $this = $(this) + if ($this.data('typeahead')) return + e.preventDefault() + $this.typeahead($this.data()) + }) + }) + +}( window.jQuery ) diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.min.js b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.min.js new file mode 100644 index 0000000000..1f295a14e9 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.min.js @@ -0,0 +1 @@ +!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.remove(),e.trigger("closed")}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){a(b.target).button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide)};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;return this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element.addClass("collapse")},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
    ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=a.extend({},a.fn.modal.defaults,c),this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=typeof c=="object"&&c;e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
    '}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

    '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){a.stopPropagation(),a.preventDefault();switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:this.hide();break;default:this.lookup()}},keypress:function(a){a.stopPropagation();if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}},blur:function(a){var b=this;a.stopPropagation(),a.preventDefault(),setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
      ',item:'
      • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); \ No newline at end of file diff --git a/documentation/website/source/_themes/opendylan/static/jquery.js b/documentation/website/source/_themes/opendylan/static/jquery.js new file mode 100644 index 0000000000..b1b47b81c6 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/jquery.js @@ -0,0 +1,4 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
      a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
      "+""+"
      ",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
      t
      ",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
      ",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

      ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
      ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
      ","
      "],thead:[1,"","
      "],tr:[2,"","
      "],td:[3,"","
      "],col:[2,"","
      "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
      ","
      "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
      ").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); diff --git a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/bootstrap/1.4.0/bootstrap.min.css b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/bootstrap/1.4.0/bootstrap.min.css deleted file mode 100644 index c8f9e23197..0000000000 --- a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/bootstrap/1.4.0/bootstrap.min.css +++ /dev/null @@ -1,356 +0,0 @@ -html,body{margin:0;padding:0;} -h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;} -table{border-collapse:collapse;border-spacing:0;} -ol,ul{list-style:none;} -q:before,q:after,blockquote:before,blockquote:after{content:"";} -html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} -a:focus{outline:thin dotted;} -a:hover,a:active{outline:0;} -article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} -audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} -audio:not([controls]){display:none;} -sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;} -sup{top:-0.5em;} -sub{bottom:-0.25em;} -img{border:0;-ms-interpolation-mode:bicubic;} -button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;} -button,input{line-height:normal;*overflow:visible;} -button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;} -button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} -input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} -input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;} -textarea{overflow:auto;vertical-align:top;} -body{background-color:#ffffff;margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;} -.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;} -.container:after{clear:both;} -.container-fluid{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;} -.container-fluid:after{clear:both;} -.container-fluid>.sidebar{position:absolute;top:0;left:20px;width:220px;} -.container-fluid>.content{margin-left:240px;} -a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;} -.pull-right{float:right;} -.pull-left{float:left;} -.hide{display:none;} -.show{display:block;} -.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;} -.row:after{clear:both;} -.row>[class*="span"]{display:inline;float:left;margin-left:20px;} -.span1{width:40px;} -.span2{width:100px;} -.span3{width:160px;} -.span4{width:220px;} -.span5{width:280px;} -.span6{width:340px;} -.span7{width:400px;} -.span8{width:460px;} -.span9{width:520px;} -.span10{width:580px;} -.span11{width:640px;} -.span12{width:700px;} -.span13{width:760px;} -.span14{width:820px;} -.span15{width:880px;} -.span16{width:940px;} -.span17{width:1000px;} -.span18{width:1060px;} -.span19{width:1120px;} -.span20{width:1180px;} -.span21{width:1240px;} -.span22{width:1300px;} -.span23{width:1360px;} -.span24{width:1420px;} -.row>.offset1{margin-left:80px;} -.row>.offset2{margin-left:140px;} -.row>.offset3{margin-left:200px;} -.row>.offset4{margin-left:260px;} -.row>.offset5{margin-left:320px;} -.row>.offset6{margin-left:380px;} -.row>.offset7{margin-left:440px;} -.row>.offset8{margin-left:500px;} -.row>.offset9{margin-left:560px;} -.row>.offset10{margin-left:620px;} -.row>.offset11{margin-left:680px;} -.row>.offset12{margin-left:740px;} -.span-one-third{width:300px;} -.span-two-thirds{width:620px;} -.offset-one-third{margin-left:340px;} -.offset-two-thirds{margin-left:660px;} -p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} -h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} -h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} -h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} -h3,h4,h5,h6{line-height:36px;} -h3{font-size:18px;}h3 small{font-size:14px;} -h4{font-size:16px;}h4 small{font-size:12px;} -h5{font-size:14px;} -h6{font-size:13px;color:#bfbfbf;text-transform:uppercase;} -ul,ol{margin:0 0 18px 25px;} -ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} -ul{list-style:disc;} -ol{list-style:decimal;} -li{line-height:18px;color:#808080;} -ul.unstyled{list-style:none;margin-left:0;} -dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;} -dl dt{font-weight:bold;} -dl dd{margin-left:9px;} -hr{margin:20px 0 19px;border:0;border-bottom:1px solid #eee;} -strong{font-style:inherit;font-weight:bold;} -em{font-style:italic;font-weight:inherit;line-height:inherit;} -.muted{color:#bfbfbf;} -blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} -blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} -address{display:block;line-height:18px;margin-bottom:18px;} -code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} -pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;} -form{margin-bottom:18px;} -fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padding-left:150px;font-size:19.5px;line-height:1;color:#404040;*padding:0 0 5px 145px;*line-height:1.5;} -form .clearfix{margin-bottom:18px;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;} -form .clearfix:after{clear:both;} -label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} -label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} -form .input{margin-left:150px;} -input[type=checkbox],input[type=radio]{cursor:pointer;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -select{padding:initial;} -input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;} -input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} -select,input[type=file]{height:27px;*height:auto;line-height:27px;*margin-top:4px;} -select[multiple]{height:inherit;background-color:#ffffff;} -textarea{height:auto;} -.uneditable-input{background-color:#ffffff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} -:-moz-placeholder{color:#bfbfbf;} -::-webkit-input-placeholder{color:#bfbfbf;} -input,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} -input:focus,textarea:focus{outline:0;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} -input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;} -form .clearfix.error>label,form .clearfix.error .help-block,form .clearfix.error .help-inline{color:#b94a48;} -form .clearfix.error input,form .clearfix.error textarea{color:#b94a48;border-color:#ee5f5b;}form .clearfix.error input:focus,form .clearfix.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -form .clearfix.error .input-prepend .add-on,form .clearfix.error .input-append .add-on{color:#b94a48;background-color:#fce6e6;border-color:#b94a48;} -form .clearfix.warning>label,form .clearfix.warning .help-block,form .clearfix.warning .help-inline{color:#c09853;} -form .clearfix.warning input,form .clearfix.warning textarea{color:#c09853;border-color:#ccae64;}form .clearfix.warning input:focus,form .clearfix.warning textarea:focus{border-color:#be9a3f;-webkit-box-shadow:0 0 6px #e5d6b1;-moz-box-shadow:0 0 6px #e5d6b1;box-shadow:0 0 6px #e5d6b1;} -form .clearfix.warning .input-prepend .add-on,form .clearfix.warning .input-append .add-on{color:#c09853;background-color:#d2b877;border-color:#c09853;} -form .clearfix.success>label,form .clearfix.success .help-block,form .clearfix.success .help-inline{color:#468847;} -form .clearfix.success input,form .clearfix.success textarea{color:#468847;border-color:#57a957;}form .clearfix.success input:focus,form .clearfix.success textarea:focus{border-color:#458845;-webkit-box-shadow:0 0 6px #9acc9a;-moz-box-shadow:0 0 6px #9acc9a;box-shadow:0 0 6px #9acc9a;} -form .clearfix.success .input-prepend .add-on,form .clearfix.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;} -.input-mini,input.mini,textarea.mini,select.mini{width:60px;} -.input-small,input.small,textarea.small,select.small{width:90px;} -.input-medium,input.medium,textarea.medium,select.medium{width:150px;} -.input-large,input.large,textarea.large,select.large{width:210px;} -.input-xlarge,input.xlarge,textarea.xlarge,select.xlarge{width:270px;} -.input-xxlarge,input.xxlarge,textarea.xxlarge,select.xxlarge{width:530px;} -textarea.xxlarge{overflow-y:auto;} -input.span1,textarea.span1{display:inline-block;float:none;width:30px;margin-left:0;} -input.span2,textarea.span2{display:inline-block;float:none;width:90px;margin-left:0;} -input.span3,textarea.span3{display:inline-block;float:none;width:150px;margin-left:0;} -input.span4,textarea.span4{display:inline-block;float:none;width:210px;margin-left:0;} -input.span5,textarea.span5{display:inline-block;float:none;width:270px;margin-left:0;} -input.span6,textarea.span6{display:inline-block;float:none;width:330px;margin-left:0;} -input.span7,textarea.span7{display:inline-block;float:none;width:390px;margin-left:0;} -input.span8,textarea.span8{display:inline-block;float:none;width:450px;margin-left:0;} -input.span9,textarea.span9{display:inline-block;float:none;width:510px;margin-left:0;} -input.span10,textarea.span10{display:inline-block;float:none;width:570px;margin-left:0;} -input.span11,textarea.span11{display:inline-block;float:none;width:630px;margin-left:0;} -input.span12,textarea.span12{display:inline-block;float:none;width:690px;margin-left:0;} -input.span13,textarea.span13{display:inline-block;float:none;width:750px;margin-left:0;} -input.span14,textarea.span14{display:inline-block;float:none;width:810px;margin-left:0;} -input.span15,textarea.span15{display:inline-block;float:none;width:870px;margin-left:0;} -input.span16,textarea.span16{display:inline-block;float:none;width:930px;margin-left:0;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} -.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;} -.help-inline,.help-block{font-size:13px;line-height:18px;color:#bfbfbf;} -.help-inline{padding-left:5px;*position:relative;*top:-5px;} -.help-block{display:block;max-width:600px;} -.inline-inputs{color:#808080;}.inline-inputs span{padding:0 2px 0 1px;} -.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} -.input-prepend .add-on{*margin-top:1px;} -.input-append input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;margin-right:0;margin-left:-1px;} -.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;} -.inputs-list label{display:block;float:none;width:auto;padding:0;margin-left:20px;line-height:18px;text-align:left;white-space:normal;}.inputs-list label strong{color:#808080;} -.inputs-list label small{font-size:11px;font-weight:normal;} -.inputs-list .inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} -.inputs-list:first-child{padding-top:6px;} -.inputs-list li+li{padding-top:2px;} -.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;margin-left:-20px;float:left;} -.form-stacked{padding-left:20px;}.form-stacked fieldset{padding-top:9px;} -.form-stacked legend{padding-left:0;} -.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} -.form-stacked .clearfix{margin-bottom:9px;}.form-stacked .clearfix div.input{margin-left:0;} -.form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} -.form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} -.form-stacked .actions{margin-left:-20px;padding-left:20px;} -table{width:100%;margin-bottom:18px;padding:0;font-size:13px;border-collapse:collapse;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} -table th{padding-top:9px;font-weight:bold;vertical-align:middle;} -table td{vertical-align:top;border-top:1px solid #ddd;} -table tbody th{border-top:1px solid #ddd;vertical-align:top;} -.condensed-table th,.condensed-table td{padding:5px 5px 4px;} -.bordered-table{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td{border-left:1px solid #ddd;} -.bordered-table thead tr:first-child th:first-child,.bordered-table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} -.bordered-table thead tr:first-child th:last-child,.bordered-table tbody tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} -.bordered-table tbody tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} -.bordered-table tbody tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} -table .span1{width:20px;} -table .span2{width:60px;} -table .span3{width:100px;} -table .span4{width:140px;} -table .span5{width:180px;} -table .span6{width:220px;} -table .span7{width:260px;} -table .span8{width:300px;} -table .span9{width:340px;} -table .span10{width:380px;} -table .span11{width:420px;} -table .span12{width:460px;} -table .span13{width:500px;} -table .span14{width:540px;} -table .span15{width:580px;} -table .span16{width:620px;} -.zebra-striped tbody tr:nth-child(odd) td,.zebra-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} -.zebra-striped tbody tr:hover td,.zebra-striped tbody tr:hover th{background-color:#f5f5f5;} -table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} -table .headerSortUp,table .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} -table .header:hover:after{visibility:visible;} -table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -table .blue{color:#049cdb;border-bottom-color:#049cdb;} -table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;} -table .green{color:#46a546;border-bottom-color:#46a546;} -table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;} -table .red{color:#9d261d;border-bottom-color:#9d261d;} -table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;} -table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;} -table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;} -table .orange{color:#f89406;border-bottom-color:#f89406;} -table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} -table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} -table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} -.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -.topbar h3 a:hover,.topbar .brand:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} -.topbar h3{position:relative;} -.topbar h3 a,.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} -.topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;} -.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} -.topbar form.pull-right{float:right;} -.topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;} -.topbar input::-webkit-input-placeholder{color:#e6e6e6;} -.topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} -.topbar input:focus,.topbar input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} -.topbar-inner,.topbar .fill{background-color:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.topbar div>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar div>ul>li,.nav>li{display:block;float:left;} -.topbar div>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar div>ul a:hover,.nav a:hover{color:#ffffff;text-decoration:none;} -.topbar div>ul .active>a,.nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} -.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .menu-dropdown,.nav.secondary-nav .menu-dropdown,.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;border:0;} -.topbar div>ul a.menu:hover,.nav a.menu:hover,.topbar div>ul li.open .menu,.nav li.open .menu,.topbar div>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar div>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} -.topbar div>ul .menu-dropdown,.nav .menu-dropdown,.topbar div>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar div>ul .menu-dropdown a.menu,.nav .menu-dropdown a.menu,.topbar div>ul .dropdown-menu a.menu,.nav .dropdown-menu a.menu,.topbar div>ul .menu-dropdown .dropdown-toggle,.nav .menu-dropdown .dropdown-toggle,.topbar div>ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.topbar div>ul .menu-dropdown a.menu.open,.nav .menu-dropdown a.menu.open,.topbar div>ul .dropdown-menu a.menu.open,.nav .dropdown-menu a.menu.open,.topbar div>ul .menu-dropdown .dropdown-toggle.open,.nav .menu-dropdown .dropdown-toggle.open,.topbar div>ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} -.topbar div>ul .menu-dropdown li a,.nav .menu-dropdown li a,.topbar div>ul .dropdown-menu li a,.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.topbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.topbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#ffffff;} -.topbar div>ul .menu-dropdown .active a,.nav .menu-dropdown .active a,.topbar div>ul .dropdown-menu .active a,.nav .dropdown-menu .active a{color:#ffffff;} -.topbar div>ul .menu-dropdown .divider,.nav .menu-dropdown .divider,.topbar div>ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;} -.topbar ul .menu-dropdown li a,.topbar ul .dropdown-menu li a{padding:4px 15px;} -li.menu,.dropdown{position:relative;} -a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -.menu-dropdown,.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.menu-dropdown li,.dropdown-menu li{float:none;display:block;background-color:none;} -.menu-dropdown .divider,.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} -.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover,.topbar .dropdown-menu a.hover,.dropdown-menu a.hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} -.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} -.open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.dropdown.open .dropdown-menu{display:block;} -.tabs,.pills{margin:0 0 18px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;} -.tabs:after,.pills:after{clear:both;} -.tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:34px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} -.tabs .active>a,.tabs .active>a:hover{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} -.tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} -.tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} -.tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} -.tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} -.pills a{margin:5px 3px 5px 0;padding:0 15px;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} -.pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} -.pills-vertical>li{float:none;} -.tab-content>.tab-pane,.pill-content>.pill-pane,.tab-content>div,.pill-content>div{display:none;} -.tab-content>.active,.pill-content>.active{display:block;} -.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} -.breadcrumb .divider{padding:0 5px;color:#bfbfbf;} -.breadcrumb .active a{color:#404040;} -.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} -.hero-unit p{font-size:18px;font-weight:200;line-height:27px;} -footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} -.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} -.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} -.btn .close,.alert-message .close{font-family:Arial,sans-serif;line-height:18px;} -.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} -.btn:focus{outline:1px dotted #666;} -.btn.primary{color:#ffffff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.active,.btn :active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} -.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn.large{font-size:15px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.btn.small{padding:7px 9px 7px;font-size:11px;} -:root .alert-message,:root .btn{border-radius:0 \0;} -button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} -.close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=25);-khtml-opacity:0.25;-moz-opacity:0.25;opacity:0.25;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{margin-top:1px;*margin-top:0;} -.alert-message a{font-weight:bold;color:#404040;} -.alert-message.danger p a,.alert-message.error p a,.alert-message.success p a,.alert-message.info p a{color:#ffffff;} -.alert-message h5{line-height:18px;} -.alert-message p{margin-bottom:0;} -.alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} -.alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} -.alert-message.block-message{background-image:none;background-color:#fdf5d9;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message ul,.alert-message.block-message p{margin-right:30px;} -.alert-message.block-message ul{margin-bottom:0;} -.alert-message.block-message li{color:#404040;} -.alert-message.block-message .alert-actions{margin-top:5px;} -.alert-message.block-message.error,.alert-message.block-message.success,.alert-message.block-message.info{color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} -.alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;} -.alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;} -.alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} -.alert-message.block-message.danger p a,.alert-message.block-message.error p a,.alert-message.block-message.success p a,.alert-message.block-message.info p a{color:#404040;} -.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} -.pagination li{display:inline;} -.pagination a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;} -.pagination a:hover,.pagination .active a{background-color:#c7eefe;} -.pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;} -.pagination .next a{border:0;} -.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} -.modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;} -.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} -.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} -.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} -.modal.fade.in{top:50%;} -.modal-header{border-bottom:1px solid #eee;padding:5px 15px;} -.modal-body{padding:15px;} -.modal-body form{margin-bottom:0;} -.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;} -.modal-footer:after{clear:both;} -.modal-footer .btn{float:right;margin-left:5px;} -.modal .popover,.modal .twipsy{z-index:12000;} -.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} -.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.twipsy-inner{padding:3px 8px;background-color:#000000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.twipsy-arrow{position:absolute;width:0;height:0;} -.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background:#000000;background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} -.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} -.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} -.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;white-space:nowrap;background-color:#bfbfbf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} -.label.warning{background-color:#f89406;} -.label.success{background-color:#46a546;} -.label.notice{background-color:#62cffc;} -.media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;content:"";zoom:1;} -.media-grid:after{clear:both;} -.media-grid li{display:inline;} -.media-grid a{float:left;padding:4px;margin:0 0 18px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;} -.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} diff --git a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css index 7a3fc9c8ec..dd217348cc 100644 --- a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css +++ b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css @@ -1,7 +1,7 @@ body { padding-top: 50px; } -.topbar .logo { +.navbar .logo { float: left; padding: 5px 5px; height: 30px; @@ -21,8 +21,27 @@ body { a.headerlink { color: silver; } -/* Undo an annoyance from Bootstrap */ -li { - color: black; + +/* Responsive Docs +-------------------------------------------------- */ +@media (max-width: 480px) { + /* Reduce padding above body */ + body { + padding-top: 30px; + } +} + +@media (max-width: 768px) { + /* Remove any padding from the body */ + body { + padding-top: 0; + } +} + +@media (min-width: 768px) and (max-width: 980px) { + /* Remove any padding from the body */ + body { + padding-top: 0; + } } diff --git a/documentation/website/source/_themes/opendylan/static/opendylan.org/js/bootstrap-dropdown.js b/documentation/website/source/_themes/opendylan/static/opendylan.org/js/bootstrap-dropdown.js deleted file mode 100644 index fda6da597e..0000000000 --- a/documentation/website/source/_themes/opendylan/static/opendylan.org/js/bootstrap-dropdown.js +++ /dev/null @@ -1,55 +0,0 @@ -/* ============================================================ - * bootstrap-dropdown.js v1.4.0 - * http://twitter.github.com/bootstrap/javascript.html#dropdown - * ============================================================ - * Copyright 2011 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function( $ ){ - - "use strict" - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function ( selector ) { - return this.each(function () { - $(this).delegate(selector || d, 'click', function (e) { - var li = $(this).parent('li') - , isActive = li.hasClass('open') - - clearMenus() - !isActive && li.toggleClass('open') - return false - }) - }) - } - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - var d = 'a.menu, .dropdown-toggle' - - function clearMenus() { - $(d).parent('li').removeClass('open') - } - - $(function () { - $('html').bind("click", clearMenus) - $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' ) - }) - -}( window.jQuery || window.ender ); diff --git a/documentation/website/source/_themes/opendylan/static/opendylan.org/js/bootstrap-scrollspy.js b/documentation/website/source/_themes/opendylan/static/opendylan.org/js/bootstrap-scrollspy.js deleted file mode 100644 index 29f7dd5740..0000000000 --- a/documentation/website/source/_themes/opendylan/static/opendylan.org/js/bootstrap-scrollspy.js +++ /dev/null @@ -1,107 +0,0 @@ -/* ============================================================= - * bootstrap-scrollspy.js v1.4.0 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2011 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - - -!function ( $ ) { - - "use strict" - - var $window = $(window) - - function ScrollSpy( topbar, selector ) { - var processScroll = $.proxy(this.processScroll, this) - this.$topbar = $(topbar) - this.selector = selector || 'li > a' - this.refresh() - this.$topbar.delegate(this.selector, 'click', processScroll) - $window.scroll(processScroll) - this.processScroll() - } - - ScrollSpy.prototype = { - - refresh: function () { - this.targets = this.$topbar.find(this.selector).map(function () { - var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null - }) - - this.offsets = $.map(this.targets, function (id) { - return $(id).offset().top - }) - } - - , processScroll: function () { - var scrollTop = $window.scrollTop() + 10 - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activateButton( targets[i] ) - } - } - - , activateButton: function (target) { - this.activeTarget = target - - this.$topbar - .find(this.selector).parent('.active') - .removeClass('active') - - this.$topbar - .find(this.selector + '[href="' + target + '"]') - .parent('li') - .addClass('active') - } - - } - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollSpy = function( options ) { - var scrollspy = this.data('scrollspy') - - if (!scrollspy) { - return this.each(function () { - $(this).data('scrollspy', new ScrollSpy( this, options )) - }) - } - - if ( options === true ) { - return scrollspy - } - - if ( typeof options == 'string' ) { - scrollspy[options]() - } - - return this - } - - $(document).ready(function () { - $('body').scrollSpy('[data-scrollspy] li > a') - }) - -}( window.jQuery || window.ender ); diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index ed13be3bd6..03b474b6e9 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -6,16 +6,16 @@ Documentation publishing system. Some documents are not entirely correct yet. We've retained links to the 'Old HTML' where relevant. These will be going away in the near future. - :class: alert-message warning + :class: alert alert-block alert-warning .. raw:: html
      -
      +

      Learning Dylan

      -
      +

      Just getting started with Open Dylan? We recommend that you read the Introduction to Dylan to get a feel for the language. After that, you can broaden @@ -58,7 +58,7 @@ Documentation

      Cheat Sheets

      -
      +

      Quick one-page sheets for common tasks.

      @@ -71,7 +71,7 @@ Documentation

      Articles

      -
      +

      Featured articles and blog postings.

      @@ -98,11 +98,11 @@ Documentation .. raw:: html
      -
      +

      References

      -
      +

      These are some lengthier reference materials. While they make for dry reading, they're full of invaluable information!

      @@ -139,7 +139,7 @@ Documentation

      For Open Dylan Developers

      -
      +

      Notes and materials useful to those working on Open Dylan itself or those who have an interest in the low level details.

      @@ -176,7 +176,7 @@ Documentation

      Archived Documentation

      -
      +

      This is old documentation that we don't plan to bring forward. Let us know if there's interest in this material.

      diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index d8db6550b0..e69162d8ec 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -15,14 +15,14 @@ Open Dylan IDE .. warning:: The 32 bit version of Open Dylan does NOT work on 64 bit Windows. There is no workaround at this time, unfortunately. We hope to resolve this in an upcoming release. - :class: alert-message warning + :class: alert alert-warning For installation, double-click on the installer, and follow instructions. You need to have either the PellesC linker or the linker of VC++ 6.0, 7.0 or the current .NET platform SDK installed. .. table:: - :class: zebra-striped + :class: table-striped +-----------------------+--------------------+--------------------+-------------+ | Platform | Version | Date Released | Revision ID | @@ -40,7 +40,7 @@ linking. Note that these versions only have a command-line compiler and no IDE. .. table:: - :class: zebra-striped + :class: table-striped +-----------------------+--------------------+--------------------+-------------+ | Platform | Version | Date Released | Revision ID | diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 42443fdf5e..8bee5dd9c5 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -20,11 +20,11 @@ Welcome to Open Dylan!
      -
      +

      Recent News

      -
      +

      Keep up to date by subscribing to our RSS Feed or joining our mailing @@ -37,11 +37,11 @@ Welcome to Open Dylan!

      All news »
      -
      +

      Get Started

      -
      +

      Just getting started with Open Dylan? We recommend that you read the Introduction to Dylan to get a feel for the language. After that, you can broaden diff --git a/documentation/website/source/news/index.rst b/documentation/website/source/news/index.rst index 411e4f4ee9..f30f388b84 100644 --- a/documentation/website/source/news/index.rst +++ b/documentation/website/source/news/index.rst @@ -5,7 +5,7 @@ News & Articles .. raw:: html

      -
      +

      News

      @@ -34,7 +34,7 @@ over at ``_. .. raw:: html
      -
      +

      Articles

      From bb918d97fab8eef526c88028f7d26b2eee8aaa4d Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 1 Feb 2012 21:02:54 +0700 Subject: [PATCH 159/519] Configure viewport so that iOS works. --- documentation/website/source/_themes/opendylan/layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index e2e30c3268..9fdda97709 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -27,6 +27,7 @@ + {% endblock %} From 861ee875344e7b3ad83efe4b4ffe594687ca0ec1 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 1 Feb 2012 23:12:51 +0700 Subject: [PATCH 160/519] Link to the OpenDylan organization on Trello. --- documentation/website/source/community/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/website/source/community/index.rst b/documentation/website/source/community/index.rst index b3c3844504..550ea19a99 100644 --- a/documentation/website/source/community/index.rst +++ b/documentation/website/source/community/index.rst @@ -9,6 +9,7 @@ Development =========== - `All of our repositories on GitHub `_ +- `TODO lists tracked on Trello `_ - `Open bugs for Open Dylan `_ - `How to contribute `_ From 0fec54a6b102b888136dd65f377857fe915b9cc1 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 6 Feb 2012 10:05:52 +0700 Subject: [PATCH 161/519] Start of some ideas for Google Summer of Code 2012. --- .../source/community/gsoc/2012/cilk.rst | 7 +++++ .../source/community/gsoc/2012/cocoa.rst | 8 ++++++ .../community/gsoc/2012/documentation.rst | 9 +++++++ .../source/community/gsoc/2012/dylint.rst | 11 ++++++++ .../source/community/gsoc/2012/gtk.rst | 12 +++++++++ .../source/community/gsoc/2012/index.rst | 27 +++++++++++++++++++ .../source/community/gsoc/2012/javascript.rst | 9 +++++++ .../source/community/gsoc/2012/numerics.rst | 11 ++++++++ .../source/community/gsoc/2012/speed.rst | 12 +++++++++ .../source/community/gsoc/2012/staticlink.rst | 13 +++++++++ .../source/community/gsoc/2012/tracing.rst | 7 +++++ .../website/source/community/gsoc/index.rst | 6 +++++ .../website/source/community/index.rst | 1 + documentation/website/source/index.rst | 1 + 14 files changed, 134 insertions(+) create mode 100644 documentation/website/source/community/gsoc/2012/cilk.rst create mode 100644 documentation/website/source/community/gsoc/2012/cocoa.rst create mode 100644 documentation/website/source/community/gsoc/2012/documentation.rst create mode 100644 documentation/website/source/community/gsoc/2012/dylint.rst create mode 100644 documentation/website/source/community/gsoc/2012/gtk.rst create mode 100644 documentation/website/source/community/gsoc/2012/index.rst create mode 100644 documentation/website/source/community/gsoc/2012/javascript.rst create mode 100644 documentation/website/source/community/gsoc/2012/numerics.rst create mode 100644 documentation/website/source/community/gsoc/2012/speed.rst create mode 100644 documentation/website/source/community/gsoc/2012/staticlink.rst create mode 100644 documentation/website/source/community/gsoc/2012/tracing.rst create mode 100644 documentation/website/source/community/gsoc/index.rst diff --git a/documentation/website/source/community/gsoc/2012/cilk.rst b/documentation/website/source/community/gsoc/2012/cilk.rst new file mode 100644 index 0000000000..298939376c --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/cilk.rst @@ -0,0 +1,7 @@ +============ +Dylan / Cilk +============ + +The purpose of this project would be to provide a library and compiler +plugin that transforms Dylan code into a form where it can work with the +Cilk runtime. diff --git a/documentation/website/source/community/gsoc/2012/cocoa.rst b/documentation/website/source/community/gsoc/2012/cocoa.rst new file mode 100644 index 0000000000..ff4d7ebafd --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/cocoa.rst @@ -0,0 +1,8 @@ +============= +Dylan / Cocoa +============= + +The purpose of this project is to use Apple's *Bridge Support* to assist +in generating wrappers around the Cocoa libraries. This would include +the creation of a bridge between Dylan and Objective C using the low +level C API provided by Objective C's runtime. diff --git a/documentation/website/source/community/gsoc/2012/documentation.rst b/documentation/website/source/community/gsoc/2012/documentation.rst new file mode 100644 index 0000000000..9597fa6d81 --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/documentation.rst @@ -0,0 +1,9 @@ +=================== +Dylan Documentation +=================== + +The purpose of this project is to provide searchable, browsable API +documentation based on the reference materials. The idea would be to +extract documentation into JSON by writing an extension to Sphinx, put +that JSON into something like ElasticSearch and building a web-based +user interface on top of that. diff --git a/documentation/website/source/community/gsoc/2012/dylint.rst b/documentation/website/source/community/gsoc/2012/dylint.rst new file mode 100644 index 0000000000..86702c7249 --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/dylint.rst @@ -0,0 +1,11 @@ +====== +DyLint +====== + +The purpose of this project is to create a framework for doing analysis +and warnings of Dylan code using compiler plugins that can walk the +internal compiler datastructures. + +This can draw inspiration from: + +- *fill in details* diff --git a/documentation/website/source/community/gsoc/2012/gtk.rst b/documentation/website/source/community/gsoc/2012/gtk.rst new file mode 100644 index 0000000000..128f99ec6a --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/gtk.rst @@ -0,0 +1,12 @@ +============ +Dylan / Gtk+ +============ + +The purpose of this project is to: + +- Use the ``.gir`` files from *gobject-introspection* to generate Gtk+ bindings. +- Use the bindings to implement a backend for DUIM that runs on Linux and Mac OS X. + +Some code already exists for this: + +- *fill in details* diff --git a/documentation/website/source/community/gsoc/2012/index.rst b/documentation/website/source/community/gsoc/2012/index.rst new file mode 100644 index 0000000000..bd3cbc93a7 --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/index.rst @@ -0,0 +1,27 @@ +============================ +Google Summer of Code - 2012 +============================ + +This page is to help organize our (hopeful) participation in the Google +Summer of Code, 2012. + +Submissions and edits to this content can be done by submitting a pull +request to the `website repository +`_ or by :doc:`contacting us via +IRC or the mailing list `. + +If you are interested in being a mentor, please contact Bruce Mitchener +via one of the above means. + +.. toctree:: + + dylint + javascript + tracing + documentation + cilk + numerics + speed + cocoa + gtk + staticlink diff --git a/documentation/website/source/community/gsoc/2012/javascript.rst b/documentation/website/source/community/gsoc/2012/javascript.rst new file mode 100644 index 0000000000..48fe269dbe --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/javascript.rst @@ -0,0 +1,9 @@ +=========================== +JavaScript Compiler Backend +=========================== + +The Open Dylan compiler supports multiple backends, currently supporting +C, LLVM and the HARP native backend. In the past, it also had partial +support for the JVM. + +This project would be to create a new backend that outputs JavaScript. \ No newline at end of file diff --git a/documentation/website/source/community/gsoc/2012/numerics.rst b/documentation/website/source/community/gsoc/2012/numerics.rst new file mode 100644 index 0000000000..459951a795 --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/numerics.rst @@ -0,0 +1,11 @@ +================ +Dylan / Numerics +================ + +The purpose of this project is to improve numerical computing performance in Dylan. + +It could include: + +- BLAS / LAPack integration. +- SSE code generation. +- Auto-vectorization. diff --git a/documentation/website/source/community/gsoc/2012/speed.rst b/documentation/website/source/community/gsoc/2012/speed.rst new file mode 100644 index 0000000000..93bd967b7f --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/speed.rst @@ -0,0 +1,12 @@ +===== +Speed +===== + +The purpose of this project is to implement a number of benchmarks in +Dylan and provide infrastructure for recording and observing performance +data over time. + +Inspiration (and benchmark ideas) can be borrowed from: + +- http://speed.python.org/ +- Boinkmarks diff --git a/documentation/website/source/community/gsoc/2012/staticlink.rst b/documentation/website/source/community/gsoc/2012/staticlink.rst new file mode 100644 index 0000000000..a7c5984aed --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/staticlink.rst @@ -0,0 +1,13 @@ +============== +Static Linking +============== + +The purpose of this project would be to: + +- Implement static linking within the compiler toolchain. +- Optimize sealing information to take advantage of the lack of + extensibility. + +Some code for this already exists: + +- *fill in details* diff --git a/documentation/website/source/community/gsoc/2012/tracing.rst b/documentation/website/source/community/gsoc/2012/tracing.rst new file mode 100644 index 0000000000..dcb9c42337 --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/tracing.rst @@ -0,0 +1,7 @@ +======= +Tracing +======= + +The purpose of this project is to integrate with system-level tracing frameworks such as DTrace and SystemTap. + +*fill in more details* diff --git a/documentation/website/source/community/gsoc/index.rst b/documentation/website/source/community/gsoc/index.rst new file mode 100644 index 0000000000..4df1f7f53d --- /dev/null +++ b/documentation/website/source/community/gsoc/index.rst @@ -0,0 +1,6 @@ +Google Summer of Code +===================== + +.. toctree:: + + 2012/index \ No newline at end of file diff --git a/documentation/website/source/community/index.rst b/documentation/website/source/community/index.rst index 550ea19a99..a15f451681 100644 --- a/documentation/website/source/community/index.rst +++ b/documentation/website/source/community/index.rst @@ -12,6 +12,7 @@ Development - `TODO lists tracked on Trello `_ - `Open bugs for Open Dylan `_ - `How to contribute `_ +- `Ideas for Google Summer of Code - 2012 `_ The #dylan IRC channel ====================== diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 8bee5dd9c5..36728cd1f9 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -65,4 +65,5 @@ excellent :drm:`Introduction to the Dylan Reference Manual `. */* articles/*/* news/*/*/*/* + community/gsoc/* From 7f41fd25a25a38fcd1d72dbff2a5bd22fd46056a Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 7 Feb 2012 11:39:14 +0700 Subject: [PATCH 162/519] Add link to archived downloads. --- documentation/website/source/download/index.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index e69162d8ec..c33804f641 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -66,6 +66,10 @@ All of our source code is available in the `"dylan-lang" organization on GitHub We also have a `continuous build server `_. +Archived Builds +=============== + +Old builds can be found by browsing the `download directories`_. .. _Windows (32 bit): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-win32.exe .. _Mac OS X (Intel): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-darwin.tar.bz2 @@ -74,3 +78,4 @@ We also have a `continuous build server `_. .. _Linux (x86-64): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86_64-linux.tar.bz2 .. _FreeBSD (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-FreeBSD.tar.bz2 .. _FreeBSD (x86-64): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-r11990-amd64-FreeBSD7.tar.bz2 +.. _download directories: http://opendylan.org/downloads/opendylan/ From d1a36ab30f46cdd513c2732345bfa0a8e41eddbf Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 7 Feb 2012 11:42:55 +0700 Subject: [PATCH 163/519] Fix broken download link for old FreeBSD x86-64 build. --- documentation/website/source/download/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index c33804f641..1c895a11bb 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -77,5 +77,5 @@ Old builds can be found by browsing the `download directories`_. .. _Linux (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-linux.tar.bz2 .. _Linux (x86-64): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86_64-linux.tar.bz2 .. _FreeBSD (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-FreeBSD.tar.bz2 -.. _FreeBSD (x86-64): http://opendylan.org/downloads/opendylan/1.0beta5/opendylan-1.0beta5-r11990-amd64-FreeBSD7.tar.bz2 +.. _FreeBSD (x86-64): http://opendylan.org/downloads/opendylan/old/1.0beta5/opendylan-1.0beta5-r11990-amd64-FreeBSD7.tar.bz2 .. _download directories: http://opendylan.org/downloads/opendylan/ From c926f01c4678153206e3ec55443f30151d0f1dea Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 7 Feb 2012 11:46:57 +0700 Subject: [PATCH 164/519] Update to current version of sphinx-extensions. --- documentation/website/sphinx-extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/sphinx-extensions b/documentation/website/sphinx-extensions index cf0d61ae6f..62a55eb56f 160000 --- a/documentation/website/sphinx-extensions +++ b/documentation/website/sphinx-extensions @@ -1 +1 @@ -Subproject commit cf0d61ae6fd6963d90bec2e43fd60862edca6f19 +Subproject commit 62a55eb56fba38be7e859213ea35c12930ce8ae7 From c5f516e9b66c47fe738d640c095bc0c9f2c3cca5 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 7 Feb 2012 16:35:24 +0700 Subject: [PATCH 165/519] Link to Jenkins from Community page. --- documentation/website/source/community/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/website/source/community/index.rst b/documentation/website/source/community/index.rst index a15f451681..ee53e4f0aa 100644 --- a/documentation/website/source/community/index.rst +++ b/documentation/website/source/community/index.rst @@ -9,6 +9,7 @@ Development =========== - `All of our repositories on GitHub `_ +- `Continuous build server `_. - `TODO lists tracked on Trello `_ - `Open bugs for Open Dylan `_ - `How to contribute `_ From 9d0cfa65812adec23bef2f765569513735329f1a Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 7 Feb 2012 16:35:50 +0700 Subject: [PATCH 166/519] Experimental revision of download page. --- .../website/source/download/index.rst | 100 +++++++++--------- 1 file changed, 48 insertions(+), 52 deletions(-) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index 1c895a11bb..1400a20413 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -1,75 +1,70 @@ -******** -Download -******** +******************** +Open Dylan Downloads +******************** -Binary Releases -=============== +.. raw:: html -Open Dylan IDE --------------- - -.. note:: This is currently only available on Windows. Other platforms need - to use the command line tools. The Windows IDE installer also includes - the command line tools. +
      +
      +

      Binary Releases

      .. warning:: The 32 bit version of Open Dylan does NOT work on 64 bit Windows. There is no workaround at this time, unfortunately. We hope to resolve this in an upcoming release. :class: alert alert-warning -For installation, double-click on the installer, and follow instructions. -You need to have either the PellesC linker or the linker of VC++ 6.0, 7.0 -or the current .NET platform SDK installed. - .. table:: :class: table-striped - +-----------------------+--------------------+--------------------+-------------+ - | Platform | Version | Date Released | Revision ID | - +=======================+====================+====================+=============+ - | `Windows (32 bit)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | - +-----------------------+--------------------+--------------------+-------------+ + +-----------------------+--------------------+--------------------+---------------+ + | Platform | Version | Date Released | Revision ID | + +=======================+====================+====================+===============+ + | `Windows (32 bit)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | + +-----------------------+--------------------+--------------------+---------------+ + | `Mac OS X (Intel)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | + +-----------------------+--------------------+--------------------+---------------+ + | `Mac OS X (PowerPC)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | + +-----------------------+--------------------+--------------------+---------------+ + | `Linux (x86)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | + +-----------------------+--------------------+--------------------+---------------+ + | `Linux (x86-64)`_ | 2011.1 | December 11, 2011 | `23f8ab5878`_ | + +-----------------------+--------------------+--------------------+---------------+ + | `FreeBSD (x86)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | + +-----------------------+--------------------+--------------------+---------------+ + | `FreeBSD (x86-64)`_ | 1.0beta5 | November 27, 2008 | ... | + +-----------------------+--------------------+--------------------+---------------+ -Open Dylan Command Line Tools ------------------------------ -The README file inside the tarball describes installation and basic -usage. The easiest way is extracting the tarball in /opt. The -Linux platform should have binutils installed, in order to allow -linking. Note that these versions only have a command-line compiler -and no IDE. +Old builds can be found by browsing the `download directories`_. -.. table:: - :class: table-striped +.. raw:: html - +-----------------------+--------------------+--------------------+-------------+ - | Platform | Version | Date Released | Revision ID | - +=======================+====================+====================+=============+ - | `Mac OS X (Intel)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | - +-----------------------+--------------------+--------------------+-------------+ - | `Mac OS X (PowerPC)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | - +-----------------------+--------------------+--------------------+-------------+ - | `Linux (x86)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | - +-----------------------+--------------------+--------------------+-------------+ - | `Linux (x86-64)`_ | 2011.1 | December 11, 2011 | 23f8ab5878 | - +-----------------------+--------------------+--------------------+-------------+ - | `FreeBSD (x86)`_ | 2011.1 | December 10, 2011 | 23f8ab5878 | - +-----------------------+--------------------+--------------------+-------------+ - | `FreeBSD (x86-64)`_ | 1.0beta5 | November 27, 2008 | ... | - +-----------------------+--------------------+--------------------+-------------+ +
      +
      +
      +

      Source Code

      +

      All of our source code is available under an open source license in the "dylan-lang" organization on GitHub.

      +
      +
      +
      -Source Code -=========== +----------- -All of our source code is available in the `"dylan-lang" organization on GitHub -`_. +Installation on Windows +----------------------- -We also have a `continuous build server `_. +For installation, double-click on the installer, and follow instructions. +You need to have either the PellesC linker or the linker of VC++ 6.0, 7.0 +or the current .NET platform SDK installed. -Archived Builds -=============== +Installation on Mac OS X, FreeBSD, Linux +---------------------------------------- -Old builds can be found by browsing the `download directories`_. +The README file inside the tarball describes installation and basic +usage. The easiest way is extracting the tarball in /opt. The +Linux platform should have binutils installed, in order to allow +linking. Note that these versions only have a command-line compiler +and no IDE. .. _Windows (32 bit): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-win32.exe .. _Mac OS X (Intel): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-darwin.tar.bz2 @@ -79,3 +74,4 @@ Old builds can be found by browsing the `download directories`_. .. _FreeBSD (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-FreeBSD.tar.bz2 .. _FreeBSD (x86-64): http://opendylan.org/downloads/opendylan/old/1.0beta5/opendylan-1.0beta5-r11990-amd64-FreeBSD7.tar.bz2 .. _download directories: http://opendylan.org/downloads/opendylan/ +.. _23f8ab5878: https://github.com/dylan-lang/opendylan/tree/v2011.1 From 1b190b7d4dd20a0de689073afc50006b6ddea8b3 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 7 Feb 2012 16:51:26 +0700 Subject: [PATCH 167/519] Fix button classes from update to Bootstrap 2. --- documentation/website/source/index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 36728cd1f9..aeefdf6e72 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -14,8 +14,8 @@ Welcome to Open Dylan! arguments, object introspection, macros, and many other advanced features... --Peter Hinely

      @@ -35,7 +35,7 @@ Welcome to Open Dylan! .. raw:: html -
      All news »
      +
      All news »
      From bbed087d33af66209dda4b5ebd733fdaa27c75f8 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 7 Feb 2012 16:51:46 +0700 Subject: [PATCH 168/519] Add an hr above footer. --- documentation/website/source/_themes/opendylan/layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index 9fdda97709..e60d7c0d7f 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -70,6 +70,7 @@ {% block footer %}
      +.. raw:: html + +
      + + + +
      + .. toctree:: :maxdepth: 1 :hidden: From 24bd14355860829aa6b689b4209f7e317d4bf295 Mon Sep 17 00:00:00 2001 From: Ingo Albrecht Date: Sat, 25 Feb 2012 02:57:22 +0100 Subject: [PATCH 177/519] Add piwik to footer. --- .../source/_themes/opendylan/layout.html | 14 ++++++++++++++ documentation/website/source/index.rst | 17 ----------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index e60d7c0d7f..c2fc974a39 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -94,6 +94,20 @@ {%- endif %}
      + + + + + {% endblock %} diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 8f02bc62d9..aeefdf6e72 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -57,23 +57,6 @@ excellent :drm:`Introduction to the Dylan Reference Manual `.
      -.. raw:: html - -
      - - - -
      - .. toctree:: :maxdepth: 1 :hidden: From 88d29cd0fdff2ab7ab42d71d0bc9f5b95281fdfd Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 27 Feb 2012 15:03:34 -0500 Subject: [PATCH 178/519] lisp frontend --- .../community/gsoc/2012/frontend-lisp.rst | 17 +++++++++++++++++ .../source/community/gsoc/2012/index.rst | 1 + 2 files changed, 18 insertions(+) create mode 100644 documentation/website/source/community/gsoc/2012/frontend-lisp.rst diff --git a/documentation/website/source/community/gsoc/2012/frontend-lisp.rst b/documentation/website/source/community/gsoc/2012/frontend-lisp.rst new file mode 100644 index 0000000000..3b35b9f35e --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/frontend-lisp.rst @@ -0,0 +1,17 @@ +============= +Frontend/LISP +============= + +The purpose of this project would be to write another syntax for Dylan based on the original S-Expression syntax. + +The project would include to write (or revive) a S-Expression lexer and parser for Dylan and translating this into the ``dfmc-definitions`` structure by using a macro-expander for Dylan macros. + +The change towards the infix syntax was done before the programming language was finalized, thus not all features are present in the prefix syntax. This has to be taken into consideration and adjusted appropriately (by redefining the infix syntax). + +Using this approach both surface syntaxes (apart from macros) can be completely exchanged. Also, the semantics (control/data flow, optimization, type inference, backends) does not have to be touched at all. + +Some references: + +- `Dylan Interim Reference Manual `_ +- `Dylan Macros with S-Expressions `_ +- `S-Expression Syntax `_ diff --git a/documentation/website/source/community/gsoc/2012/index.rst b/documentation/website/source/community/gsoc/2012/index.rst index 88d89c9d0e..4b68069619 100644 --- a/documentation/website/source/community/gsoc/2012/index.rst +++ b/documentation/website/source/community/gsoc/2012/index.rst @@ -26,3 +26,4 @@ via one of the above means. cocoa gtk staticlink + frontend-lisp From a5d1d1709cf366ecafd4966093c14cab2bba3b45 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 27 Feb 2012 15:06:42 -0500 Subject: [PATCH 179/519] project manager proposal --- .../source/community/gsoc/2012/index.rst | 1 + .../community/gsoc/2012/project_manager.rst | 243 ++++++++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 documentation/website/source/community/gsoc/2012/project_manager.rst diff --git a/documentation/website/source/community/gsoc/2012/index.rst b/documentation/website/source/community/gsoc/2012/index.rst index 4b68069619..133bf7b124 100644 --- a/documentation/website/source/community/gsoc/2012/index.rst +++ b/documentation/website/source/community/gsoc/2012/index.rst @@ -27,3 +27,4 @@ via one of the above means. gtk staticlink frontend-lisp + project_manager diff --git a/documentation/website/source/community/gsoc/2012/project_manager.rst b/documentation/website/source/community/gsoc/2012/project_manager.rst new file mode 100644 index 0000000000..cf2a58564d --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/project_manager.rst @@ -0,0 +1,243 @@ +Rethinking the Project Manager +****************************** + +Problem +======= + +The current project manager as a variety of problems that we would +like to solve. These include: + +* It combines install with build. Everything is built and installed + into the same location (``~/Open-Dylan``). +* Similarly, it doesn't distinguish between a library that I'm using + and one that I'm developing. Not all dependencies should be treated + in the same manner. While this is seen by some to be an advantage, + I don't believe that it is in any larger scale setting with multiple + endeavors happening at once. +* It provides no versioning of libraries. +* Everything is always built in the shared location. This is pretty + confusing for new users. +* It provides no way of locating, downloading or otherwise managing + dependencies. You still have to download everything yourself, set + up registries, and get things to work. + +Example Application +=================== + +Given a software application like Network Night Vision which consists of +an executable and multiple libraries, this is an ideal demonstration of +how the new system could work. + +Network Night Vision depends on externally provided (and maintained) +libraries like Monday and the Dylan runtime. + +It is also consists of a collection of libraries which are part of the +application and linked into the final executable. + +Current Situation +----------------- + +Currently, there is a registry for Network Night Vision which lists +all of these libraries, both internal and external, and requires that +they be on disk in a particular location (relatively). When building +NNV, all of these libraries are built and installed into a common build +directory (``~/Open-Dylan``). Any changes to any of the sources for +these libraries results in everything getting appropriately rebuilt. +This rebuild happens even for a change in the Dylan runtime or the +Monday libraries even though they are external dependencies and aren't +being developed as part of NNV. + +When talking to the compiler, you give the compiler a single project +or LID file which is used to automatically get all dependencies, look +them up in the registry, and build them as needed. + +Better World? +------------- + +In a better world, external dependencies would be available from the +system as a whole. These external dependencies would have a version +number or identifier associated with them so that changes in the +dependency wouldn't require that everything using it be rebuilt or +updated. The internal (component) libraries would be handled roughly +as they are now: changes in them would cause rebuilds. + +It would be great if one didn't have to manually go and download, +build, and install external dependencies that didn't exist or if the +process were at least easier than it is now. + +Proposal +======== + +Workspaces +---------- + +Workspaces are a new concept to Open Dylan and are a layer above the +project. A workspace is a collection of projects. In this document, +workspace files will have the extension ``NAL`` for ``Not A LID``. + +Taking Network Night Vision as an example, you would have a top level +``nnv.nal`` file which contained (among other things) a list of the +projects that were part of the Network Night Vision application, using +relative paths from the workspace file: + +* ``flow-printer/flow-printer.lid`` +* ... +* ``gui-sniffer/gui-sniffer.lid`` +* ... +* ``vector-table/vector-table.lid`` + +Upon opening this workspace, the projects would also be loaded. +Libraries referenced from these projects would be resolved by: + +#. First, look for a project in the workspace that provides the + specified library. +#. If not found, look to the system-installed libraries. +#. See `Package Manager`_. + +Libraries that are provided by the workspace are treated as they are +now and changes to them trigger rebuilds. However, libraries that +are provided by the system are entirely an external dependency, just +like system-provided libraries in any other language or environment. + +Package Manager +--------------- + +The second big piece of this proposal is the creation of a package +management system for Open Dylan. This is something along the lines of +what many other programming language communities provide: + +* Clojure: `Leiningen `_ +* Common Lisp: `QuickLisp `_ +* Emacs Lisp: `Marmalade `_ / `ELPA `_ +* Erlang: `EPM `_ +* haXe: `haxelib `_ +* Lua: `LuaRocks `_ +* NodeJS: `NPM `_ +* Haskell: `Hackage `_ +* Ocaml: `GODI `_ +* PHP: `PEAR `_ +* Perl: CPAN +* Python: PIP / CheeseShop / easy_install +* Racket: `Raco `_ +* Ruby: `RubyGems `_ + +Our package manager would feature a global catalog of packages, the +ability to download, build and install those packages, and integration +of these features in the build system and IDE. + +Catalog +~~~~~~~ + +The catalog is a mapping of library names to metadata about those +libraries. + +This metadata should be able to include: + +* Author +* Version +* Synopsis +* Description +* Keywords / Tags +* Source repository location +* Software license + +The catalog may be maintained independently of the various libraries +or it might be the result of a mechanical process which extracts the +metadata from the workspace and project files of the libraries. There +are advantages and disadvantages to both, so this should be discussed. + +Software Distribution +~~~~~~~~~~~~~~~~~~~~~ + +I propose that we initially rely upon Git for retrieving the source code +for a library. We can always add additional methods later (HTTP, Mercurial, +Subversion, etc), but for now, it would be easiest if we could avoid having +to write our own HTTP interfaces, deal with unzipping and unpacking tarballs +and all of the other associated details. + +Upon locating a package that we wish to install, the package manager +would look at the metadata that it received from the catalog for the +Git repository and run a git client to retrieve the source code prior +to building and installing the package. + +User Interface +~~~~~~~~~~~~~~ + +The package manager should support at least these operations: + +* Search / Apropos. Given some text, find all packages that + reference that text. This can have features added over time + to search by author, version, etc. +* Install. Retrieve the +* Uninstall. This would be nice to have, but is probably going + to come later. When installing a package, a manifest of all + installed files should be generated. This can then be used + to uninstall the package. +* Bundle. Take an executable with the libraries that it depends + upon and put them in a directory structure independent of + the typical install location. This is probably mainly required + on Mac OS X where we have to deal with ``install_name_tool`` + and other OS X specific concerns. + +Over time, the package metadata should be accessible by a variety +of means: + +* Packages website which allows browsing all metadata as well + as perhaps hosting the generated documentation for the package + if it is using the standard Sphinx-based structure. +* Command line tools, including within ``dylan-compiler``. +* A GUI browser tool within the IDE. + +Versioning +---------- + +I haven't thought much yet about what will be involved here. + +Development Process +=================== + +A big (and reasonable) fear is that some of this work is fairly large +and extensive and that may make it more difficult. To help mitigate +this, I propose that we: + +* Work iteratively. Small steps that eventually get us somewhere + awesome are better than getting nowhere at all. +* Accept that this isn't ever going to be perfect. But it will surely + be better than what we have now. +* Make technology decisions to simplify things and add more features + later. An example of this is the proposed reliance upon Git via + ``run-application()``. + +Glossary +======== + +Project: + + Each project represents a single target. It contains: + + * A collection of Dylan source files. + * A set of dependencies which are expected to be satisfied by the + system. + * A set of dependencies which are expected to be resolved within + the current workspace. + +Registry: + + In Open Dylan, the registry provides a way to map from a library + name to the associated LID file (with sources) for that library. + +Target: + + A target is the final build product that results from a project, be + that a library or an executable. + +Workspace: + + A workspace is a new concept to Open Dylan. It is a collection of + projects which, together, represent a software project. + + A given project within the workspace can be specified as the default + project which is the one which is built first, is the target of a + 'Run' or 'Debug' command and so on. The user can change the current + active project within the workspace so that the subsequent 'Run' or + 'Debug' commands are directed at the new active project. From b21e672f67cdca1e9db882b9ddaea62c58366d5e Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 27 Feb 2012 14:40:55 -0500 Subject: [PATCH 180/519] dispatch optimizations --- .../source/community/gsoc/2012/dispatch.rst | 16 ++++++++++++++++ .../website/source/community/gsoc/2012/index.rst | 1 + 2 files changed, 17 insertions(+) create mode 100644 documentation/website/source/community/gsoc/2012/dispatch.rst diff --git a/documentation/website/source/community/gsoc/2012/dispatch.rst b/documentation/website/source/community/gsoc/2012/dispatch.rst new file mode 100644 index 0000000000..89aaef8073 --- /dev/null +++ b/documentation/website/source/community/gsoc/2012/dispatch.rst @@ -0,0 +1,16 @@ +===================== +Dispatch Optimization +===================== + +Since Dylan is dynamically typed and uses multiple dispatch, this has to be fast. This is in most applications the major performance bottleneck (unless annotated with types such that the dispatches are done at compile time). + +We've recently updated Dylan to use the C3 algorithm for superclass linearization, which leads to monotonic method orderings. + +Eric Kidd already wrote a technical report about the possibility of compressing the dispatch tables, which waits to be implemented. Additionally further research by Yoav Zibin evaluates other optimizations, which need to be evaluated and applied to Dylan. + +For this project some algorithmic knowledge is needed. The code will be mainly in the Dylan runtime. + +Useful links: + +- `Eric Kidds technical report on compression of generic function tables `_ +- `Yoav Zibin thesis about efficient runtime algorithms `_ diff --git a/documentation/website/source/community/gsoc/2012/index.rst b/documentation/website/source/community/gsoc/2012/index.rst index 133bf7b124..c838358b74 100644 --- a/documentation/website/source/community/gsoc/2012/index.rst +++ b/documentation/website/source/community/gsoc/2012/index.rst @@ -28,3 +28,4 @@ via one of the above means. staticlink frontend-lisp project_manager + dispatch From fbf202db1c71e3ee04d6d2b9dd1864360ee46dc6 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 27 Feb 2012 23:12:52 -0500 Subject: [PATCH 181/519] fix minor things, add language header --- .../website/source/community/gsoc/2012/frontend-lisp.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/community/gsoc/2012/frontend-lisp.rst b/documentation/website/source/community/gsoc/2012/frontend-lisp.rst index 3b35b9f35e..e48a23bb7f 100644 --- a/documentation/website/source/community/gsoc/2012/frontend-lisp.rst +++ b/documentation/website/source/community/gsoc/2012/frontend-lisp.rst @@ -6,9 +6,9 @@ The purpose of this project would be to write another syntax for Dylan based on The project would include to write (or revive) a S-Expression lexer and parser for Dylan and translating this into the ``dfmc-definitions`` structure by using a macro-expander for Dylan macros. -The change towards the infix syntax was done before the programming language was finalized, thus not all features are present in the prefix syntax. This has to be taken into consideration and adjusted appropriately (by redefining the infix syntax). +The change towards the infix syntax was done before the programming language was finalized, thus not all features are present in the prefix syntax. This has to be taken into consideration and adjusted appropriately (by redefining the prefix syntax). -Using this approach both surface syntaxes (apart from macros) can be completely exchanged. Also, the semantics (control/data flow, optimization, type inference, backends) does not have to be touched at all. +Using this approach both surface syntaxes (apart from macros) can be completely exchanged. Also, the semantics (control/data flow, optimization, type inference, backends) does not have to be touched at all. Every dylan file already has rfc822 headers, one of these is ``Language:``, which values can be ``prefix-dylan`` and ``infix-dylan`` (where the latter is the default). Some references: From e9e529307f81e16402cbf92665c2a4fcd0acf656 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 27 Feb 2012 23:45:21 -0500 Subject: [PATCH 182/519] Fix typo. Remove redundancy. No need for .nal. --- .../source/community/gsoc/2012/project_manager.rst | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/documentation/website/source/community/gsoc/2012/project_manager.rst b/documentation/website/source/community/gsoc/2012/project_manager.rst index cf2a58564d..7582f3995f 100644 --- a/documentation/website/source/community/gsoc/2012/project_manager.rst +++ b/documentation/website/source/community/gsoc/2012/project_manager.rst @@ -4,18 +4,17 @@ Rethinking the Project Manager Problem ======= -The current project manager as a variety of problems that we would +The current project manager has a variety of problems that we would like to solve. These include: -* It combines install with build. Everything is built and installed - into the same location (``~/Open-Dylan``). +* It combines install with build. * Similarly, it doesn't distinguish between a library that I'm using and one that I'm developing. Not all dependencies should be treated in the same manner. While this is seen by some to be an advantage, I don't believe that it is in any larger scale setting with multiple endeavors happening at once. * It provides no versioning of libraries. -* Everything is always built in the shared location. This is pretty +* Everything is always built into a shared location. This is pretty confusing for new users. * It provides no way of locating, downloading or otherwise managing dependencies. You still have to download everything yourself, set @@ -72,11 +71,10 @@ Workspaces ---------- Workspaces are a new concept to Open Dylan and are a layer above the -project. A workspace is a collection of projects. In this document, -workspace files will have the extension ``NAL`` for ``Not A LID``. +project. (A project corresponds to a single library or executable.) Taking Network Night Vision as an example, you would have a top level -``nnv.nal`` file which contained (among other things) a list of the +``nnv.project`` file which contained (among other things) a list of the projects that were part of the Network Night Vision application, using relative paths from the workspace file: From 290b54dfc2a19e26e0ab7406a00412e48f57eaf2 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 27 Feb 2012 23:54:06 -0500 Subject: [PATCH 183/519] nnv.project -> nnv.workspace --- .../website/source/community/gsoc/2012/project_manager.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/community/gsoc/2012/project_manager.rst b/documentation/website/source/community/gsoc/2012/project_manager.rst index 7582f3995f..718cc7ef78 100644 --- a/documentation/website/source/community/gsoc/2012/project_manager.rst +++ b/documentation/website/source/community/gsoc/2012/project_manager.rst @@ -74,7 +74,7 @@ Workspaces are a new concept to Open Dylan and are a layer above the project. (A project corresponds to a single library or executable.) Taking Network Night Vision as an example, you would have a top level -``nnv.project`` file which contained (among other things) a list of the +``nnv.workspace`` file which contained (among other things) a list of the projects that were part of the Network Night Vision application, using relative paths from the workspace file: From a75071300aaaf9aacb53dd0db372ca129cd2e3b9 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 14 Mar 2012 10:08:12 +0700 Subject: [PATCH 184/519] Replace Yahoo site search with a Google custom search. This is 1) more powerful and 2) in response to offensive patent suits by Yahoo. --- .../website/source/_themes/opendylan/layout.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index c2fc974a39..9a2250ed97 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -49,9 +49,10 @@       {{ caption|e }} {% endfor -%} -
      - - + + + +
      @@ -108,6 +109,8 @@ + + {% endblock %} From 517045c0bfd2e3fec589471fb932d18ee82b7e35 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 14 Mar 2012 11:38:20 +0700 Subject: [PATCH 185/519] Update to Bootstrap 2.0.2. --- .../source/_themes/opendylan/layout.html | 6 +- .../css/bootstrap-responsive.css} | 555 ++++--- .../2.0.2/css/bootstrap-responsive.min.css | 12 + .../{2.0 => 2.0.2}/css/bootstrap.css | 1425 ++++++++++++----- .../{2.0 => 2.0.2}/css/bootstrap.min.css | 401 +++-- .../img/glyphicons-halflings-white.png | Bin .../img/glyphicons-halflings.png | Bin .../bootstrap/{2.0 => 2.0.2}/js/bootstrap.js | 106 +- .../bootstrap/2.0.2/js/bootstrap.min.js | 6 + .../2.0/css/bootstrap.min.responsive | 3 - .../static/bootstrap/2.0/js/bootstrap.min.js | 1 - 11 files changed, 1679 insertions(+), 836 deletions(-) rename documentation/website/source/_themes/opendylan/static/bootstrap/{2.0/css/bootstrap.responsive => 2.0.2/css/bootstrap-responsive.css} (73%) create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.min.css rename documentation/website/source/_themes/opendylan/static/bootstrap/{2.0 => 2.0.2}/css/bootstrap.css (75%) rename documentation/website/source/_themes/opendylan/static/bootstrap/{2.0 => 2.0.2}/css/bootstrap.min.css (64%) rename documentation/website/source/_themes/opendylan/static/bootstrap/{2.0 => 2.0.2}/img/glyphicons-halflings-white.png (100%) rename documentation/website/source/_themes/opendylan/static/bootstrap/{2.0 => 2.0.2}/img/glyphicons-halflings.png (100%) rename documentation/website/source/_themes/opendylan/static/bootstrap/{2.0 => 2.0.2}/js/bootstrap.js (95%) create mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.min.js delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.responsive delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.min.js diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index 9a2250ed97..facf14afe7 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -9,10 +9,10 @@ {% block doctype %} {% endblock %} -{% set css_files = css_files + ['_static/bootstrap/2.0/css/bootstrap.min.css', - '_static/bootstrap/2.0/css/bootstrap.min.responsive', +{% set css_files = css_files + ['_static/bootstrap/2.0.2/css/bootstrap.min.css', + '_static/bootstrap/2.0.2/css/bootstrap-responsive.min.css', '_static/opendylan.org/css/opendylan.css'] -%} -{% set script_files = script_files + ['_static/bootstrap/2.0/js/bootstrap.min.js'] -%} +{% set script_files = script_files + ['_static/bootstrap/2.0.2/js/bootstrap.min.js'] -%} {% set navigation_bar = [ ('index', 'Home'), ('about/index', 'About'), diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.responsive b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.css similarity index 73% rename from documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.responsive rename to documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.css index 4b032cdb55..0bc6de916b 100644 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.responsive +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.0.0 + * Bootstrap Responsive v2.0.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -7,10 +7,85 @@ * * 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); @@ -19,34 +94,8 @@ display: block; line-height: 18px; } - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - 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; - /* Older Webkit */ - - -moz-box-sizing: border-box; - /* Older FF */ - - -ms-box-sizing: border-box; - /* IE8 */ - - box-sizing: border-box; - /* CSS3 spec*/ - - } - .input-prepend input[class*="span"], .input-append input[class*="span"] { - width: auto; - } - input[type="checkbox"], input[type="radio"] { + input[type="checkbox"], + input[type="radio"] { border: 1px solid #ccc; } .form-horizontal .control-group > label { @@ -84,10 +133,17 @@ position: static; } } -@media (max-width: 768px) { +@media (max-width: 767px) { + body { + padding-left: 20px; + padding-right: 20px; + } + .navbar-fixed-top { + margin-left: -20px; + margin-right: -20px; + } .container { width: auto; - padding: 0 20px; } .row-fluid { width: 100%; @@ -95,19 +151,44 @@ .row { margin-left: 0; } - .row > [class*="span"], .row-fluid > [class*="span"] { + .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: 980px) { +@media (min-width: 768px) and (max-width: 979px) { .row { margin-left: -20px; *zoom: 1; } - .row:before, .row:after { + .row:before, + .row:after { display: table; content: ""; } @@ -118,80 +199,89 @@ float: left; margin-left: 20px; } - .span1 { - width: 42px; + .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 724px; } - .span2 { - width: 104px; + .span12 { + width: 724px; } - .span3 { - width: 166px; + .span11 { + width: 662px; } - .span4 { - width: 228px; + .span10 { + width: 600px; } - .span5 { - width: 290px; + .span9 { + width: 538px; } - .span6 { - width: 352px; + .span8 { + width: 476px; } .span7 { width: 414px; } - .span8 { - width: 476px; + .span6 { + width: 352px; } - .span9 { - width: 538px; + .span5 { + width: 290px; } - .span10 { - width: 600px; + .span4 { + width: 228px; } - .span11 { - width: 662px; + .span3 { + width: 166px; } - .span12, .container { - width: 724px; + .span2 { + width: 104px; } - .offset1 { - margin-left: 82px; + .span1 { + width: 42px; } - .offset2 { - margin-left: 144px; + .offset12 { + margin-left: 764px; } - .offset3 { - margin-left: 206px; + .offset11 { + margin-left: 702px; } - .offset4 { - margin-left: 268px; + .offset10 { + margin-left: 640px; } - .offset5 { - margin-left: 330px; + .offset9 { + margin-left: 578px; } - .offset6 { - margin-left: 392px; + .offset8 { + margin-left: 516px; } .offset7 { margin-left: 454px; } - .offset8 { - margin-left: 516px; + .offset6 { + margin-left: 392px; } - .offset9 { - margin-left: 578px; + .offset5 { + margin-left: 330px; } - .offset10 { - margin-left: 640px; + .offset4 { + margin-left: 268px; } - .offset11 { - margin-left: 702px; + .offset3 { + margin-left: 206px; + } + .offset2 { + margin-left: 144px; + } + .offset1 { + margin-left: 82px; } .row-fluid { width: 100%; *zoom: 1; } - .row-fluid:before, .row-fluid:after { + .row-fluid:before, + .row-fluid:after { display: table; content: ""; } @@ -205,80 +295,85 @@ .row-fluid > [class*="span"]:first-child { margin-left: 0; } - .row-fluid .span1 { - width: 5.801104972%; - } - .row-fluid .span2 { - width: 14.364640883%; + .row-fluid > .span12 { + width: 99.999999993%; } - .row-fluid .span3 { - width: 22.928176794%; + .row-fluid > .span11 { + width: 91.436464082%; } - .row-fluid .span4 { - width: 31.491712705%; + .row-fluid > .span10 { + width: 82.87292817100001%; } - .row-fluid .span5 { - width: 40.055248616%; + .row-fluid > .span9 { + width: 74.30939226%; } - .row-fluid .span6 { - width: 48.618784527%; + .row-fluid > .span8 { + width: 65.74585634900001%; } - .row-fluid .span7 { + .row-fluid > .span7 { width: 57.182320438000005%; } - .row-fluid .span8 { - width: 65.74585634900001%; + .row-fluid > .span6 { + width: 48.618784527%; } - .row-fluid .span9 { - width: 74.30939226%; + .row-fluid > .span5 { + width: 40.055248616%; } - .row-fluid .span10 { - width: 82.87292817100001%; + .row-fluid > .span4 { + width: 31.491712705%; } - .row-fluid .span11 { - width: 91.436464082%; + .row-fluid > .span3 { + width: 22.928176794%; } - .row-fluid .span12 { - width: 99.999999993%; + .row-fluid > .span2 { + width: 14.364640883%; } - input.span1, textarea.span1, .uneditable-input.span1 { - width: 32px; + .row-fluid > .span1 { + width: 5.801104972%; } - input.span2, textarea.span2, .uneditable-input.span2 { - width: 94px; + input, + textarea, + .uneditable-input { + margin-left: 0; } - input.span3, textarea.span3, .uneditable-input.span3 { - width: 156px; + input.span12, textarea.span12, .uneditable-input.span12 { + width: 714px; } - input.span4, textarea.span4, .uneditable-input.span4 { - width: 218px; + input.span11, textarea.span11, .uneditable-input.span11 { + width: 652px; } - input.span5, textarea.span5, .uneditable-input.span5 { - width: 280px; + input.span10, textarea.span10, .uneditable-input.span10 { + width: 590px; } - input.span6, textarea.span6, .uneditable-input.span6 { - width: 342px; + 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.span8, textarea.span8, .uneditable-input.span8 { - width: 466px; + input.span6, textarea.span6, .uneditable-input.span6 { + width: 342px; } - input.span9, textarea.span9, .uneditable-input.span9 { - width: 528px; + input.span5, textarea.span5, .uneditable-input.span5 { + width: 280px; } - input.span10, textarea.span10, .uneditable-input.span10 { - width: 590px; + input.span4, textarea.span4, .uneditable-input.span4 { + width: 218px; } - input.span11, textarea.span11, .uneditable-input.span11 { - width: 652px; + input.span3, textarea.span3, .uneditable-input.span3 { + width: 156px; } - input.span12, textarea.span12, .uneditable-input.span12 { - width: 714px; + input.span2, textarea.span2, .uneditable-input.span2 { + width: 94px; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 32px; } } -@media (max-width: 980px) { +@media (max-width: 979px) { body { padding-top: 0; } @@ -314,7 +409,12 @@ .navbar .nav > .divider-vertical { display: none; } - .navbar .nav > li > a, .navbar .dropdown-menu a { + .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; @@ -325,7 +425,8 @@ .navbar .dropdown-menu li + li a { margin-bottom: 2px; } - .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover { + .navbar .nav > li > a:hover, + .navbar .dropdown-menu a:hover { background-color: #222222; } .navbar .dropdown-menu { @@ -346,13 +447,15 @@ -moz-box-shadow: none; box-shadow: none; } - .navbar .dropdown-menu:before, .navbar .dropdown-menu:after { + .navbar .dropdown-menu:before, + .navbar .dropdown-menu:after { display: none; } .navbar .dropdown-menu .divider { display: none; } - .navbar-form, .navbar-search { + .navbar-form, + .navbar-search { float: none; padding: 9px 15px; margin: 9px 0; @@ -381,6 +484,7 @@ @media (min-width: 980px) { .nav-collapse.collapse { height: auto !important; + overflow: visible !important; } } @media (min-width: 1200px) { @@ -388,7 +492,8 @@ margin-left: -30px; *zoom: 1; } - .row:before, .row:after { + .row:before, + .row:after { display: table; content: ""; } @@ -399,80 +504,89 @@ float: left; margin-left: 30px; } - .span1 { - width: 70px; + .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 1170px; } - .span2 { - width: 170px; + .span12 { + width: 1170px; } - .span3 { - width: 270px; + .span11 { + width: 1070px; } - .span4 { - width: 370px; + .span10 { + width: 970px; } - .span5 { - width: 470px; + .span9 { + width: 870px; } - .span6 { - width: 570px; + .span8 { + width: 770px; } .span7 { width: 670px; } - .span8 { - width: 770px; + .span6 { + width: 570px; } - .span9 { - width: 870px; + .span5 { + width: 470px; } - .span10 { - width: 970px; + .span4 { + width: 370px; } - .span11 { - width: 1070px; + .span3 { + width: 270px; } - .span12, .container { - width: 1170px; + .span2 { + width: 170px; } - .offset1 { - margin-left: 130px; + .span1 { + width: 70px; } - .offset2 { - margin-left: 230px; + .offset12 { + margin-left: 1230px; } - .offset3 { - margin-left: 330px; + .offset11 { + margin-left: 1130px; } - .offset4 { - margin-left: 430px; + .offset10 { + margin-left: 1030px; } - .offset5 { - margin-left: 530px; + .offset9 { + margin-left: 930px; } - .offset6 { - margin-left: 630px; + .offset8 { + margin-left: 830px; } .offset7 { margin-left: 730px; } - .offset8 { - margin-left: 830px; + .offset6 { + margin-left: 630px; } - .offset9 { - margin-left: 930px; + .offset5 { + margin-left: 530px; } - .offset10 { - margin-left: 1030px; + .offset4 { + margin-left: 430px; } - .offset11 { - margin-left: 1130px; + .offset3 { + margin-left: 330px; + } + .offset2 { + margin-left: 230px; + } + .offset1 { + margin-left: 130px; } .row-fluid { width: 100%; *zoom: 1; } - .row-fluid:before, .row-fluid:after { + .row-fluid:before, + .row-fluid:after { display: table; content: ""; } @@ -486,77 +600,82 @@ .row-fluid > [class*="span"]:first-child { margin-left: 0; } - .row-fluid .span1 { - width: 5.982905983%; - } - .row-fluid .span2 { - width: 14.529914530000001%; + .row-fluid > .span12 { + width: 100%; } - .row-fluid .span3 { - width: 23.076923077%; + .row-fluid > .span11 { + width: 91.45299145300001%; } - .row-fluid .span4 { - width: 31.623931624%; + .row-fluid > .span10 { + width: 82.905982906%; } - .row-fluid .span5 { - width: 40.170940171000005%; + .row-fluid > .span9 { + width: 74.358974359%; } - .row-fluid .span6 { - width: 48.717948718%; + .row-fluid > .span8 { + width: 65.81196581200001%; } - .row-fluid .span7 { + .row-fluid > .span7 { width: 57.264957265%; } - .row-fluid .span8 { - width: 65.81196581200001%; + .row-fluid > .span6 { + width: 48.717948718%; } - .row-fluid .span9 { - width: 74.358974359%; + .row-fluid > .span5 { + width: 40.170940171000005%; } - .row-fluid .span10 { - width: 82.905982906%; + .row-fluid > .span4 { + width: 31.623931624%; } - .row-fluid .span11 { - width: 91.45299145300001%; + .row-fluid > .span3 { + width: 23.076923077%; } - .row-fluid .span12 { - width: 100%; + .row-fluid > .span2 { + width: 14.529914530000001%; } - input.span1, textarea.span1, .uneditable-input.span1 { - width: 60px; + .row-fluid > .span1 { + width: 5.982905983%; } - input.span2, textarea.span2, .uneditable-input.span2 { - width: 160px; + input, + textarea, + .uneditable-input { + margin-left: 0; } - input.span3, textarea.span3, .uneditable-input.span3 { - width: 260px; + input.span12, textarea.span12, .uneditable-input.span12 { + width: 1160px; } - input.span4, textarea.span4, .uneditable-input.span4 { - width: 360px; + input.span11, textarea.span11, .uneditable-input.span11 { + width: 1060px; } - input.span5, textarea.span5, .uneditable-input.span5 { - width: 460px; + input.span10, textarea.span10, .uneditable-input.span10 { + width: 960px; } - input.span6, textarea.span6, .uneditable-input.span6 { - width: 560px; + 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.span8, textarea.span8, .uneditable-input.span8 { - width: 760px; + input.span6, textarea.span6, .uneditable-input.span6 { + width: 560px; } - input.span9, textarea.span9, .uneditable-input.span9 { - width: 860px; + input.span5, textarea.span5, .uneditable-input.span5 { + width: 460px; } - input.span10, textarea.span10, .uneditable-input.span10 { - width: 960px; + input.span4, textarea.span4, .uneditable-input.span4 { + width: 360px; } - input.span11, textarea.span11, .uneditable-input.span11 { - width: 1060px; + input.span3, textarea.span3, .uneditable-input.span3 { + width: 260px; } - input.span12, textarea.span12, .uneditable-input.span12 { - width: 1160px; + input.span2, textarea.span2, .uneditable-input.span2 { + width: 160px; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 60px; } .thumbnails { margin-left: -30px; diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.min.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.min.css new file mode 100644 index 0000000000..60a47c9494 --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.min.css @@ -0,0 +1,12 @@ +.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;-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;-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;}} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.css similarity index 75% rename from documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.css rename to documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.css index 7babce5eb2..495188af7f 100644 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.css +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.0.0 + * Bootstrap v2.0.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -19,7 +19,9 @@ nav, section { display: block; } -audio, canvas, video { +audio, +canvas, +video { display: inline-block; *display: inline; *zoom: 1; @@ -33,14 +35,16 @@ html { -ms-text-size-adjust: 100%; } a:focus { - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -a:hover, a:active { +a:hover, +a:active { outline: 0; } -sub, sup { +sub, +sup { position: relative; font-size: 75%; line-height: 0; @@ -53,10 +57,10 @@ sub { bottom: -0.25em; } img { - max-width: 100%; height: auto; border: 0; -ms-interpolation-mode: bicubic; + vertical-align: middle; } button, input, @@ -66,11 +70,13 @@ textarea { font-size: 100%; vertical-align: middle; } -button, input { +button, +input { *overflow: visible; line-height: normal; } -button::-moz-focus-inner, input::-moz-focus-inner { +button::-moz-focus-inner, +input::-moz-focus-inner { padding: 0; border: 0; } @@ -87,13 +93,43 @@ input[type="search"] { -moz-box-sizing: content-box; box-sizing: content-box; } -input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { +input[type="search"]::-webkit-search-decoration, +input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; } textarea { overflow: auto; vertical-align: top; } +.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; +} body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -114,7 +150,8 @@ a:hover { margin-left: -20px; *zoom: 1; } -.row:before, .row:after { +.row:before, +.row:after { display: table; content: ""; } @@ -125,80 +162,89 @@ a:hover { float: left; margin-left: 20px; } -.span1 { - width: 60px; +.container, +.navbar-fixed-top .container, +.navbar-fixed-bottom .container { + width: 940px; } -.span2 { - width: 140px; +.span12 { + width: 940px; } -.span3 { - width: 220px; +.span11 { + width: 860px; } -.span4 { - width: 300px; +.span10 { + width: 780px; } -.span5 { - width: 380px; +.span9 { + width: 700px; } -.span6 { - width: 460px; +.span8 { + width: 620px; } .span7 { width: 540px; } -.span8 { - width: 620px; +.span6 { + width: 460px; } -.span9 { - width: 700px; +.span5 { + width: 380px; } -.span10 { - width: 780px; +.span4 { + width: 300px; } -.span11 { - width: 860px; +.span3 { + width: 220px; } -.span12, .container { - width: 940px; +.span2 { + width: 140px; } -.offset1 { - margin-left: 100px; +.span1 { + width: 60px; } -.offset2 { - margin-left: 180px; +.offset12 { + margin-left: 980px; } -.offset3 { - margin-left: 260px; +.offset11 { + margin-left: 900px; } -.offset4 { - margin-left: 340px; +.offset10 { + margin-left: 820px; } -.offset5 { - margin-left: 420px; +.offset9 { + margin-left: 740px; } -.offset6 { - margin-left: 500px; +.offset8 { + margin-left: 660px; } .offset7 { margin-left: 580px; } -.offset8 { - margin-left: 660px; +.offset6 { + margin-left: 500px; } -.offset9 { - margin-left: 740px; +.offset5 { + margin-left: 420px; } -.offset10 { - margin-left: 820px; +.offset4 { + margin-left: 340px; } -.offset11 { - margin-left: 900px; +.offset3 { + margin-left: 260px; +} +.offset2 { + margin-left: 180px; +} +.offset1 { + margin-left: 100px; } .row-fluid { width: 100%; *zoom: 1; } -.row-fluid:before, .row-fluid:after { +.row-fluid:before, +.row-fluid:after { display: table; content: ""; } @@ -212,49 +258,49 @@ a:hover { .row-fluid > [class*="span"]:first-child { margin-left: 0; } -.row-fluid .span1 { - width: 6.382978723%; -} -.row-fluid .span2 { - width: 14.89361702%; +.row-fluid > .span12 { + width: 99.99999998999999%; } -.row-fluid .span3 { - width: 23.404255317%; +.row-fluid > .span11 { + width: 91.489361693%; } -.row-fluid .span4 { - width: 31.914893614%; +.row-fluid > .span10 { + width: 82.97872339599999%; } -.row-fluid .span5 { - width: 40.425531911%; +.row-fluid > .span9 { + width: 74.468085099%; } -.row-fluid .span6 { - width: 48.93617020799999%; +.row-fluid > .span8 { + width: 65.95744680199999%; } -.row-fluid .span7 { +.row-fluid > .span7 { width: 57.446808505%; } -.row-fluid .span8 { - width: 65.95744680199999%; +.row-fluid > .span6 { + width: 48.93617020799999%; } -.row-fluid .span9 { - width: 74.468085099%; +.row-fluid > .span5 { + width: 40.425531911%; } -.row-fluid .span10 { - width: 82.97872339599999%; +.row-fluid > .span4 { + width: 31.914893614%; } -.row-fluid .span11 { - width: 91.489361693%; +.row-fluid > .span3 { + width: 23.404255317%; } -.row-fluid .span12 { - width: 99.99999998999999%; +.row-fluid > .span2 { + width: 14.89361702%; +} +.row-fluid > .span1 { + width: 6.382978723%; } .container { - width: 940px; margin-left: auto; margin-right: auto; *zoom: 1; } -.container:before, .container:after { +.container:before, +.container:after { display: table; content: ""; } @@ -266,7 +312,8 @@ a:hover { padding-right: 20px; *zoom: 1; } -.container-fluid:before, .container-fluid:after { +.container-fluid:before, +.container-fluid:after { display: table; content: ""; } @@ -296,8 +343,9 @@ h4, h5, h6 { margin: 0; + font-family: inherit; font-weight: bold; - color: #333333; + color: inherit; text-rendering: optimizelegibility; } h1 small, @@ -330,7 +378,9 @@ h3 { h3 small { font-size: 14px; } -h4, h5, h6 { +h4, +h5, +h6 { line-height: 18px; } h4 { @@ -355,7 +405,8 @@ h6 { .page-header h1 { line-height: 1; } -ul, ol { +ul, +ol { padding: 0; margin: 0 0 9px 25px; } @@ -374,26 +425,38 @@ ol { li { line-height: 18px; } -ul.unstyled { +ul.unstyled, +ol.unstyled { margin-left: 0; list-style: none; } dl { margin-bottom: 18px; } -dt, dd { +dt, +dd { line-height: 18px; } dt { font-weight: bold; + line-height: 17px; } dd { margin-left: 9px; } +.dl-horizontal dt { + float: left; + clear: left; + width: 120px; + text-align: right; +} +.dl-horizontal dd { + margin-left: 130px; +} hr { margin: 18px 0; border: 0; - border-top: 1px solid #e5e5e5; + border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } strong { @@ -405,12 +468,14 @@ em { .muted { color: #999999; } -abbr { - font-size: 90%; - text-transform: uppercase; +abbr[title] { border-bottom: 1px dotted #ddd; cursor: help; } +abbr.initialism { + font-size: 90%; + text-transform: uppercase; +} blockquote { padding: 0 0 0 15px; margin: 0 0 18px; @@ -437,7 +502,8 @@ blockquote.pull-right { border-left: 0; border-right: 5px solid #eeeeee; } -blockquote.pull-right p, blockquote.pull-right small { +blockquote.pull-right p, +blockquote.pull-right small { text-align: right; } q:before, @@ -458,7 +524,8 @@ small { cite { font-style: normal; } -code, pre { +code, +pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; @@ -468,7 +535,7 @@ code, pre { border-radius: 3px; } code { - padding: 3px 4px; + padding: 2px 4px; color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; @@ -477,7 +544,7 @@ pre { display: block; padding: 8.5px; margin: 0 0 9px; - font-size: 12px; + font-size: 12.025px; line-height: 18px; background-color: #f5f5f5; border: 1px solid #ccc; @@ -488,13 +555,20 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + word-wrap: break-word; } pre.prettyprint { margin-bottom: 18px; } pre code { padding: 0; + color: inherit; background-color: transparent; + border: 0; +} +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; } form { margin: 0 0 18px; @@ -515,16 +589,25 @@ legend { border: 0; border-bottom: 1px solid #eee; } +legend small { + font-size: 13.5px; + color: #999999; +} label, input, button, select, textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 18px; } +input, +button, +select, +textarea { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +} label { display: block; margin-bottom: 5px; @@ -542,7 +625,7 @@ select, font-size: 13px; line-height: 18px; color: #555555; - border: 1px solid #ccc; + border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -551,10 +634,14 @@ select, width: auto; height: auto; } -label input, label textarea, label select { +label input, +label textarea, +label select { display: block; } -input[type="image"], input[type="checkbox"], input[type="radio"] { +input[type="image"], +input[type="checkbox"], +input[type="radio"] { width: auto; height: auto; padding: 0; @@ -563,11 +650,19 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { /* IE7 */ line-height: normal; - border: 0; cursor: pointer; - border-radius: 0 \0/; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + border: 0 \9; + /* IE9 and down */ + +} +input[type="image"] { + border: 0; } input[type="file"] { + width: auto; padding: initial; line-height: initial; border: initial; @@ -577,11 +672,14 @@ input[type="file"] { -moz-box-shadow: none; box-shadow: none; } -input[type="button"], input[type="reset"], input[type="submit"] { +input[type="button"], +input[type="reset"], +input[type="submit"] { width: auto; height: auto; } -select, input[type="file"] { +select, +input[type="file"] { height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ @@ -590,11 +688,15 @@ select, input[type="file"] { line-height: 28px; } +input[type="file"] { + line-height: 18px \9; +} select { width: 220px; background-color: #ffffff; } -select[multiple], select[size] { +select[multiple], +select[size] { height: auto; } input[type="image"] { @@ -608,28 +710,32 @@ textarea { input[type="hidden"] { display: none; } -.radio, .checkbox { +.radio, +.checkbox { padding-left: 18px; } -.radio input[type="radio"], .checkbox input[type="checkbox"] { +.radio input[type="radio"], +.checkbox input[type="checkbox"] { float: left; margin-left: -18px; } -.controls > .radio:first-child, .controls > .checkbox:first-child { +.controls > .radio:first-child, +.controls > .checkbox:first-child { padding-top: 5px; } -.radio.inline, .checkbox.inline { +.radio.inline, +.checkbox.inline { display: inline-block; + padding-top: 5px; margin-bottom: 0; vertical-align: middle; } -.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { +.radio.inline + .radio.inline, +.checkbox.inline + .checkbox.inline { margin-left: 10px; } -.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { - padding-top: 0; -} -input, textarea { +input, +textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -639,21 +745,25 @@ input, textarea { -o-transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s; } -input:focus, textarea:focus { +input:focus, +textarea:focus { border-color: rgba(82, 168, 236, 0.8); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; outline: thin dotted \9; - /* IE6-8 */ + /* IE6-9 */ } -input[type="file"]:focus, input[type="checkbox"]:focus, select:focus { +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus, +select:focus { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -682,41 +792,46 @@ textarea[class*="span"], float: none; margin-left: 0; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +input, +textarea, +.uneditable-input { + margin-left: 0; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +input.span12, textarea.span12, .uneditable-input.span12 { + width: 930px; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +input.span11, textarea.span11, .uneditable-input.span11 { + width: 850px; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +input.span10, textarea.span10, .uneditable-input.span10 { + width: 770px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span9, textarea.span9, .uneditable-input.span9 { + width: 690px; } -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +input.span8, textarea.span8, .uneditable-input.span8 { + width: 610px; } input.span7, textarea.span7, .uneditable-input.span7 { width: 530px; } -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; +input.span6, textarea.span6, .uneditable-input.span6 { + width: 450px; } -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; +input.span5, textarea.span5, .uneditable-input.span5 { + width: 370px; } -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; +input.span4, textarea.span4, .uneditable-input.span4 { + width: 290px; } -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; +input.span3, textarea.span3, .uneditable-input.span3 { + width: 210px; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; +input.span2, textarea.span2, .uneditable-input.span2 { + width: 130px; +} +input.span1, textarea.span1, .uneditable-input.span1 { + width: 50px; } input[disabled], select[disabled], @@ -724,69 +839,94 @@ textarea[disabled], input[readonly], select[readonly], textarea[readonly] { - background-color: #f5f5f5; + background-color: #eeeeee; border-color: #ddd; cursor: not-allowed; } -.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { +.control-group.warning > label, +.control-group.warning .help-block, +.control-group.warning .help-inline { color: #c09853; } -.control-group.warning input, .control-group.warning select, .control-group.warning textarea { +.control-group.warning input, +.control-group.warning select, +.control-group.warning textarea { color: #c09853; border-color: #c09853; } -.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { +.control-group.warning input:focus, +.control-group.warning select:focus, +.control-group.warning textarea:focus { border-color: #a47e3c; -webkit-box-shadow: 0 0 6px #dbc59e; -moz-box-shadow: 0 0 6px #dbc59e; box-shadow: 0 0 6px #dbc59e; } -.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { +.control-group.warning .input-prepend .add-on, +.control-group.warning .input-append .add-on { color: #c09853; background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { +.control-group.error > label, +.control-group.error .help-block, +.control-group.error .help-inline { color: #b94a48; } -.control-group.error input, .control-group.error select, .control-group.error textarea { +.control-group.error input, +.control-group.error select, +.control-group.error textarea { color: #b94a48; border-color: #b94a48; } -.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { +.control-group.error input:focus, +.control-group.error select:focus, +.control-group.error textarea:focus { border-color: #953b39; -webkit-box-shadow: 0 0 6px #d59392; -moz-box-shadow: 0 0 6px #d59392; box-shadow: 0 0 6px #d59392; } -.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { color: #b94a48; background-color: #f2dede; border-color: #b94a48; } -.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { +.control-group.success > label, +.control-group.success .help-block, +.control-group.success .help-inline { color: #468847; } -.control-group.success input, .control-group.success select, .control-group.success textarea { +.control-group.success input, +.control-group.success select, +.control-group.success textarea { color: #468847; border-color: #468847; } -.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { +.control-group.success input:focus, +.control-group.success select:focus, +.control-group.success textarea:focus { border-color: #356635; -webkit-box-shadow: 0 0 6px #7aba7b; -moz-box-shadow: 0 0 6px #7aba7b; box-shadow: 0 0 6px #7aba7b; } -.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { +.control-group.success .input-prepend .add-on, +.control-group.success .input-append .add-on { color: #468847; background-color: #dff0d8; border-color: #468847; } -input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { +input:focus:required:invalid, +textarea:focus:required:invalid, +select:focus:required:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { +input:focus:required:invalid:focus, +textarea:focus:required:invalid:focus, +select:focus:required:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; @@ -796,8 +936,17 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec padding: 17px 20px 18px; margin-top: 18px; margin-bottom: 18px; - background-color: #f5f5f5; + background-color: #eeeeee; border-top: 1px solid #ddd; + *zoom: 1; +} +.form-actions:before, +.form-actions:after { + display: table; + content: ""; +} +.form-actions:after { + clear: both; } .uneditable-input { display: block; @@ -814,10 +963,13 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec ::-webkit-input-placeholder { color: #999999; } +.help-block, +.help-inline { + color: #555555; +} .help-block { - margin-top: 5px; - margin-bottom: 0; - color: #999999; + display: block; + margin-bottom: 9px; } .help-inline { display: inline-block; @@ -825,91 +977,106 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec /* IE7 inline-block hack */ *zoom: 1; - margin-bottom: 9px; vertical-align: middle; padding-left: 5px; } -.input-prepend, .input-append { +.input-prepend, +.input-append { margin-bottom: 5px; - *zoom: 1; -} -.input-prepend:before, -.input-append:before, -.input-prepend:after, -.input-append:after { - display: table; - content: ""; -} -.input-prepend:after, .input-append:after { - clear: both; } .input-prepend input, .input-append input, +.input-prepend select, +.input-append select, .input-prepend .uneditable-input, .input-append .uneditable-input { + *margin-left: 0; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .input-prepend input:focus, .input-append input:focus, +.input-prepend select:focus, +.input-append select:focus, .input-prepend .uneditable-input:focus, .input-append .uneditable-input:focus { position: relative; z-index: 2; } -.input-prepend .uneditable-input, .input-append .uneditable-input { +.input-prepend .uneditable-input, +.input-append .uneditable-input { border-left-color: #ccc; } -.input-prepend .add-on, .input-append .add-on { - float: left; - display: block; +.input-prepend .add-on, +.input-append .add-on { + display: inline-block; width: auto; min-width: 16px; height: 18px; - margin-right: -1px; padding: 4px 5px; font-weight: normal; line-height: 18px; - color: #999999; text-align: center; text-shadow: 0 1px 0 #ffffff; - background-color: #f5f5f5; + vertical-align: middle; + background-color: #eeeeee; border: 1px solid #ccc; +} +.input-prepend .add-on, +.input-append .add-on, +.input-prepend .btn, +.input-append .btn { -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-prepend .active, .input-append .active { +.input-prepend .active, +.input-append .active { background-color: #a9dba9; border-color: #46a546; } -.input-prepend .add-on { - *margin-top: 1px; - /* IE6-7 */ - +.input-prepend .add-on, +.input-prepend .btn { + margin-right: -1px; } -.input-append input, .input-append .uneditable-input { - float: left; +.input-append input, +.input-append select .uneditable-input { -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .input-append .uneditable-input { + border-left-color: #eee; border-right-color: #ccc; } -.input-append .add-on { - margin-right: 0; +.input-append .add-on, +.input-append .btn { margin-left: -1px; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-append input:first-child { - *margin-left: -160px; +.input-prepend.input-append input, +.input-prepend.input-append select, +.input-prepend.input-append .uneditable-input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.input-append input:first-child + .add-on { - *margin-left: -21px; +.input-prepend.input-append .add-on:first-child, +.input-prepend.input-append .btn:first-child { + margin-right: -1px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} +.input-prepend.input-append .add-on:last-child, +.input-prepend.input-append .btn:last-child { + margin-left: -1px; + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } .search-query { padding-left: 14px; @@ -933,28 +1100,51 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .form-horizontal .help-inline, .form-search .uneditable-input, .form-inline .uneditable-input, -.form-horizontal .uneditable-input { +.form-horizontal .uneditable-input, +.form-search .input-prepend, +.form-inline .input-prepend, +.form-horizontal .input-prepend, +.form-search .input-append, +.form-inline .input-append, +.form-horizontal .input-append { display: inline-block; margin-bottom: 0; } +.form-search .hide, +.form-inline .hide, +.form-horizontal .hide { + display: none; +} .form-search label, -.form-inline label, +.form-inline label { + display: inline-block; +} .form-search .input-append, .form-inline .input-append, .form-search .input-prepend, .form-inline .input-prepend { - display: inline-block; + margin-bottom: 0; } -.form-search .input-append .add-on, -.form-inline .input-prepend .add-on, -.form-search .input-append .add-on, -.form-inline .input-prepend .add-on { +.form-search .radio, +.form-search .checkbox, +.form-inline .radio, +.form-inline .checkbox { + padding-left: 0; + margin-bottom: 0; vertical-align: middle; } +.form-search .radio input[type="radio"], +.form-search .checkbox input[type="checkbox"], +.form-inline .radio input[type="radio"], +.form-inline .checkbox input[type="checkbox"] { + float: left; + margin-left: 0; + margin-right: 3px; +} .control-group { margin-bottom: 9px; } -.form-horizontal legend + .control-group { +legend + .control-group { margin-top: 18px; -webkit-margin-top-collapse: separate; } @@ -962,14 +1152,15 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec margin-bottom: 18px; *zoom: 1; } -.form-horizontal .control-group:before, .form-horizontal .control-group:after { +.form-horizontal .control-group:before, +.form-horizontal .control-group:after { display: table; content: ""; } .form-horizontal .control-group:after { clear: both; } -.form-horizontal .control-group > label { +.form-horizontal .control-label { float: left; width: 140px; padding-top: 5px; @@ -977,6 +1168,15 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec } .form-horizontal .controls { margin-left: 160px; + /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */ + + *display: inline-block; + *margin-left: 0; + *padding-left: 20px; +} +.form-horizontal .help-block { + margin-top: 9px; + margin-bottom: 0; } .form-horizontal .form-actions { padding-left: 160px; @@ -985,73 +1185,89 @@ table { max-width: 100%; border-collapse: collapse; border-spacing: 0; + background-color: transparent; } .table { width: 100%; margin-bottom: 18px; } -.table th, .table td { +.table th, +.table td { padding: 8px; line-height: 18px; text-align: left; - border-top: 1px solid #ddd; + vertical-align: top; + border-top: 1px solid #dddddd; } .table th { font-weight: bold; - vertical-align: bottom; } -.table td { - vertical-align: top; +.table thead th { + vertical-align: bottom; } -.table thead:first-child tr th, .table thead:first-child tr td { +.table colgroup + thead tr:first-child th, +.table colgroup + thead tr:first-child td, +.table thead:first-child tr:first-child th, +.table thead:first-child tr:first-child td { border-top: 0; } .table tbody + tbody { - border-top: 2px solid #ddd; + border-top: 2px solid #dddddd; } -.table-condensed th, .table-condensed td { +.table-condensed th, +.table-condensed td { padding: 4px 5px; } .table-bordered { - border: 1px solid #ddd; + border: 1px solid #dddddd; + border-left: 0; border-collapse: separate; *border-collapse: collapsed; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -.table-bordered th + th, -.table-bordered td + td, -.table-bordered th + td, -.table-bordered td + th { - border-left: 1px solid #ddd; +.table-bordered th, +.table-bordered td { + border-left: 1px solid #dddddd; } -.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { +.table-bordered thead:first-child tr:first-child th, +.table-bordered tbody:first-child tr:first-child th, +.table-bordered tbody:first-child tr:first-child td { border-top: 0; } -.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child th:first-child, +.table-bordered tbody:first-child tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -moz-border-radius: 4px 0 0 0; border-radius: 4px 0 0 0; } -.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child th:last-child, +.table-bordered tbody:first-child tr:first-child td:last-child { -webkit-border-radius: 0 4px 0 0; -moz-border-radius: 0 4px 0 0; border-radius: 0 4px 0 0; } -.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child { +.table-bordered thead:last-child tr:last-child th:first-child, +.table-bordered tbody:last-child tr:last-child td:first-child { -webkit-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px; border-radius: 0 0 0 4px; } -.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child th:last-child, +.table-bordered tbody:last-child tr:last-child td:last-child { -webkit-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0; border-radius: 0 0 4px 0; } -.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { background-color: #f9f9f9; } +.table tbody tr:hover td, +.table tbody tr:hover th { + background-color: #f5f5f5; +} table .span1 { float: none; width: 44px; @@ -1112,21 +1328,84 @@ table .span12 { width: 924px; margin-left: 0; } -[class^="icon-"] { +table .span13 { + float: none; + width: 1004px; + margin-left: 0; +} +table .span14 { + float: none; + width: 1084px; + margin-left: 0; +} +table .span15 { + float: none; + width: 1164px; + margin-left: 0; +} +table .span16 { + float: none; + width: 1244px; + margin-left: 0; +} +table .span17 { + float: none; + width: 1324px; + margin-left: 0; +} +table .span18 { + float: none; + width: 1404px; + margin-left: 0; +} +table .span19 { + float: none; + width: 1484px; + margin-left: 0; +} +table .span20 { + float: none; + width: 1564px; + margin-left: 0; +} +table .span21 { + float: none; + width: 1644px; + margin-left: 0; +} +table .span22 { + float: none; + width: 1724px; + margin-left: 0; +} +table .span23 { + float: none; + width: 1804px; + margin-left: 0; +} +table .span24 { + float: none; + width: 1884px; + margin-left: 0; +} +[class^="icon-"], +[class*=" icon-"] { display: inline-block; width: 14px; height: 14px; + line-height: 14px; vertical-align: text-top; - background-image: url(../img/glyphicons-halflings.png); + background-image: url("../img/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; *margin-right: .3em; } -[class^="icon-"]:last-child { +[class^="icon-"]:last-child, +[class*=" icon-"]:last-child { *margin-left: 0; } .icon-white { - background-image: url(../img/glyphicons-halflings-white.png); + background-image: url("../img/glyphicons-halflings-white.png"); } .icon-glass { background-position: 0 0; @@ -1494,28 +1773,28 @@ table .span12 { .dropdown-toggle { *margin-bottom: -3px; } -.dropdown-toggle:active, .open .dropdown-toggle { +.dropdown-toggle:active, +.open .dropdown-toggle { outline: 0; } .caret { display: inline-block; width: 0; height: 0; - text-indent: -99999px; - *text-indent: 0; vertical-align: top; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #000000; opacity: 0.3; filter: alpha(opacity=30); - content: "\2193"; + content: ""; } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, .open.dropdown .caret { +.dropdown:hover .caret, +.open.dropdown .caret { opacity: 1; filter: alpha(opacity=100); } @@ -1527,8 +1806,6 @@ table .span12 { float: left; display: none; min-width: 160px; - max-width: 220px; - _width: 160px; padding: 4px 0; margin: 0; list-style: none; @@ -1549,14 +1826,13 @@ table .span12 { *border-right-width: 2px; *border-bottom-width: 2px; } -.dropdown-menu.bottom-up { - top: auto; - bottom: 100%; - margin-bottom: 2px; +.dropdown-menu.pull-right { + right: 0; + left: auto; } .dropdown-menu .divider { height: 1px; - margin: 5px 1px; + margin: 8px 1px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; @@ -1569,10 +1845,12 @@ table .span12 { clear: both; font-weight: normal; line-height: 18px; - color: #555555; + color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { +.dropdown-menu li > a:hover, +.dropdown-menu .active > a, +.dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; background-color: #0088cc; @@ -1588,6 +1866,22 @@ table .span12 { .dropdown.open .dropdown-menu { display: block; } +.pull-right .dropdown-menu { + left: auto; + right: 0; +} +.dropup .caret, +.navbar-fixed-bottom .dropdown .caret { + border-top: 0; + border-bottom: 4px solid #000000; + content: "\2191"; +} +.dropup .dropdown-menu, +.navbar-fixed-bottom .dropdown .dropdown-menu { + top: auto; + bottom: 100%; + margin-bottom: 1px; +} .typeahead { margin-top: 2px; -webkit-border-radius: 4px; @@ -1612,6 +1906,18 @@ table .span12 { border-color: #ddd; border-color: rgba(0, 0, 0, 0.15); } +.well-large { + padding: 24px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.well-small { + padding: 9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} .fade { -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; @@ -1655,23 +1961,32 @@ table .span12 { } .btn { display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; padding: 4px 10px 4px; + margin-bottom: 0; font-size: 13px; line-height: 18px; color: #333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - background-color: #fafafa; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; + vertical-align: middle; + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(top, #ffffff, #e6e6e6); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - border: 1px solid #ccc; - border-bottom-color: #bbb; + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + border: 1px solid #cccccc; + border-bottom-color: #b3b3b3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1681,6 +1996,17 @@ table .span12 { cursor: pointer; *margin-left: .3em; } +.btn:hover, +.btn:active, +.btn.active, +.btn.disabled, +.btn[disabled] { + background-color: #e6e6e6; +} +.btn:active, +.btn.active { + background-color: #cccccc \9; +} .btn:first-child { *margin-left: 0; } @@ -1696,21 +2022,22 @@ table .span12 { transition: background-position 0.1s linear; } .btn:focus { - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -.btn.active, .btn:active { +.btn.active, +.btn:active { background-image: none; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); background-color: #e6e6e6; background-color: #d9d9d9 \9; - color: rgba(0, 0, 0, 0.5); outline: 0; } -.btn.disabled, .btn[disabled] { +.btn.disabled, +.btn[disabled] { cursor: default; background-image: none; background-color: #e6e6e6; @@ -1728,7 +2055,7 @@ table .span12 { -moz-border-radius: 5px; border-radius: 5px; } -.btn-large .icon { +.btn-large [class^="icon-"] { margin-top: 1px; } .btn-small { @@ -1736,9 +2063,14 @@ table .span12 { font-size: 11px; line-height: 16px; } -.btn-small .icon { +.btn-small [class^="icon-"] { margin-top: -1px; } +.btn-mini { + padding: 2px 6px; + font-size: 11px; + line-height: 14px; +} .btn-primary, .btn-primary:hover, .btn-warning, @@ -1748,7 +2080,9 @@ table .span12 { .btn-success, .btn-success:hover, .btn-info, -.btn-info:hover { +.btn-info:hover, +.btn-inverse, +.btn-inverse:hover { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); color: #ffffff; } @@ -1756,32 +2090,34 @@ table .span12 { .btn-warning.active, .btn-danger.active, .btn-success.active, -.btn-info.active { +.btn-info.active, +.btn-inverse.active { color: rgba(255, 255, 255, 0.75); } .btn-primary { - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -ms-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); + background-color: #0074cc; + background-image: -moz-linear-gradient(top, #0088cc, #0055cc); + background-image: -ms-linear-gradient(top, #0088cc, #0055cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); + background-image: -o-linear-gradient(top, #0088cc, #0055cc); + background-image: linear-gradient(top, #0088cc, #0055cc); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); - border-color: #0044cc #0044cc #002a80; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); + border-color: #0055cc #0055cc #003580; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); } .btn-primary:hover, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #0044cc; + background-color: #0055cc; } -.btn-primary:active, .btn-primary.active { - background-color: #003399 \9; +.btn-primary:active, +.btn-primary.active { + background-color: #004099 \9; } .btn-warning { background-color: #faa732; @@ -1795,7 +2131,7 @@ table .span12 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); } .btn-warning:hover, .btn-warning:active, @@ -1804,7 +2140,8 @@ table .span12 { .btn-warning[disabled] { background-color: #f89406; } -.btn-warning:active, .btn-warning.active { +.btn-warning:active, +.btn-warning.active { background-color: #c67605 \9; } .btn-danger { @@ -1819,7 +2156,7 @@ table .span12 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); } .btn-danger:hover, .btn-danger:active, @@ -1828,7 +2165,8 @@ table .span12 { .btn-danger[disabled] { background-color: #bd362f; } -.btn-danger:active, .btn-danger.active { +.btn-danger:active, +.btn-danger.active { background-color: #942a25 \9; } .btn-success { @@ -1843,7 +2181,7 @@ table .span12 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); } .btn-success:hover, .btn-success:active, @@ -1852,7 +2190,8 @@ table .span12 { .btn-success[disabled] { background-color: #51a351; } -.btn-success:active, .btn-success.active { +.btn-success:active, +.btn-success.active { background-color: #408140 \9; } .btn-info { @@ -1867,7 +2206,7 @@ table .span12 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); } .btn-info:hover, .btn-info:active, @@ -1876,31 +2215,67 @@ table .span12 { .btn-info[disabled] { background-color: #2f96b4; } -.btn-info:active, .btn-info.active { +.btn-info:active, +.btn-info.active { background-color: #24748c \9; } -button.btn, input[type="submit"].btn { +.btn-inverse { + background-color: #414141; + background-image: -moz-linear-gradient(top, #555555, #222222); + background-image: -ms-linear-gradient(top, #555555, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); + background-image: -webkit-linear-gradient(top, #555555, #222222); + background-image: -o-linear-gradient(top, #555555, #222222); + background-image: linear-gradient(top, #555555, #222222); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + border-color: #222222 #222222 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); +} +.btn-inverse:hover, +.btn-inverse:active, +.btn-inverse.active, +.btn-inverse.disabled, +.btn-inverse[disabled] { + background-color: #222222; +} +.btn-inverse:active, +.btn-inverse.active { + background-color: #080808 \9; +} +button.btn, +input[type="submit"].btn { *padding-top: 2px; *padding-bottom: 2px; } -button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { +button.btn::-moz-focus-inner, +input[type="submit"].btn::-moz-focus-inner { padding: 0; border: 0; } -button.btn.large, input[type="submit"].btn.large { +button.btn.btn-large, +input[type="submit"].btn.btn-large { *padding-top: 7px; *padding-bottom: 7px; } -button.btn.small, input[type="submit"].btn.small { +button.btn.btn-small, +input[type="submit"].btn.btn-small { *padding-top: 3px; *padding-bottom: 3px; } +button.btn.btn-mini, +input[type="submit"].btn.btn-mini { + *padding-top: 1px; + *padding-bottom: 1px; +} .btn-group { position: relative; *zoom: 1; *margin-left: .3em; } -.btn-group:before, .btn-group:after { +.btn-group:before, +.btn-group:after { display: table; content: ""; } @@ -1941,7 +2316,8 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; } -.btn-group .btn:last-child, .btn-group .dropdown-toggle { +.btn-group .btn:last-child, +.btn-group .dropdown-toggle { -webkit-border-top-right-radius: 4px; -moz-border-radius-topright: 4px; border-top-right-radius: 4px; @@ -1958,7 +2334,8 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius-bottomleft: 6px; border-bottom-left-radius: 6px; } -.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle { +.btn-group .btn.large:last-child, +.btn-group .large.dropdown-toggle { -webkit-border-top-right-radius: 6px; -moz-border-radius-topright: 6px; border-top-right-radius: 6px; @@ -1972,7 +2349,8 @@ button.btn.small, input[type="submit"].btn.small { .btn-group .btn.active { z-index: 2; } -.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { +.btn-group .dropdown-toggle:active, +.btn-group.open .dropdown-toggle { outline: 0; } .btn-group .dropdown-toggle { @@ -1981,8 +2359,22 @@ button.btn.small, input[type="submit"].btn.small { -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - *padding-top: 5px; - *padding-bottom: 5px; + *padding-top: 3px; + *padding-bottom: 3px; +} +.btn-group .btn-mini.dropdown-toggle { + padding-left: 5px; + padding-right: 5px; + *padding-top: 1px; + *padding-bottom: 1px; +} +.btn-group .btn-small.dropdown-toggle { + *padding-top: 4px; + *padding-bottom: 4px; +} +.btn-group .btn-large.dropdown-toggle { + padding-left: 12px; + padding-right: 12px; } .btn-group.open { *z-index: 1000; @@ -2004,21 +2396,34 @@ button.btn.small, input[type="submit"].btn.small { margin-top: 7px; margin-left: 0; } -.btn:hover .caret, .open.btn-group .caret { +.btn:hover .caret, +.open.btn-group .caret { opacity: 1; filter: alpha(opacity=100); } +.btn-mini .caret { + margin-top: 5px; +} +.btn-small .caret { + margin-top: 6px; +} +.btn-large .caret { + margin-top: 6px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; +} .btn-primary .caret, +.btn-warning .caret, .btn-danger .caret, .btn-info .caret, -.btn-success .caret { +.btn-success .caret, +.btn-inverse .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; opacity: 0.75; filter: alpha(opacity=75); } -.btn-small .caret { - margin-top: 4px; -} .alert { padding: 8px 35px 8px 14px; margin-bottom: 18px; @@ -2028,10 +2433,11 @@ button.btn.small, input[type="submit"].btn.small { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -} -.alert, .alert-heading { color: #c09853; } +.alert-heading { + color: inherit; +} .alert .close { position: relative; top: -2px; @@ -2041,32 +2447,25 @@ button.btn.small, input[type="submit"].btn.small { .alert-success { background-color: #dff0d8; border-color: #d6e9c6; -} -.alert-success, .alert-success .alert-heading { color: #468847; } -.alert-danger, .alert-error { +.alert-danger, +.alert-error { background-color: #f2dede; border-color: #eed3d7; -} -.alert-danger, -.alert-error, -.alert-danger .alert-heading, -.alert-error .alert-heading { color: #b94a48; } .alert-info { background-color: #d9edf7; border-color: #bce8f1; -} -.alert-info, .alert-info .alert-heading { color: #3a87ad; } .alert-block { padding-top: 14px; padding-bottom: 14px; } -.alert-block > p, .alert-block > ul { +.alert-block > p, +.alert-block > ul { margin-bottom: 0; } .alert-block p + p { @@ -2084,37 +2483,53 @@ button.btn.small, input[type="submit"].btn.small { text-decoration: none; background-color: #eeeeee; } -.nav-list { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; -} -.nav-list > li > a, .nav-list .nav-header { +.nav .nav-header { display: block; padding: 3px 15px; - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.nav-list .nav-header { font-size: 11px; font-weight: bold; line-height: 18px; color: #999999; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; } -.nav-list > li + .nav-header { +.nav li + .nav-header { margin-top: 9px; } -.nav-list .active > a { +.nav-list { + padding-left: 15px; + padding-right: 15px; + margin-bottom: 0; +} +.nav-list > li > a, +.nav-list .nav-header { + margin-left: -15px; + margin-right: -15px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} +.nav-list > li > a { + padding: 3px 15px; +} +.nav-list > .active > a, +.nav-list > .active > a:hover { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #0088cc; } -.nav-list .icon { +.nav-list [class^="icon-"] { margin-right: 2px; } -.nav-tabs, .nav-pills { +.nav-list .divider { + height: 1px; + margin: 8px 1px; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid #ffffff; + *width: 100%; + *margin: -5px 0 5px; +} +.nav-tabs, +.nav-pills { *zoom: 1; } .nav-tabs:before, @@ -2124,13 +2539,16 @@ button.btn.small, input[type="submit"].btn.small { display: table; content: ""; } -.nav-tabs:after, .nav-pills:after { +.nav-tabs:after, +.nav-pills:after { clear: both; } -.nav-tabs > li, .nav-pills > li { +.nav-tabs > li, +.nav-pills > li { float: left; } -.nav-tabs > li > a, .nav-pills > li > a { +.nav-tabs > li > a, +.nav-pills > li > a { padding-right: 12px; padding-left: 12px; margin-right: 2px; @@ -2143,8 +2561,9 @@ button.btn.small, input[type="submit"].btn.small { margin-bottom: -1px; } .nav-tabs > li > a { - padding-top: 9px; - padding-bottom: 9px; + padding-top: 8px; + padding-bottom: 8px; + line-height: 18px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; @@ -2153,7 +2572,8 @@ button.btn.small, input[type="submit"].btn.small { .nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #dddddd; } -.nav-tabs > .active > a, .nav-tabs > .active > a:hover { +.nav-tabs > .active > a, +.nav-tabs > .active > a:hover { color: #555555; background-color: #ffffff; border: 1px solid #ddd; @@ -2169,7 +2589,8 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius: 5px; border-radius: 5px; } -.nav-pills .active > a, .nav-pills .active > a:hover { +.nav-pills > .active > a, +.nav-pills > .active > a:hover { color: #ffffff; background-color: #0088cc; } @@ -2208,7 +2629,8 @@ button.btn.small, input[type="submit"].btn.small { .nav-pills.nav-stacked > li:last-child > a { margin-bottom: 1px; } -.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu { +.nav-tabs .dropdown-menu, +.nav-pills .dropdown-menu { margin-top: 1px; border-width: 1px; } @@ -2217,27 +2639,38 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius: 4px; border-radius: 4px; } -.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { +.nav-tabs .dropdown-toggle .caret, +.nav-pills .dropdown-toggle .caret { border-top-color: #0088cc; + border-bottom-color: #0088cc; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { +.nav-tabs .dropdown-toggle:hover .caret, +.nav-pills .dropdown-toggle:hover .caret { border-top-color: #005580; + border-bottom-color: #005580; } -.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret { +.nav-tabs .active .dropdown-toggle .caret, +.nav-pills .active .dropdown-toggle .caret { border-top-color: #333333; + border-bottom-color: #333333; } .nav > .dropdown.active > a:hover { color: #000000; cursor: pointer; } -.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover { +.nav-tabs .open .dropdown-toggle, +.nav-pills .open .dropdown-toggle, +.nav > .open.active > a:hover { color: #ffffff; background-color: #999999; border-color: #999999; } -.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { +.nav .open .caret, +.nav .open.active .caret, +.nav .open a:hover .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } @@ -2247,20 +2680,29 @@ button.btn.small, input[type="submit"].btn.small { .tabbable { *zoom: 1; } -.tabbable:before, .tabbable:after { +.tabbable:before, +.tabbable:after { display: table; content: ""; } .tabbable:after { clear: both; } -.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { +.tab-content { + display: table; + width: 100%; +} +.tabs-below .nav-tabs, +.tabs-right .nav-tabs, +.tabs-left .nav-tabs { border-bottom: 0; } -.tab-content > .tab-pane, .pill-content > .pill-pane { +.tab-content > .tab-pane, +.pill-content > .pill-pane { display: none; } -.tab-content > .active, .pill-content > .active { +.tab-content > .active, +.pill-content > .active { display: block; } .tabs-below .nav-tabs { @@ -2279,13 +2721,16 @@ button.btn.small, input[type="submit"].btn.small { border-bottom-color: transparent; border-top-color: #ddd; } -.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover { +.tabs-below .nav-tabs .active > a, +.tabs-below .nav-tabs .active > a:hover { border-color: transparent #ddd #ddd #ddd; } -.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li { +.tabs-left .nav-tabs > li, +.tabs-right .nav-tabs > li { float: none; } -.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a { +.tabs-left .nav-tabs > li > a, +.tabs-right .nav-tabs > li > a { min-width: 74px; margin-right: 0; margin-bottom: 3px; @@ -2304,7 +2749,8 @@ button.btn.small, input[type="submit"].btn.small { .tabs-left .nav-tabs > li > a:hover { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } -.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { +.tabs-left .nav-tabs .active > a, +.tabs-left .nav-tabs .active > a:hover { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2322,11 +2768,14 @@ button.btn.small, input[type="submit"].btn.small { .tabs-right .nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } -.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { +.tabs-right .nav-tabs .active > a, +.tabs-right .nav-tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } .navbar { + *position: relative; + *z-index: 2; overflow: visible; margin-bottom: 18px; } @@ -2349,6 +2798,9 @@ button.btn.small, input[type="submit"].btn.small { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } +.navbar .container { + width: auto; +} .btn-navbar { display: none; float: right; @@ -2366,7 +2818,7 @@ button.btn.small, input[type="submit"].btn.small { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -2378,7 +2830,8 @@ button.btn.small, input[type="submit"].btn.small { .btn-navbar[disabled] { background-color: #222222; } -.btn-navbar:active, .btn-navbar.active { +.btn-navbar:active, +.btn-navbar.active { background-color: #080808 \9; } .btn-navbar .icon-bar { @@ -2399,6 +2852,9 @@ button.btn.small, input[type="submit"].btn.small { .nav-collapse.collapse { height: auto; } +.navbar { + color: #999999; +} .navbar .brand:hover { text-decoration: none; } @@ -2415,13 +2871,9 @@ button.btn.small, input[type="submit"].btn.small { .navbar .navbar-text { margin-bottom: 0; line-height: 40px; - color: #999999; } -.navbar .navbar-text a:hover { - color: #ffffff; - background-color: transparent; -} -.navbar .btn, .navbar .btn-group { +.navbar .btn, +.navbar .btn-group { margin-top: 5px; } .navbar .btn-group .btn { @@ -2431,24 +2883,39 @@ button.btn.small, input[type="submit"].btn.small { margin-bottom: 0; *zoom: 1; } -.navbar-form:before, .navbar-form:after { +.navbar-form:before, +.navbar-form:after { display: table; content: ""; } .navbar-form:after { clear: both; } -.navbar-form input, .navbar-form select { - display: inline-block; +.navbar-form input, +.navbar-form select, +.navbar-form .radio, +.navbar-form .checkbox { margin-top: 5px; - margin-bottom: 0; } -.navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; +.navbar-form input, +.navbar-form select { + display: inline-block; + margin-bottom: 0; } -.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { +.navbar-form input[type="image"], +.navbar-form input[type="checkbox"], +.navbar-form input[type="radio"] { margin-top: 3px; } +.navbar-form .input-append, +.navbar-form .input-prepend { + margin-top: 6px; + white-space: nowrap; +} +.navbar-form .input-append input, +.navbar-form .input-prepend input { + margin-top: 0; +} .navbar-search { position: relative; float: left; @@ -2462,10 +2929,8 @@ button.btn.small, input[type="submit"].btn.small { font-weight: normal; line-height: 1; color: #ffffff; - color: rgba(255, 255, 255, 0.75); - background: #666; - background: rgba(255, 255, 255, 0.3); - border: 1px solid #111; + background-color: #626262; + border: 1px solid #151515; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); @@ -2475,18 +2940,14 @@ button.btn.small, input[type="submit"].btn.small { -o-transition: none; transition: none; } -.navbar-search .search-query :-moz-placeholder { - color: #eeeeee; +.navbar-search .search-query:-moz-placeholder { + color: #cccccc; } .navbar-search .search-query::-webkit-input-placeholder { - color: #eeeeee; -} -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #999999; - background-color: rgba(255, 255, 255, 0.5); + color: #cccccc; } -.navbar-search .search-query:focus, .navbar-search .search-query.focused { +.navbar-search .search-query:focus, +.navbar-search .search-query.focused { padding: 5px 10px; color: #333333; text-shadow: 0 1px 0 #ffffff; @@ -2497,20 +2958,32 @@ button.btn.small, input[type="submit"].btn.small { box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); outline: 0; } -.navbar-fixed-top { +.navbar-fixed-top, +.navbar-fixed-bottom { position: fixed; - top: 0; right: 0; left: 0; z-index: 1030; + margin-bottom: 0; } -.navbar-fixed-top .navbar-inner { +.navbar-fixed-top .navbar-inner, +.navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.navbar-fixed-top .container, +.navbar-fixed-bottom .container { + width: 940px; +} +.navbar-fixed-top { + top: 0; +} +.navbar-fixed-bottom { + bottom: 0; +} .navbar .nav { position: relative; left: 0; @@ -2538,11 +3011,11 @@ button.btn.small, input[type="submit"].btn.small { color: #ffffff; text-decoration: none; } -.navbar .nav .active > a, .navbar .nav .active > a:hover { +.navbar .nav .active > a, +.navbar .nav .active > a:hover { color: #ffffff; text-decoration: none; background-color: #222222; - background-color: rgba(0, 0, 0, 0.5); } .navbar .divider-vertical { height: 40px; @@ -2583,34 +3056,55 @@ button.btn.small, input[type="submit"].btn.small { top: -6px; left: 10px; } -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { +.navbar-fixed-bottom .dropdown-menu:before { + border-top: 7px solid #ccc; + border-top-color: rgba(0, 0, 0, 0.2); + border-bottom: 0; + bottom: -7px; + top: auto; +} +.navbar-fixed-bottom .dropdown-menu:after { + border-top: 6px solid #ffffff; + border-bottom: 0; + bottom: -6px; + top: auto; +} +.navbar .nav .dropdown-toggle .caret, +.navbar .nav .open.dropdown .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; } .navbar .nav .active .caret { opacity: 1; filter: alpha(opacity=100); } -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { +.navbar .nav .open > .dropdown-toggle, +.navbar .nav .active > .dropdown-toggle, +.navbar .nav .open.active > .dropdown-toggle { background-color: transparent; } .navbar .nav .active > .dropdown-toggle:hover { color: #ffffff; } -.navbar .nav.pull-right .dropdown-menu { +.navbar .nav.pull-right .dropdown-menu, +.navbar .nav .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .nav.pull-right .dropdown-menu:before { +.navbar .nav.pull-right .dropdown-menu:before, +.navbar .nav .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .nav.pull-right .dropdown-menu:after { +.navbar .nav.pull-right .dropdown-menu:after, +.navbar .nav .dropdown-menu.pull-right:after { left: auto; right: 13px; } .breadcrumb { padding: 7px 14px; margin: 0 0 18px; + list-style: none; background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); @@ -2629,7 +3123,11 @@ button.btn.small, input[type="submit"].btn.small { box-shadow: inset 0 1px 0 #ffffff; } .breadcrumb li { - display: inline; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; text-shadow: 0 1px 0 #ffffff; } .breadcrumb .divider { @@ -2669,14 +3167,17 @@ button.btn.small, input[type="submit"].btn.small { border: 1px solid #ddd; border-left-width: 0; } -.pagination a:hover, .pagination .active a { +.pagination a:hover, +.pagination .active a { background-color: #f5f5f5; } .pagination .active a { color: #999999; cursor: default; } -.pagination .disabled a, .pagination .disabled a:hover { +.pagination .disabled span, +.pagination .disabled a, +.pagination .disabled a:hover { color: #999999; background-color: transparent; cursor: default; @@ -2705,7 +3206,8 @@ button.btn.small, input[type="submit"].btn.small { text-align: center; *zoom: 1; } -.pager:before, .pager:after { +.pager:before, +.pager:after { display: table; content: ""; } @@ -2734,6 +3236,12 @@ button.btn.small, input[type="submit"].btn.small { .pager .previous a { float: left; } +.pager .disabled a, +.pager .disabled a:hover { + color: #999999; + background-color: #fff; + cursor: default; +} .modal-open .dropdown-menu { z-index: 2050; } @@ -2758,7 +3266,8 @@ button.btn.small, input[type="submit"].btn.small { .modal-backdrop.fade { opacity: 0; } -.modal-backdrop, .modal-backdrop.fade.in { +.modal-backdrop, +.modal-backdrop.fade.in { opacity: 0.8; filter: alpha(opacity=80); } @@ -2767,7 +3276,6 @@ button.btn.small, input[type="submit"].btn.small { top: 50%; left: 50%; z-index: 1050; - max-height: 500px; overflow: auto; width: 560px; margin: -250px 0 0 -280px; @@ -2806,11 +3314,17 @@ button.btn.small, input[type="submit"].btn.small { margin-top: 2px; } .modal-body { + overflow-y: auto; + max-height: 400px; padding: 15px; } +.modal-form { + margin-bottom: 0; +} .modal-footer { padding: 14px 15px 15px; margin-bottom: 0; + text-align: right; background-color: #f5f5f5; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 6px 6px; @@ -2821,18 +3335,21 @@ button.btn.small, input[type="submit"].btn.small { box-shadow: inset 0 1px 0 #ffffff; *zoom: 1; } -.modal-footer:before, .modal-footer:after { +.modal-footer:before, +.modal-footer:after { display: table; content: ""; } .modal-footer:after { clear: both; } -.modal-footer .btn { - float: right; +.modal-footer .btn + .btn { margin-left: 5px; margin-bottom: 0; } +.modal-footer .btn-group .btn + .btn { + margin-left: -1px; +} .tooltip { position: absolute; z-index: 1020; @@ -2996,7 +3513,9 @@ button.btn.small, input[type="submit"].btn.small { -moz-background-clip: padding-box; background-clip: padding-box; } -.popover-content p, .popover-content ul, .popover-content ol { +.popover-content p, +.popover-content ul, +.popover-content ol { margin-bottom: 0; } .thumbnails { @@ -3004,7 +3523,8 @@ button.btn.small, input[type="submit"].btn.small { list-style: none; *zoom: 1; } -.thumbnails:before, .thumbnails:after { +.thumbnails:before, +.thumbnails:after { display: table; content: ""; } @@ -3043,28 +3563,99 @@ a.thumbnail:hover { padding: 9px; } .label { - padding: 1px 3px 2px; - font-size: 9.75px; + padding: 1px 4px 2px; + font-size: 10.998px; font-weight: bold; + line-height: 13px; color: #ffffff; - text-transform: uppercase; + vertical-align: middle; + white-space: nowrap; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #999999; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } +.label:hover { + color: #ffffff; + text-decoration: none; +} .label-important { background-color: #b94a48; } +.label-important:hover { + background-color: #953b39; +} .label-warning { background-color: #f89406; } +.label-warning:hover { + background-color: #c67605; +} .label-success { background-color: #468847; } +.label-success:hover { + background-color: #356635; +} .label-info { background-color: #3a87ad; } +.label-info:hover { + background-color: #2d6987; +} +.label-inverse { + background-color: #333333; +} +.label-inverse:hover { + background-color: #1a1a1a; +} +.badge { + padding: 1px 9px 2px; + font-size: 12.025px; + font-weight: bold; + white-space: nowrap; + color: #ffffff; + background-color: #999999; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; +} +.badge:hover { + color: #ffffff; + text-decoration: none; + cursor: pointer; +} +.badge-error { + background-color: #b94a48; +} +.badge-error:hover { + background-color: #953b39; +} +.badge-warning { + background-color: #f89406; +} +.badge-warning:hover { + background-color: #c67605; +} +.badge-success { + background-color: #468847; +} +.badge-success:hover { + background-color: #356635; +} +.badge-info { + background-color: #3a87ad; +} +.badge-info:hover { + background-color: #2d6987; +} +.badge-inverse { + background-color: #333333; +} +.badge-inverse:hover { + background-color: #1a1a1a; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 0 0; @@ -3081,6 +3672,14 @@ a.thumbnail:hover { background-position: 40px 0; } } +@-ms-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} @keyframes progress-bar-stripes { from { background-position: 0 0; @@ -3130,6 +3729,7 @@ a.thumbnail:hover { box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; + -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; @@ -3138,7 +3738,7 @@ a.thumbnail:hover { transition: width 0.6s ease; } .progress-striped .bar { - background-color: #62c462; + background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -3215,6 +3815,26 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } +.progress-warning .bar { + background-color: #faa732; + background-image: -moz-linear-gradient(top, #fbb450, #f89406); + background-image: -ms-linear-gradient(top, #fbb450, #f89406); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); + background-image: -webkit-linear-gradient(top, #fbb450, #f89406); + background-image: -o-linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(top, #fbb450, #f89406); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); +} +.progress-warning.progress-striped .bar { + background-color: #fbb450; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} .accordion { margin-bottom: 18px; } @@ -3259,13 +3879,16 @@ a.thumbnail:hover { display: block; line-height: 1; } -.carousel .active, .carousel .next, .carousel .prev { +.carousel .active, +.carousel .next, +.carousel .prev { display: block; } .carousel .active { left: 0; } -.carousel .next, .carousel .prev { +.carousel .next, +.carousel .prev { position: absolute; top: 0; width: 100%; @@ -3276,7 +3899,8 @@ a.thumbnail:hover { .carousel .prev { left: -100%; } -.carousel .next.left, .carousel .prev.right { +.carousel .next.left, +.carousel .prev.right { left: 0; } .carousel .active.left { @@ -3324,13 +3948,14 @@ a.thumbnail:hover { background: #333333; background: rgba(0, 0, 0, 0.75); } -.carousel-caption h4, .carousel-caption p { +.carousel-caption h4, +.carousel-caption p { color: #ffffff; } .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: #f5f5f5; + background-color: #eeeeee; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -3339,12 +3964,14 @@ a.thumbnail:hover { margin-bottom: 0; font-size: 60px; line-height: 1; + color: inherit; letter-spacing: -1px; } .hero-unit p { font-size: 18px; font-weight: 200; line-height: 27px; + color: inherit; } .pull-right { float: right; diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.min.css similarity index 64% rename from documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.css rename to documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.min.css index 5e1aee0948..c951467732 100644 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.css +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.min.css @@ -2,12 +2,12 @@ article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]){display:none;} html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} -a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} a:hover,a:active{outline:0;} sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} sup{top:-0.5em;} sub{bottom:-0.25em;} -img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;} +img{height:auto;border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;} button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} button,input{*overflow:visible;line-height:normal;} button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} @@ -15,58 +15,64 @@ button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:poin input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} textarea{overflow:auto;vertical-align:top;} +.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;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;} a{color:#0088cc;text-decoration:none;} a:hover{color:#005580;text-decoration:underline;} .row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} -.span1{width:60px;} -.span2{width:140px;} -.span3{width:220px;} -.span4{width:300px;} -.span5{width:380px;} -.span6{width:460px;} -.span7{width:540px;} -.span8{width:620px;} -.span9{width:700px;} -.span10{width:780px;} +.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} +.span12{width:940px;} .span11{width:860px;} -.span12,.container{width:940px;} -.offset1{margin-left:100px;} -.offset2{margin-left:180px;} -.offset3{margin-left:260px;} -.offset4{margin-left:340px;} -.offset5{margin-left:420px;} -.offset6{margin-left:500px;} -.offset7{margin-left:580px;} -.offset8{margin-left:660px;} -.offset9{margin-left:740px;} -.offset10{margin-left:820px;} +.span10{width:780px;} +.span9{width:700px;} +.span8{width:620px;} +.span7{width:540px;} +.span6{width:460px;} +.span5{width:380px;} +.span4{width:300px;} +.span3{width:220px;} +.span2{width:140px;} +.span1{width:60px;} +.offset12{margin-left:980px;} .offset11{margin-left:900px;} +.offset10{margin-left:820px;} +.offset9{margin-left:740px;} +.offset8{margin-left:660px;} +.offset7{margin-left:580px;} +.offset6{margin-left:500px;} +.offset5{margin-left:420px;} +.offset4{margin-left:340px;} +.offset3{margin-left:260px;} +.offset2{margin-left:180px;} +.offset1{margin-left:100px;} .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.127659574%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} -.row-fluid .span1{width:6.382978723%;} -.row-fluid .span2{width:14.89361702%;} -.row-fluid .span3{width:23.404255317%;} -.row-fluid .span4{width:31.914893614%;} -.row-fluid .span5{width:40.425531911%;} -.row-fluid .span6{width:48.93617020799999%;} -.row-fluid .span7{width:57.446808505%;} -.row-fluid .span8{width:65.95744680199999%;} -.row-fluid .span9{width:74.468085099%;} -.row-fluid .span10{width:82.97872339599999%;} -.row-fluid .span11{width:91.489361693%;} -.row-fluid .span12{width:99.99999998999999%;} -.container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";} +.row-fluid > .span12{width:99.99999998999999%;} +.row-fluid > .span11{width:91.489361693%;} +.row-fluid > .span10{width:82.97872339599999%;} +.row-fluid > .span9{width:74.468085099%;} +.row-fluid > .span8{width:65.95744680199999%;} +.row-fluid > .span7{width:57.446808505%;} +.row-fluid > .span6{width:48.93617020799999%;} +.row-fluid > .span5{width:40.425531911%;} +.row-fluid > .span4{width:31.914893614%;} +.row-fluid > .span3{width:23.404255317%;} +.row-fluid > .span2{width:14.89361702%;} +.row-fluid > .span1{width:6.382978723%;} +.container{margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} .container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";} .container-fluid:after{clear:both;} p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;} .lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;} -h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} +h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;} @@ -81,16 +87,19 @@ ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} ul{list-style:disc;} ol{list-style:decimal;} li{line-height:18px;} -ul.unstyled{margin-left:0;list-style:none;} +ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} dl{margin-bottom:18px;} dt,dd{line-height:18px;} -dt{font-weight:bold;} +dt{font-weight:bold;line-height:17px;} dd{margin-left:9px;} -hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;} +.dl-horizontal dt{float:left;clear:left;width:120px;text-align:right;} +.dl-horizontal dd{margin-left:130px;} +hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} strong{font-weight:bold;} em{font-style:italic;} .muted{color:#999999;} -abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} +abbr[title]{border-bottom:1px dotted #ddd;cursor:help;} +abbr.initialism{font-size:90%;text-transform:uppercase;} blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} @@ -99,21 +108,25 @@ address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} small{font-size:100%;} cite{font-style:normal;} code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} -pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} -pre code{padding:0;background-color:transparent;} +code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} +pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;word-wrap:break-word;}pre.prettyprint{margin-bottom:18px;} +pre code{padding:0;color:inherit;background-color:transparent;border:0;} +.pre-scrollable{max-height:340px;overflow-y:scroll;} form{margin:0 0 18px;} fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;} -label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;} +legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}legend small{font-size:13.5px;color:#999999;} +label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;} +input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} label{display:block;margin-bottom:5px;color:#333333;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .uneditable-textarea{width:auto;height:auto;} label input,label textarea,label select{display:block;} -input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:0;cursor:pointer;border-radius:0 \0/;} -input[type="file"]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;border:0 \9;} +input[type="image"]{border:0;} +input[type="file"]{width:auto;padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;} select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;} +input[type="file"]{line-height:18px \9;} select{width:220px;background-color:#ffffff;} select[multiple],select[size]{height:auto;} input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} @@ -122,12 +135,11 @@ input[type="hidden"]{display:none;} .radio,.checkbox{padding-left:18px;} .radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} -.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;vertical-align:middle;} +.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} -.controls>.radio.inline:first-child,.controls>.checkbox.inline:first-child{padding-top:0;} input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} -input[type="file"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} .input-mini{width:60px;} .input-small{width:90px;} .input-medium{width:150px;} @@ -135,19 +147,20 @@ input[type="file"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-s .input-xlarge{width:270px;} .input-xxlarge{width:530px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;} -input.span1,textarea.span1,.uneditable-input.span1{width:50px;} -input.span2,textarea.span2,.uneditable-input.span2{width:130px;} -input.span3,textarea.span3,.uneditable-input.span3{width:210px;} -input.span4,textarea.span4,.uneditable-input.span4{width:290px;} -input.span5,textarea.span5,.uneditable-input.span5{width:370px;} -input.span6,textarea.span6,.uneditable-input.span6{width:450px;} -input.span7,textarea.span7,.uneditable-input.span7{width:530px;} -input.span8,textarea.span8,.uneditable-input.span8{width:610px;} -input.span9,textarea.span9,.uneditable-input.span9{width:690px;} -input.span10,textarea.span10,.uneditable-input.span10{width:770px;} -input.span11,textarea.span11,.uneditable-input.span11{width:850px;} -input.span12,textarea.span12,.uneditable-input.span12{width:930px;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} +input,textarea,.uneditable-input{margin-left:0;} +input.span12, textarea.span12, .uneditable-input.span12{width:930px;} +input.span11, textarea.span11, .uneditable-input.span11{width:850px;} +input.span10, textarea.span10, .uneditable-input.span10{width:770px;} +input.span9, textarea.span9, .uneditable-input.span9{width:690px;} +input.span8, textarea.span8, .uneditable-input.span8{width:610px;} +input.span7, textarea.span7, .uneditable-input.span7{width:530px;} +input.span6, textarea.span6, .uneditable-input.span6{width:450px;} +input.span5, textarea.span5, .uneditable-input.span5{width:370px;} +input.span4, textarea.span4, .uneditable-input.span4{width:290px;} +input.span3, textarea.span3, .uneditable-input.span3{width:210px;} +input.span2, textarea.span2, .uneditable-input.span2{width:130px;} +input.span1, textarea.span1, .uneditable-input.span1{width:50px;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#eeeeee;border-color:#ddd;cursor:not-allowed;} .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} .control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} @@ -158,48 +171,56 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} +.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} +.form-actions:after{clear:both;} .uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} :-moz-placeholder{color:#999999;} ::-webkit-input-placeholder{color:#999999;} -.help-block{margin-top:5px;margin-bottom:0;color:#999999;} -.help-inline{display:inline-block;*display:inline;*zoom:1;margin-bottom:9px;vertical-align:middle;padding-left:5px;} -.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";} -.input-prepend:after,.input-append:after{clear:both;} -.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} +.help-block,.help-inline{color:#555555;} +.help-block{display:block;margin-bottom:9px;} +.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} +.input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{*margin-left:0;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} .input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} -.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} +.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} -.input-prepend .add-on{*margin-top:1px;} -.input-append input,.input-append .uneditable-input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append .uneditable-input{border-right-color:#ccc;} -.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-append input:first-child{*margin-left:-160px;}.input-append input:first-child+.add-on{*margin-left:-21px;} +.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} +.input-append input,.input-append select .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .uneditable-input{border-left-color:#eee;border-right-color:#ccc;} +.input-append .add-on,.input-append .btn{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} -.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;} -.form-search label,.form-inline label,.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{display:inline-block;} -.form-search .input-append .add-on,.form-inline .input-prepend .add-on,.form-search .input-append .add-on,.form-inline .input-prepend .add-on{vertical-align:middle;} +.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;margin-bottom:0;} +.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;} +.form-search label,.form-inline label{display:inline-block;} +.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} +.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} +.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-left:0;margin-right:3px;} .control-group{margin-bottom:9px;} -.form-horizontal legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;} +legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;} .form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";} .form-horizontal .control-group:after{clear:both;} -.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;} -.form-horizontal .controls{margin-left:160px;} +.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right;} +.form-horizontal .controls{margin-left:160px;*display:inline-block;*margin-left:0;*padding-left:20px;} +.form-horizontal .help-block{margin-top:9px;margin-bottom:0;} .form-horizontal .form-actions{padding-left:160px;} -table{max-width:100%;border-collapse:collapse;border-spacing:0;} -.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} -.table th{font-weight:bold;vertical-align:bottom;} -.table td{vertical-align:top;} -.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;} -.table tbody+tbody{border-top:2px solid #ddd;} +table{max-width:100%;border-collapse:collapse;border-spacing:0;background-color:transparent;} +.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} +.table th{font-weight:bold;} +.table thead th{vertical-align:bottom;} +.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} +.table tbody+tbody{border-top:2px solid #dddddd;} .table-condensed th,.table-condensed td{padding:4px 5px;} -.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;} +.table-bordered{border:1px solid #dddddd;border-left:0;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;} .table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} .table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} .table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} .table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} .table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} +.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5;} table .span1{float:none;width:44px;margin-left:0;} table .span2{float:none;width:124px;margin-left:0;} table .span3{float:none;width:204px;margin-left:0;} @@ -212,8 +233,20 @@ table .span9{float:none;width:684px;margin-left:0;} table .span10{float:none;width:764px;margin-left:0;} table .span11{float:none;width:844px;margin-left:0;} table .span12{float:none;width:924px;margin-left:0;} -[class^="icon-"]{display:inline-block;width:14px;height:14px;vertical-align:text-top;background-image:url(../img/glyphicons-halflings.png);background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child{*margin-left:0;} -.icon-white{background-image:url(../img/glyphicons-halflings-white.png);} +table .span13{float:none;width:1004px;margin-left:0;} +table .span14{float:none;width:1084px;margin-left:0;} +table .span15{float:none;width:1164px;margin-left:0;} +table .span16{float:none;width:1244px;margin-left:0;} +table .span17{float:none;width:1324px;margin-left:0;} +table .span18{float:none;width:1404px;margin-left:0;} +table .span19{float:none;width:1484px;margin-left:0;} +table .span20{float:none;width:1564px;margin-left:0;} +table .span21{float:none;width:1644px;margin-left:0;} +table .span22{float:none;width:1724px;margin-left:0;} +table .span23{float:none;width:1804px;margin-left:0;} +table .span24{float:none;width:1884px;margin-left:0;} +[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;} +.icon-white{background-image:url("../img/glyphicons-halflings-white.png");} .icon-glass{background-position:0 0;} .icon-music{background-position:-24px 0;} .icon-search{background-position:-48px 0;} @@ -337,44 +370,55 @@ table .span12{float:none;width:924px;margin-left:0;} .dropdown{position:relative;} .dropdown-toggle{*margin-bottom:-3px;} .dropdown-toggle:active,.open .dropdown-toggle{outline:0;} -.caret{display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";} +.caret{display:inline-block;width:0;height:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"";} .dropdown .caret{margin-top:8px;margin-left:2px;} .dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;} -.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} -.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.pull-right{right:0;left:auto;} +.dropdown-menu .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} +.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;} .dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;} .dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} .dropdown.open .dropdown-menu{display:block;} +.pull-right .dropdown-menu{left:auto;right:0;} +.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";} +.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;} .typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} .close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;} -.btn{display:inline-block;padding:4px 10px 4px;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;} +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);border:1px solid #cccccc;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;} +.btn:active,.btn.active{background-color:#cccccc \9;} +.btn:first-child{*margin-left:0;} .btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} -.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;color:rgba(0, 0, 0, 0.5);outline:0;} +.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} .btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.btn-large .icon{margin-top:1px;} +.btn-large [class^="icon-"]{margin-top:1px;} .btn-small{padding:5px 9px;font-size:11px;line-height:16px;} -.btn-small .icon{margin-top:-1px;} -.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;} -.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active{color:rgba(255, 255, 255, 0.75);} -.btn-primary{background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-ms-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(top, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0044cc;} -.btn-primary:active,.btn-primary.active{background-color:#003399 \9;} -.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;} +.btn-small [class^="icon-"]{margin-top:-1px;} +.btn-mini{padding:2px 6px;font-size:11px;line-height:14px;} +.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;} +.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} +.btn-primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0055cc;} +.btn-primary:active,.btn-primary.active{background-color:#004099 \9;} +.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;} .btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} -.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;} +.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;} .btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;} +.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;} .btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;} +.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;} .btn-info:active,.btn-info.active{background-color:#24748c \9;} +.btn-inverse{background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-ms-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(top, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222222;} +.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} -button.btn.large,input[type="submit"].btn.large{*padding-top:7px;*padding-bottom:7px;} -button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom:3px;} +button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} +button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} +button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} .btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";} .btn-group:after{clear:both;} .btn-group:first-child{*margin-left:0;} @@ -387,44 +431,48 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom .btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;} .btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} -.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:5px;*padding-bottom:5px;} +.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:3px;*padding-bottom:3px;} +.btn-group .btn-mini.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:1px;*padding-bottom:1px;} +.btn-group .btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px;} +.btn-group .btn-large.dropdown-toggle{padding-left:12px;padding-right:12px;} .btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} .btn .caret{margin-top:7px;margin-left:0;} .btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);} -.btn-primary .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} -.btn-small .caret{margin-top:4px;} -.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.alert,.alert-heading{color:#c09853;} +.btn-mini .caret{margin-top:5px;} +.btn-small .caret{margin-top:6px;} +.btn-large .caret{margin-top:6px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} +.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;} +.alert-heading{color:inherit;} .alert .close{position:relative;top:-2px;right:-21px;line-height:18px;} -.alert-success{background-color:#dff0d8;border-color:#d6e9c6;} -.alert-success,.alert-success .alert-heading{color:#468847;} -.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;} -.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;} -.alert-info{background-color:#d9edf7;border-color:#bce8f1;} -.alert-info,.alert-info .alert-heading{color:#3a87ad;} +.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;} +.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} +.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;} .alert-block{padding-top:14px;padding-bottom:14px;} .alert-block>p,.alert-block>ul{margin-bottom:0;} .alert-block p+p{margin-top:5px;} .nav{margin-left:0;margin-bottom:18px;list-style:none;} .nav>li>a{display:block;} .nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} -.nav-list{padding-left:14px;padding-right:14px;margin-bottom:0;} -.nav-list>li>a,.nav-list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} -.nav-list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;} -.nav-list>li+.nav-header{margin-top:9px;} -.nav-list .active>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} -.nav-list .icon{margin-right:2px;} +.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} +.nav li+.nav-header{margin-top:9px;} +.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} +.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.nav-list>li>a{padding:3px 15px;} +.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} +.nav-list [class^="icon-"]{margin-right:2px;} +.nav-list .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} .nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";} .nav-tabs:after,.nav-pills:after{clear:both;} .nav-tabs>li,.nav-pills>li{float:left;} .nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} .nav-tabs{border-bottom:1px solid #ddd;} .nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} +.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} .nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} .nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.nav-pills .active>a,.nav-pills .active>a:hover{color:#ffffff;background-color:#0088cc;} +.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;} .nav-stacked>li{float:none;} .nav-stacked>li>a{margin-right:0;} .nav-tabs.nav-stacked{border-bottom:0;} @@ -436,15 +484,16 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom .nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} .nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;} .nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;} -.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;} -.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;} +.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;} +.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;} +.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} .nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;} -.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;opacity:1;filter:alpha(opacity=100);} +.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);} .tabs-stacked .open>a:hover{border-color:#999999;} .tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";} .tabbable:after{clear:both;} +.tab-content{display:table;width:100%;} .tabs-below .nav-tabs,.tabs-right .nav-tabs,.tabs-left .nav-tabs{border-bottom:0;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.active,.pill-content>.active{display:block;} @@ -462,46 +511,52 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom .tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} .tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} .tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} -.navbar{overflow:visible;margin-bottom:18px;} +.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;} .navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;} +.navbar .container{width:auto;} +.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;} .btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;} .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} .btn-navbar .icon-bar+.icon-bar{margin-top:3px;} .nav-collapse.collapse{height:auto;} -.navbar .brand:hover{text-decoration:none;} +.navbar{color:#999999;}.navbar .brand:hover{text-decoration:none;} .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} -.navbar .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}.navbar .navbar-text a:hover{color:#ffffff;background-color:transparent;} +.navbar .navbar-text{margin-bottom:0;line-height:40px;} .navbar .btn,.navbar .btn-group{margin-top:5px;} .navbar .btn-group .btn{margin-top:0;} .navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";} .navbar-form:after{clear:both;} -.navbar-form input,.navbar-form select{display:inline-block;margin-top:5px;margin-bottom:0;} -.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} +.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} +.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;} .navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} -.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#666;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;} -.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;} -.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);} +.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} +.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;} +.navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} -.navbar-fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030;} -.navbar-fixed-top .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} +.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} +.navbar-fixed-top{top:0;} +.navbar-fixed-bottom{bottom:0;} .navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} .navbar .nav.pull-right{float:right;} .navbar .nav>li{display:block;float:left;} .navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;} -.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);} +.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;} .navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;} .navbar .nav.pull-right{margin-left:10px;margin-right:0;} .navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} .navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} -.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;} +.navbar-fixed-bottom .dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} +.navbar-fixed-bottom .dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} +.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} .navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);} .navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;} .navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;} -.navbar .nav.pull-right .dropdown-menu{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;} -.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;} -.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} +.navbar .nav.pull-right .dropdown-menu,.navbar .nav .dropdown-menu.pull-right{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before,.navbar .nav .dropdown-menu.pull-right:before{left:auto;right:12px;} +.navbar .nav.pull-right .dropdown-menu:after,.navbar .nav .dropdown-menu.pull-right:after{left:auto;right:13px;} +.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#999999;} .breadcrumb .active a{color:#333333;} .pagination{height:36px;margin:18px 0;} @@ -510,7 +565,7 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom .pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} .pagination a:hover,.pagination .active a{background-color:#f5f5f5;} .pagination .active a{color:#999999;cursor:default;} -.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} +.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} .pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .pagination-centered{text-align:center;} @@ -522,19 +577,22 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom .pager a:hover{text-decoration:none;background-color:#f5f5f5;} .pager .next a{float:right;} .pager .previous a{float:left;} +.pager .disabled a,.pager .disabled a:hover{color:#999999;background-color:#fff;cursor:default;} .modal-open .dropdown-menu{z-index:2050;} .modal-open .dropdown.open{*z-index:2050;} .modal-open .popover{z-index:2060;} .modal-open .tooltip{z-index:2070;} .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} .modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} -.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} +.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} .modal.fade.in{top:50%;} .modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} -.modal-body{padding:15px;} -.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";} +.modal-body{overflow-y:auto;max-height:400px;padding:15px;} +.modal-form{margin-bottom:0;} +.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";} .modal-footer:after{clear:both;} -.modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;} +.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;} +.modal-footer .btn-group .btn+.btn{margin-left:-1px;} .tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} .tooltip.top{margin-top:-2px;} .tooltip.right{margin-left:2px;} @@ -565,14 +623,33 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} .thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} .thumbnail .caption{padding:9px;} -.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.label{padding:1px 4px 2px;font-size:10.998px;font-weight:bold;line-height:13px;color:#ffffff;vertical-align:middle;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.label:hover{color:#ffffff;text-decoration:none;} .label-important{background-color:#b94a48;} +.label-important:hover{background-color:#953b39;} .label-warning{background-color:#f89406;} +.label-warning:hover{background-color:#c67605;} .label-success{background-color:#468847;} +.label-success:hover{background-color:#356635;} .label-info{background-color:#3a87ad;} -@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} -.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} +.label-info:hover{background-color:#2d6987;} +.label-inverse{background-color:#333333;} +.label-inverse:hover{background-color:#1a1a1a;} +.badge{padding:1px 9px 2px;font-size:12.025px;font-weight:bold;white-space:nowrap;color:#ffffff;background-color:#999999;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} +.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} +.badge-error{background-color:#b94a48;} +.badge-error:hover{background-color:#953b39;} +.badge-warning{background-color:#f89406;} +.badge-warning:hover{background-color:#c67605;} +.badge-success{background-color:#468847;} +.badge-success:hover{background-color:#356635;} +.badge-info{background-color:#3a87ad;} +.badge-info:hover{background-color:#2d6987;} +.badge-inverse{background-color:#333333;} +.badge-inverse:hover{background-color:#1a1a1a;} +@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} +.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} .progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} .progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);} .progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} @@ -580,6 +657,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} .progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);} +.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .accordion{margin-bottom:18px;} .accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .accordion-heading{border-bottom:0;} @@ -601,8 +680,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} -.hero-unit p{font-size:18px;font-weight:200;line-height:27px;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/img/glyphicons-halflings-white.png b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/img/glyphicons-halflings-white.png similarity index 100% rename from documentation/website/source/_themes/opendylan/static/bootstrap/2.0/img/glyphicons-halflings-white.png rename to documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/img/glyphicons-halflings-white.png diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/img/glyphicons-halflings.png b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/img/glyphicons-halflings.png similarity index 100% rename from documentation/website/source/_themes/opendylan/static/bootstrap/2.0/img/glyphicons-halflings.png rename to documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/img/glyphicons-halflings.png diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.js b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.js similarity index 95% rename from documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.js rename to documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.js index c832ccb2e6..ca868671ca 100644 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.js +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.0.0 + * bootstrap-transition.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -47,10 +47,9 @@ })() }) - -}( window.jQuery ) -/* ========================================================== - * bootstrap-alert.js v2.0.0 + +}( window.jQuery );/* ========================================================== + * bootstrap-alert.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -102,11 +101,14 @@ $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent.removeClass('in') + $parent + .trigger('close') + .removeClass('in') function removeElement() { - $parent.remove() - $parent.trigger('closed') + $parent + .trigger('closed') + .remove() } $.support.transition && $parent.hasClass('fade') ? @@ -139,9 +141,8 @@ $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) }) -}( window.jQuery ) -/* ============================================================ - * bootstrap-button.js v2.0.0 +}( window.jQuery );/* ============================================================ + * bootstrap-button.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -233,13 +234,14 @@ $(function () { $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - $(e.target).button('toggle') + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') }) }) -}( window.jQuery ) -/* ========================================================== - * bootstrap-carousel.js v2.0.0 +}( window.jQuery );/* ========================================================== + * bootstrap-carousel.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -269,6 +271,9 @@ this.$element = $(element) this.options = $.extend({}, $.fn.carousel.defaults, options) this.options.slide && this.slide(this.options.slide) + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) } Carousel.prototype = { @@ -301,6 +306,7 @@ , pause: function () { clearInterval(this.interval) + this.interval = null return this } @@ -328,6 +334,8 @@ $next = $next.length ? $next : this.$element.find('.item')[fallback]() + if ($next.hasClass('active')) return + if (!$.support.transition && this.$element.hasClass('slide')) { this.$element.trigger('slide') $active.removeClass('active') @@ -373,6 +381,7 @@ $.fn.carousel.defaults = { interval: 5000 + , pause: 'hover' } $.fn.carousel.Constructor = Carousel @@ -391,9 +400,8 @@ }) }) -}( window.jQuery ) -/* ============================================================= - * bootstrap-collapse.js v2.0.0 +}( window.jQuery );/* ============================================================= + * bootstrap-collapse.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -468,7 +476,9 @@ [dimension](size || 'auto') [0].offsetWidth - this.$element.addClass('collapse') + this.$element[size ? 'addClass' : 'removeClass']('collapse') + + return this } , transition: function ( method, startEvent, completeEvent ) { @@ -527,9 +537,8 @@ }) }) -}( window.jQuery ) -/* ============================================================ - * bootstrap-dropdown.js v2.0.0 +}( window.jQuery );/* ============================================================ + * bootstrap-dropdown.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -619,9 +628,8 @@ $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) -}( window.jQuery ) -/* ========================================================= - * bootstrap-modal.js v2.0.0 +}( window.jQuery );/* ========================================================= + * bootstrap-modal.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -648,7 +656,7 @@ * ====================== */ var Modal = function ( content, options ) { - this.options = $.extend({}, $.fn.modal.defaults, options) + this.options = options this.$element = $(content) .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) } @@ -799,16 +807,17 @@ return this.each(function () { var $this = $(this) , data = $this.data('modal') - , options = typeof option == 'object' && option + , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) if (!data) $this.data('modal', (data = new Modal(this, options))) if (typeof option == 'string') data[option]() - else data.show() + else if (options.show) data.show() }) } $.fn.modal.defaults = { backdrop: true , keyboard: true + , show: true } $.fn.modal.Constructor = Modal @@ -828,9 +837,8 @@ }) }) -}( window.jQuery ) -/* =========================================================== - * bootstrap-tooltip.js v2.0.0 +}( window.jQuery );/* =========================================================== + * bootstrap-tooltip.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -1037,7 +1045,7 @@ title = $e.attr('data-original-title') || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - title = title.toString().replace(/(^\s*|\s*$)/, "") + title = (title || '').toString().replace(/(^\s*|\s*$)/, "") return title } @@ -1098,9 +1106,8 @@ , template: '
      ' } -}( window.jQuery ) -/* =========================================================== - * bootstrap-popover.js v2.0.0 +}( window.jQuery );/* =========================================================== + * bootstrap-popover.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1193,9 +1200,8 @@ , template: '

      ' }) -}( window.jQuery ) -/* ============================================================= - * bootstrap-scrollspy.js v2.0.0 +}( window.jQuery );/* ============================================================= + * bootstrap-scrollspy.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1318,9 +1324,8 @@ }) }) -}( window.jQuery ) -/* ======================================================== - * bootstrap-tab.js v2.0.0 +}( window.jQuery );/* ======================================================== + * bootstrap-tab.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1448,9 +1453,8 @@ }) }) -}( window.jQuery ) -/* ============================================================= - * bootstrap-typeahead.js v2.0.0 +}( window.jQuery );/* ============================================================= + * bootstrap-typeahead.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1491,6 +1495,7 @@ , select: function () { var val = this.$menu.find('.active').attr('data-value') this.$element.val(val) + this.$element.change(); return this.hide() } @@ -1616,9 +1621,6 @@ } , keyup: function (e) { - e.stopPropagation() - e.preventDefault() - switch(e.keyCode) { case 40: // down arrow case 38: // up arrow @@ -1631,6 +1633,7 @@ break case 27: // escape + if (!this.shown) return this.hide() break @@ -1638,10 +1641,11 @@ this.lookup() } + e.stopPropagation() + e.preventDefault() } , keypress: function (e) { - e.stopPropagation() if (!this.shown) return switch(e.keyCode) { @@ -1661,12 +1665,12 @@ this.next() break } + + e.stopPropagation() } , blur: function (e) { var that = this - e.stopPropagation() - e.preventDefault() setTimeout(function () { that.hide() }, 150) } @@ -1719,4 +1723,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.min.js b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.min.js new file mode 100644 index 0000000000..ffaefa691d --- /dev/null +++ b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.min.js @@ -0,0 +1,6 @@ +/** +* Bootstrap.js by @fat & @mdo +* Copyright 2012 Twitter, Inc. +* http://www.apache.org/licenses/LICENSE-2.0.txt +*/ +!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger("close").removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;return!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
      ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=(a||"").toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
      '}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

      '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.$element.change(),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
        ',item:'
        • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); \ No newline at end of file diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.responsive b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.responsive deleted file mode 100644 index bc3f2ab71a..0000000000 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/css/bootstrap.min.responsive +++ /dev/null @@ -1,3 +0,0 @@ - -.hidden{display:none;visibility:hidden;} -@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:18px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;height:28px;-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;} 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:768px){.container{width:auto;padding:0 20px;} .row-fluid{width:100%;} .row{margin-left:0;} .row>[class*="span"],.row-fluid>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:980px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} .span1{width:42px;} .span2{width:104px;} .span3{width:166px;} .span4{width:228px;} .span5{width:290px;} .span6{width:352px;} .span7{width:414px;} .span8{width:476px;} .span9{width:538px;} .span10{width:600px;} .span11{width:662px;} .span12,.container{width:724px;} .offset1{margin-left:82px;} .offset2{margin-left:144px;} .offset3{margin-left:206px;} .offset4{margin-left:268px;} .offset5{margin-left:330px;} .offset6{margin-left:392px;} .offset7{margin-left:454px;} .offset8{margin-left:516px;} .offset9{margin-left:578px;} .offset10{margin-left:640px;} .offset11{margin-left:702px;} .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 .span1{width:5.801104972%;} .row-fluid .span2{width:14.364640883%;} .row-fluid .span3{width:22.928176794%;} .row-fluid .span4{width:31.491712705%;} .row-fluid .span5{width:40.055248616%;} .row-fluid .span6{width:48.618784527%;} .row-fluid .span7{width:57.182320438000005%;} .row-fluid .span8{width:65.74585634900001%;} .row-fluid .span9{width:74.30939226%;} .row-fluid .span10{width:82.87292817100001%;} .row-fluid .span11{width:91.436464082%;} .row-fluid .span12{width:99.999999993%;} input.span1,textarea.span1,.uneditable-input.span1{width:32px;} input.span2,textarea.span2,.uneditable-input.span2{width:94px;} input.span3,textarea.span3,.uneditable-input.span3{width:156px;} input.span4,textarea.span4,.uneditable-input.span4{width:218px;} input.span5,textarea.span5,.uneditable-input.span5{width:280px;} input.span6,textarea.span6,.uneditable-input.span6{width:342px;} input.span7,textarea.span7,.uneditable-input.span7{width:404px;} input.span8,textarea.span8,.uneditable-input.span8{width:466px;} input.span9,textarea.span9,.uneditable-input.span9{width:528px;} input.span10,textarea.span10,.uneditable-input.span10{width:590px;} input.span11,textarea.span11,.uneditable-input.span11{width:652px;} input.span12,textarea.span12,.uneditable-input.span12{width:714px;}}@media (max-width:980px){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>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;}}@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;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12,.container{width:1170px;} .offset1{margin-left:130px;} .offset2{margin-left:230px;} .offset3{margin-left:330px;} .offset4{margin-left:430px;} .offset5{margin-left:530px;} .offset6{margin-left:630px;} .offset7{margin-left:730px;} .offset8{margin-left:830px;} .offset9{margin-left:930px;} .offset10{margin-left:1030px;} .offset11{margin-left:1130px;} .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 .span1{width:5.982905983%;} .row-fluid .span2{width:14.529914530000001%;} .row-fluid .span3{width:23.076923077%;} .row-fluid .span4{width:31.623931624%;} .row-fluid .span5{width:40.170940171000005%;} .row-fluid .span6{width:48.717948718%;} .row-fluid .span7{width:57.264957265%;} .row-fluid .span8{width:65.81196581200001%;} .row-fluid .span9{width:74.358974359%;} .row-fluid .span10{width:82.905982906%;} .row-fluid .span11{width:91.45299145300001%;} .row-fluid .span12{width:100%;} input.span1,textarea.span1,.uneditable-input.span1{width:60px;} input.span2,textarea.span2,.uneditable-input.span2{width:160px;} input.span3,textarea.span3,.uneditable-input.span3{width:260px;} input.span4,textarea.span4,.uneditable-input.span4{width:360px;} input.span5,textarea.span5,.uneditable-input.span5{width:460px;} input.span6,textarea.span6,.uneditable-input.span6{width:560px;} input.span7,textarea.span7,.uneditable-input.span7{width:660px;} input.span8,textarea.span8,.uneditable-input.span8{width:760px;} input.span9,textarea.span9,.uneditable-input.span9{width:860px;} input.span10,textarea.span10,.uneditable-input.span10{width:960px;} input.span11,textarea.span11,.uneditable-input.span11{width:1060px;} input.span12,textarea.span12,.uneditable-input.span12{width:1160px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;}} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.min.js b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.min.js deleted file mode 100644 index 1f295a14e9..0000000000 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0/js/bootstrap.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.remove(),e.trigger("closed")}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){a(b.target).button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide)};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;return this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element.addClass("collapse")},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
        ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=a.extend({},a.fn.modal.defaults,c),this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=typeof c=="object"&&c;e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
        '}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

        '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){a.stopPropagation(),a.preventDefault();switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:this.hide();break;default:this.lookup()}},keypress:function(a){a.stopPropagation();if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}},blur:function(a){var b=this;a.stopPropagation(),a.preventDefault(),setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
          ',item:'
          • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); \ No newline at end of file From 038e6ac7da48847d3a96b4cdfda455c0137a5bc1 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 14 Mar 2012 11:52:34 +0700 Subject: [PATCH 186/519] Run the Google CSE branding script prior to talking to Piwik. Piwik can be very slow, so don't wait for that to complete prior to loading the Google CSE script. --- documentation/website/source/_themes/opendylan/layout.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index facf14afe7..596e72ef4e 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -96,6 +96,8 @@
          + + - - {% endblock %} From 9f64321b2b76d44d31e7fcad61ff7d350e5c19ae Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Thu, 22 Mar 2012 18:57:28 -0400 Subject: [PATCH 187/519] Remove obsolete wiki links. --- documentation/website/source/about/examples/everything_value.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/documentation/website/source/about/examples/everything_value.rst b/documentation/website/source/about/examples/everything_value.rst index 2ac258b717..0ffdf35e9d 100644 --- a/documentation/website/source/about/examples/everything_value.rst +++ b/documentation/website/source/about/examples/everything_value.rst @@ -35,5 +35,4 @@ way to say this: format-out("foo"); end; -See also, {{Parameter Lists}} and {{Code Examples}}. From 9e0d3489a5038c76115d09b539e6305031ac6813 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 8 Apr 2012 20:21:42 -0400 Subject: [PATCH 188/519] Add proposal for new strings library --- .../website/source/proposals/dep-0004.rst | 369 ++++++++++++++++++ .../website/source/proposals/index.rst | 2 + 2 files changed, 371 insertions(+) create mode 100644 documentation/website/source/proposals/dep-0004.rst diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst new file mode 100644 index 0000000000..ac59184bd4 --- /dev/null +++ b/documentation/website/source/proposals/dep-0004.rst @@ -0,0 +1,369 @@ +******************* +New strings Library +******************* + +============== ============================================= +DEP #: 4 +Type: Standards Track +Author: Carl Gay +Status: Draft +Created: 08-Apr-2012 +Last-Modified: 08-Apr-2012 +Post-History: None +Dylan-Version: 2012.1 +============== ============================================= + + +.. contents:: Contents + :local: + + +Abstract +======== + +Open Dylan currently has a hodge-podge of string manipulation +functionality. This proposal is an attempt to provide a simpler, more +consistent strings API that is available from a single library (and a +single module) rather than being scattered across multiple libraries +and modules. + +Goals +===== + +#. Comprehensive string APIs available via the ``strings`` module + exported from the ``strings`` library. + +#. Consistent naming and parameter lists. + +#. Where possible, functions introduced here should be useful when + applied to standard Dylan mapping functions (map, every?, etc) + and collection functions (sort, reverse, etc). In other words + they should not require currying in order to be used with the + mapping and collection functions for the most common cases. + +#. Replace existing string-extensions module, which will only be + retained (on GitHub) so as not to break Gwydion Dylan unnecessarily. + (It could be integrated into GD instead of being a submodule.) + + +Non Goals +========= + +#. Unicode + +#. Immutable strings + +#. Strings not implemented as subclasses of ````. + +#. Text formatting APIs, such as justification and wrapping. + +#. Anything that is only applicable to a specific human language, + such as ``pluralize``. + + +Proposal +======== + +Open Dylan currently has a hodge-podge of string manipulation +functionality. A few functions (concatenate, subsequence-position, +as-lowercase, ...) are built into the ``dylan`` library, some +functions are exported from various oddly-named modules in the +string-extensions library, and a few in common-dylan. This proposal +is an attempt to provide a richer strings API in a single "strings" +module. This is complicated by the fact that some string operations +are also applicable to generalized sequences. + +The entire existing "strings" module (mainly used by the http library) +will be replaced by this API. + +I first present the entire API and then later discuss it in detail. + + +API Summary +----------- + +Export the following functions from the "strings" module of the +"strings" library. + +:: + + ascii-control? (char-or-string, #key start, end) => (boolean) + ascii-printable? (char-or-string, #key start, end) => (boolean) + ascii-graphic? (char-or-string, #key start, end) => (boolean) + ascii-alphabetic? (char-or-string, #key start, end) => (boolean) + ascii-alphanumeric? (char-or-string, #key start, end) => (boolean) + + lowercase? (char-or-string, #key start, end) => (boolean) + uppercase? (char-or-string, #key start, end) => (boolean) + whitespace? (char-or-string, #key start, end) => (boolean) + + decimal-digit? (char-or-string, #key start, end) => (boolean) + octal-digit? (char-or-string, #key start, end) => (boolean) + hexadecimal-digit? (char-or-string, #key start, end) => (boolean) + + char-equal-ignoring-case? (char1, char2) => (boolean) + char-less-ignoring-case? (char1, char2) => (boolean) + char-greater-ignoring-case? (char1, char2) => (boolean) + + string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) + + string-equal-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-less-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-greater-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) + + starts-with? (string, pattern-string, #key test) => (boolean) + ends-with? (string, pattern-string, #key test) => (boolean) + + lowercase (char-or-string, #key start, end) => (char-or-string) + lowercase! (char-or-string, #key start, end) => (char-or-string) + uppercase (char-or-string, #key start, end) => (char-or-string) + uppercase! (char-or-string, #key start, end) => (char-or-string) + + strip (string, #key test = whitespace?) => (new-string) + strip-left (string, #key test = whitespace?) => (new-string) + strip-right (string, #key test = whitespace?) => (new-string) + + align-center (string, width, #key fill = ' ') + align-left (string, width, #key fill = ' ') + align-right (string, width, #key fill = ' ') + + find-substring (string, pattern, #key start, end, test) => (index-or-#f) + replace-substrings (string, pattern, new, #key test, count) + + join (parts, separator, #key start, end, key, conjunction) => (string) + split (string, separator, #key start, end, max, remove-if-empty?) => (strings) + split-lines (string, #rest split-keys) => (strings) + + interpolate (string, #rest args) => (string) + +Some observations about this API: + +* Because this API provides ``start`` and ``end`` keywords where + appropriate, it is possible to do string operations within larger + strings without allocating. + +* Some functions, such as starts-with? and ends-with?, are provided + just for readability, despite being trivial to implement in terms of + other functions. + +* All start/end parameters accept negative values, which means to + index relative to the end of the string. I've found this extremely + useful in Python but I understand it will probably be controvesial + and would be willing to remove that functionality. + +The remainder of this proposal will repeat the above API with +discussion interspersed. + + +Discussion +---------- + +:: + + ascii-control? (char-or-string, #key start, end) => (boolean) + ascii-printable? (char-or-string, #key start, end) => (boolean) + ascii-graphic? (char-or-string, #key start, end) => (boolean) + ascii-alphabetic? (char-or-string, #key start, end) => (boolean) + ascii-alphanumeric? (char-or-string, #key start, end) => (boolean) + + lowercase? (char-or-string, #key start, end) => (boolean) + uppercase? (char-or-string, #key start, end) => (boolean) + whitespace? (char-or-string, #key start, end) => (boolean) + + decimal-digit? (char-or-string, #key start, end) => (boolean) + octal-digit? (char-or-string, #key start, end) => (boolean) + hexadecimal-digit? (char-or-string, #key start, end) => (boolean) + +The methods on ```` do not have ``start`` and ``end`` +parameters for obvious reasons. + +The methods on ```` return true if they would return true for +each character in the string. The ```` methods could be +implemented as follows:: + + every?(f, copy-sequence(s, start: start, end: _end)) + +Making these functions work on strings makes the resulting code more +concise than using ``every?`` and ``copy-sequence`` together, and also +more efficient, since no allocation is necessary. The alternative is +to write your own comparison function (which is the solution we have +now, resulting in multiple implementations) or write a ``for`` loop +inline. + + +Comparisons +~~~~~~~~~~~ + +:: + + char-equal? (char1, char2) => (boolean) + char-less? (char1, char2) => (boolean) + char-greater? (char1, char2) => (boolean) + + char-equal-ignoring-case? (char1, char2) => (boolean) + char-less-ignoring-case? (char1, char2) => (boolean) + char-greater-ignoring-case? (char1, char2) => (boolean) + + string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) + + string-equal-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-less-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-greater-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) + +String and character comparisons, both case-sensitive and +case-insensitive. These default to comparing the entire string but +allow comparing substrings via keyword arguments. + +Some might object to the \*-ignoring-case? functions on the grounds +that a "test" parameter could be added to the non-\*-ignoring-case? +functions instead. But consider this type of code, which is likely to +be fairly common:: + + sort(seq, test: string-less-ignoring-case?) + +Instead one would have to write this:: + + sort(seq, test: rcurry(string-less?, test: char-equal-ignoring-case?)) + +or worse, if char-equal-ignoring-case? is removed on the same grounds:: + + sort(seq, test: rcurry(string-less?, test: method (c1, c2) + as-lowercase(c1) = as-lowercase(c2) + end)) + +or, the less efficient but more concise:: + + sort(seq, test: method (s1, s2) as-lowercase(s1) < as-lowercase(s2) end) + +:: + + // Included here for completeness + = (char-or-string, char-or-string) => (boolean) + < (char-or-string, char-or-string) => (boolean) + > (char-or-string, char-or-string) => (boolean) + +If one doesn't mind allocating memory, the above built-in functions +can be used in place of explicit ``start`` and ``end`` parameters:: + + copy-sequence(s1, start: x, end: y) = copy-sequence(s2, start: w, end: z) + +:: + + lowercase (char-or-string, #key start, end) => (new-char-or-string) + lowercase! (char-or-string, #key start, end) => (new-char-or-string) + uppercase (char-or-string, #key start, end) => (new-char-or-string) + uppercase! (char-or-string, #key start, end) => (new-char-or-string) + +The above are provided despite the existence of ``as-uppercase`` and +``as-lowercase`` in the dylan module because they provide ``start`` +and ``end`` parameters, which makes them consistent with the rest of +the API. + +:: + + strip (string, #key test = whitespace?) => (new-string) + strip-left (string, #key test = whitespace?) => (new-string) + strip-right (string, #key test = whitespace?) => (new-string) + +Return a copy of ``string`` with characters matching ``test`` removed. +Characters are removed from the left and/or right side of ``string`` +until the first character *not* matching ``test`` is found. + +:: + + align-center (string, width, #key fill = ' ') + align-left (string, width, #key fill = ' ') + align-right (string, width, #key fill = ' ') + +The above return a new string of the given ``width``. If ``string`` +is shorter than ``width``, add the ``fill`` character to the left +and/or right side of the string as appropriate. + +Examples:: + + align-center("x", 5) => " x " + align-center("x", 4) => " x " or " x " (unspecified) + align-center("x", 7, fill: '.') => "...x..." + +:: + + starts-with? (string, pattern) => (boolean) + ends-with? (string, pattern) => (boolean) + +These common operations are for convenience and readability. + +:: + + find-substring (string, pattern-string, #key start, end, test) => (index-or-#f) + replace-substrings (string, pattern-string, new, #key test, count) + +``find-substring`` is like ``subsequence-position`` except that it +accepts start/end keyword arguments and it only applies to strings. + +``replace-substrings`` returns a new string with + +:: + + join (sequence, separator, #key start, end, key, conjunction) => (string) + split (string, separator, #key start, end, max, remove-if-empty?) => (strings) + +The above apply to sequences in general, not just strings. These are +already in common-dylan but are included here for completeness. + +:: + + interpolate(string, table) => (new-string) + +I'm still working on this, but it will be more featureful than the +current format and may look something like the Python3 formatting +module. It will not write to a stream; it will simply return a string +and the caller can do what they want with it. My intuition is that +formatting directly to a stream with many tiny calls to +``write-elements`` is slower than allocating a string and writing it +in one shot, but I don't know. Anyone? Benchmark? + +It may cache compiled format strings, or provide a way to explicitly +compile them, as an optimization. + +Example:: + + interpolate("foo {0}, bar {1}", 2, 8) => "foo 2, bar 8" + interpolate("foo {x}, bar {y}", table("x" => 3, "y" => 4)) => "foo 3, bar 4" + + +Dropped string-extensions Names +------------------------------- + +A few names exported from ``string-extensions`` have no equivalent in this +library: + +* The ``%parse-string`` module. This should be moved to + ``regular-expressions`` if it's needed at all. + +* The ``string-hacking`` module. This includes character sets, and a + few character utilities. + +* The ``string-conversions`` module. The only names this exports that + aren't available elsewhere are ``digit-to-integer`` and + ``integer-to-digit``. I suggest we put basic conversions like this + into ``common-dylan`` alongside ``string-to-integer`` et al. + +* Two names from the ``substring-search`` module: + ``make-substring-positioner`` and ``make-substring-replacer``. + + +Implementation Notes +==================== + +* Copy and friends from string-extensions to + regular-expressions. That's the only place that uses it, and it is + unlikely to be of much use elsewhere. See conversation in #dylan on + 2011.12.26. + +* Add a README to string-extensions that points out that it has been + superceded by "strings" and is a purely GD library. Perhaps merge + it into the ``gwydion`` repository? diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index d417869fa6..aca688e3ba 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -25,6 +25,7 @@ Open Proposals (under consideration) ==== ============= ========== ============================================= 1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) +4 Standard Draft `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) ==== ============= ========== ============================================= @@ -35,4 +36,5 @@ All Proposals by Number 1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) 2 Standard Final `define function `_ (`source <../_sources/proposals/dep-0002.txt>`__) 3 Standard Final `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) +4 Standard Draft `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) ==== ============= ========== ============================================= From f43eebf9961150d3303c86ea0d098b7a4b407d4f Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 9 Apr 2012 22:23:31 -0400 Subject: [PATCH 189/519] Incorporate comments from the hackers list. * I'll see if people prefer *-ic? to *--ignoring-case? * Removed interpolate, which can be in a separate "new format" DEP. --- .../website/source/proposals/dep-0004.rst | 101 ++++++++---------- 1 file changed, 47 insertions(+), 54 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index ac59184bd4..427412cf09 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -21,11 +21,9 @@ Dylan-Version: 2012.1 Abstract ======== -Open Dylan currently has a hodge-podge of string manipulation -functionality. This proposal is an attempt to provide a simpler, more -consistent strings API that is available from a single library (and a -single module) rather than being scattered across multiple libraries -and modules. +This proposal is an attempt to provide a simpler, more consistent +strings API than is currently available via string-extensions, that is +available from a single library (and a single module). Goals ===== @@ -35,6 +33,9 @@ Goals #. Consistent naming and parameter lists. +#. As simple as possible to use for common tasks. Strive for the same + simplicity as Python, for example. + #. Where possible, functions introduced here should be useful when applied to standard Dylan mapping functions (map, every?, etc) and collection functions (sort, reverse, etc). In other words @@ -67,11 +68,12 @@ Proposal Open Dylan currently has a hodge-podge of string manipulation functionality. A few functions (concatenate, subsequence-position, as-lowercase, ...) are built into the ``dylan`` library, some -functions are exported from various oddly-named modules in the -string-extensions library, and a few in common-dylan. This proposal -is an attempt to provide a richer strings API in a single "strings" -module. This is complicated by the fact that some string operations -are also applicable to generalized sequences. +functions are exported from various modules in the string-extensions +library, and a few in common-dylan. Some Common Lisp-like strings +functionality has been built into DUIM and Deuce. This proposal is an +attempt to provide a richer strings API in a single "strings" module. +This is complicated by the fact that some string operations are also +applicable to generalized sequences. The entire existing "strings" module (mainly used by the http library) will be replaced by this API. @@ -101,17 +103,21 @@ Export the following functions from the "strings" module of the octal-digit? (char-or-string, #key start, end) => (boolean) hexadecimal-digit? (char-or-string, #key start, end) => (boolean) - char-equal-ignoring-case? (char1, char2) => (boolean) - char-less-ignoring-case? (char1, char2) => (boolean) - char-greater-ignoring-case? (char1, char2) => (boolean) + char-equal? (char1, char2) => (boolean) + char-less? (char1, char2) => (boolean) + char-greater? (char1, char2) => (boolean) + + char-equal-ic? (char1, char2) => (boolean) + char-less-ic? (char1, char2) => (boolean) + char-greater-ic? (char1, char2) => (boolean) string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-equal-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-less-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-greater-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-equal-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) starts-with? (string, pattern-string, #key test) => (boolean) ends-with? (string, pattern-string, #key test) => (boolean) @@ -132,11 +138,17 @@ Export the following functions from the "strings" module of the find-substring (string, pattern, #key start, end, test) => (index-or-#f) replace-substrings (string, pattern, new, #key test, count) - join (parts, separator, #key start, end, key, conjunction) => (string) - split (string, separator, #key start, end, max, remove-if-empty?) => (strings) split-lines (string, #rest split-keys) => (strings) - interpolate (string, #rest args) => (string) + // For reference, the following functions are available via dylan + // or common-dylan and, although for general sequences, are + // generally useful for strings as well... + + concatenate(sequence, #rest more-sequences) => (new-sequence) + replace-subsequence!(big, small, #key start, end) => (big) + join (parts, separator, #key start, end, key, conjunction) => (string) + split (string, separator, #key start, end, max, remove-if-empty?) => (strings) + replace-elements!(big, predicate, new-value-fn, #key count) => (big) Some observations about this API: @@ -202,34 +214,34 @@ Comparisons char-less? (char1, char2) => (boolean) char-greater? (char1, char2) => (boolean) - char-equal-ignoring-case? (char1, char2) => (boolean) - char-less-ignoring-case? (char1, char2) => (boolean) - char-greater-ignoring-case? (char1, char2) => (boolean) + char-equal-ic? (char1, char2) => (boolean) + char-less-ic? (char1, char2) => (boolean) + char-greater-ic? (char1, char2) => (boolean) string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-equal-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-less-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-greater-ignoring-case? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-equal-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) -String and character comparisons, both case-sensitive and -case-insensitive. These default to comparing the entire string but -allow comparing substrings via keyword arguments. +String and character comparisons, both case-sensitive and ignoring +case (\*-ic?). These default to comparing the entire string but allow +comparing substrings via keyword arguments. -Some might object to the \*-ignoring-case? functions on the grounds -that a "test" parameter could be added to the non-\*-ignoring-case? -functions instead. But consider this type of code, which is likely to -be fairly common:: +Some might object to the \*-ic? functions on the grounds that a "test" +parameter could be added to the non-\*-ic? functions +instead. But consider this type of code, which is likely to be fairly +common:: - sort(seq, test: string-less-ignoring-case?) + sort(seq, test: string-less-ic?) Instead one would have to write this:: - sort(seq, test: rcurry(string-less?, test: char-equal-ignoring-case?)) + sort(seq, test: rcurry(string-less?, test: char-equal-ic?)) -or worse, if char-equal-ignoring-case? is removed on the same grounds:: +or worse, if char-equal-ic? is removed on the same grounds:: sort(seq, test: rcurry(string-less?, test: method (c1, c2) as-lowercase(c1) = as-lowercase(c2) @@ -314,25 +326,6 @@ accepts start/end keyword arguments and it only applies to strings. The above apply to sequences in general, not just strings. These are already in common-dylan but are included here for completeness. -:: - - interpolate(string, table) => (new-string) - -I'm still working on this, but it will be more featureful than the -current format and may look something like the Python3 formatting -module. It will not write to a stream; it will simply return a string -and the caller can do what they want with it. My intuition is that -formatting directly to a stream with many tiny calls to -``write-elements`` is slower than allocating a string and writing it -in one shot, but I don't know. Anyone? Benchmark? - -It may cache compiled format strings, or provide a way to explicitly -compile them, as an optimization. - -Example:: - - interpolate("foo {0}, bar {1}", 2, 8) => "foo 2, bar 8" - interpolate("foo {x}, bar {y}", table("x" => 3, "y" => 4)) => "foo 3, bar 4" Dropped string-extensions Names From 449447c0eabc20cd21a903d8ea825b880e2ce9ae Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 9 Apr 2012 22:34:12 -0400 Subject: [PATCH 190/519] minor word-smithing --- documentation/website/source/proposals/dep-0004.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 427412cf09..8badb1a3e8 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -142,7 +142,7 @@ Export the following functions from the "strings" module of the // For reference, the following functions are available via dylan // or common-dylan and, although for general sequences, are - // generally useful for strings as well... + // often useful for strings as well... concatenate(sequence, #rest more-sequences) => (new-sequence) replace-subsequence!(big, small, #key start, end) => (big) From 3b5dd4deddfba7da80dba85c9acf6dd513bb6023 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 10 Apr 2012 07:10:40 -0400 Subject: [PATCH 191/519] Remove ascii- prefix. --- .../website/source/proposals/dep-0004.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 8badb1a3e8..6782c1508c 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -89,11 +89,11 @@ Export the following functions from the "strings" module of the :: - ascii-control? (char-or-string, #key start, end) => (boolean) - ascii-printable? (char-or-string, #key start, end) => (boolean) - ascii-graphic? (char-or-string, #key start, end) => (boolean) - ascii-alphabetic? (char-or-string, #key start, end) => (boolean) - ascii-alphanumeric? (char-or-string, #key start, end) => (boolean) + control? (char-or-string, #key start, end) => (boolean) + printable? (char-or-string, #key start, end) => (boolean) + graphic? (char-or-string, #key start, end) => (boolean) + alphabetic? (char-or-string, #key start, end) => (boolean) + alphanumeric? (char-or-string, #key start, end) => (boolean) lowercase? (char-or-string, #key start, end) => (boolean) uppercase? (char-or-string, #key start, end) => (boolean) @@ -174,11 +174,11 @@ Discussion :: - ascii-control? (char-or-string, #key start, end) => (boolean) - ascii-printable? (char-or-string, #key start, end) => (boolean) - ascii-graphic? (char-or-string, #key start, end) => (boolean) - ascii-alphabetic? (char-or-string, #key start, end) => (boolean) - ascii-alphanumeric? (char-or-string, #key start, end) => (boolean) + control? (char-or-string, #key start, end) => (boolean) + printable? (char-or-string, #key start, end) => (boolean) + graphic? (char-or-string, #key start, end) => (boolean) + alphabetic? (char-or-string, #key start, end) => (boolean) + alphanumeric? (char-or-string, #key start, end) => (boolean) lowercase? (char-or-string, #key start, end) => (boolean) uppercase? (char-or-string, #key start, end) => (boolean) From d9ff742a908cdfe1481ec63294773d425f3722bd Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 10 Apr 2012 07:29:42 -0400 Subject: [PATCH 192/519] Add string-compare. Remove implementation notes. Flatten. --- .../website/source/proposals/dep-0004.rst | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 6782c1508c..fb36d8a334 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -145,10 +145,10 @@ Export the following functions from the "strings" module of the // often useful for strings as well... concatenate(sequence, #rest more-sequences) => (new-sequence) - replace-subsequence!(big, small, #key start, end) => (big) join (parts, separator, #key start, end, key, conjunction) => (string) - split (string, separator, #key start, end, max, remove-if-empty?) => (strings) replace-elements!(big, predicate, new-value-fn, #key count) => (big) + replace-subsequence!(big, small, #key start, end) => (big) + split (string, separator, #key start, end, max, remove-if-empty?) => (strings) Some observations about this API: @@ -205,9 +205,6 @@ now, resulting in multiple implementations) or write a ``for`` loop inline. -Comparisons -~~~~~~~~~~~ - :: char-equal? (char1, char2) => (boolean) @@ -226,6 +223,8 @@ Comparisons string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-compare(string1, string2, #key, start1, end1, start2, end2) => (one-of(-1, 0, 1)) + String and character comparisons, both case-sensitive and ignoring case (\*-ic?). These default to comparing the entire string but allow comparing substrings via keyword arguments. @@ -347,16 +346,3 @@ library: * Two names from the ``substring-search`` module: ``make-substring-positioner`` and ``make-substring-replacer``. - - -Implementation Notes -==================== - -* Copy and friends from string-extensions to - regular-expressions. That's the only place that uses it, and it is - unlikely to be of much use elsewhere. See conversation in #dylan on - 2011.12.26. - -* Add a README to string-extensions that points out that it has been - superceded by "strings" and is a purely GD library. Perhaps merge - it into the ``gwydion`` repository? From b6ea0a5af6a8f5d8633b798768ad1fa24b8820ca Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 10 Apr 2012 08:01:13 -0400 Subject: [PATCH 193/519] Add string-compare to API summary section. Fix return value for *case!. --- documentation/website/source/proposals/dep-0004.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index fb36d8a334..226ec2f899 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -119,12 +119,14 @@ Export the following functions from the "strings" module of the string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) + string-compare(string1, string2, #key, start1, end1, start2, end2) => (one-of(-1, 0, 1)) + starts-with? (string, pattern-string, #key test) => (boolean) ends-with? (string, pattern-string, #key test) => (boolean) - lowercase (char-or-string, #key start, end) => (char-or-string) + lowercase (char-or-string, #key start, end) => (new-char-or-string) lowercase! (char-or-string, #key start, end) => (char-or-string) - uppercase (char-or-string, #key start, end) => (char-or-string) + uppercase (char-or-string, #key start, end) => (new-char-or-string) uppercase! (char-or-string, #key start, end) => (char-or-string) strip (string, #key test = whitespace?) => (new-string) @@ -229,6 +231,10 @@ String and character comparisons, both case-sensitive and ignoring case (\*-ic?). These default to comparing the entire string but allow comparing substrings via keyword arguments. +``string-compare`` returns -1 if *string1* is less than *string2*, 0 +if the strings are equal, and 1 if *string1* is greater than +*string2*. + Some might object to the \*-ic? functions on the grounds that a "test" parameter could be added to the non-\*-ic? functions instead. But consider this type of code, which is likely to be fairly From 786a8bc84ac6f32f94a5022ba77cc35b30e9bcad Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 10 Apr 2012 08:26:51 -0400 Subject: [PATCH 194/519] Add DRM references, cleanup formatting, fix a few minor bugs. --- .../website/source/proposals/dep-0004.rst | 93 ++++++++++--------- 1 file changed, 51 insertions(+), 42 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 226ec2f899..0afe1be593 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -54,12 +54,12 @@ Non Goals #. Immutable strings -#. Strings not implemented as subclasses of ````. +#. Strings not implemented as subclasses of :drm:``. #. Text formatting APIs, such as justification and wrapping. #. Anything that is only applicable to a specific human language, - such as ``pluralize``. + such as *pluralize*. Proposal @@ -154,7 +154,7 @@ Export the following functions from the "strings" module of the Some observations about this API: -* Because this API provides ``start`` and ``end`` keywords where +* Because this API provides *start* and *end* keywords where appropriate, it is possible to do string operations within larger strings without allocating. @@ -190,21 +190,21 @@ Discussion octal-digit? (char-or-string, #key start, end) => (boolean) hexadecimal-digit? (char-or-string, #key start, end) => (boolean) -The methods on ```` do not have ``start`` and ``end`` +The methods on :drm:`` do not have *start* and *end* parameters for obvious reasons. -The methods on ```` return true if they would return true for -each character in the string. The ```` methods could be +The methods on :drm:`` return true if they would return true for +each character in the string. The :drm:`` methods could be implemented as follows:: every?(f, copy-sequence(s, start: start, end: _end)) Making these functions work on strings makes the resulting code more -concise than using ``every?`` and ``copy-sequence`` together, and also -more efficient, since no allocation is necessary. The alternative is -to write your own comparison function (which is the solution we have -now, resulting in multiple implementations) or write a ``for`` loop -inline. +concise than using :drm:`every?` and :drm:`copy-sequence` together, +and also more efficient, since no allocation is necessary. The +alternative is to write your own comparison function (which is the +solution we have now, resulting in multiple implementations) or write +a :drm:`for` loop inline. :: @@ -264,21 +264,23 @@ or, the less efficient but more concise:: > (char-or-string, char-or-string) => (boolean) If one doesn't mind allocating memory, the above built-in functions -can be used in place of explicit ``start`` and ``end`` parameters:: +can be used in place of explicit *start* and *end* parameters: - copy-sequence(s1, start: x, end: y) = copy-sequence(s2, start: w, end: z) + :: + + copy-sequence(s1, start: x, end: y) = copy-sequence(s2, start: w, end: z) :: lowercase (char-or-string, #key start, end) => (new-char-or-string) - lowercase! (char-or-string, #key start, end) => (new-char-or-string) + lowercase! (char-or-string, #key start, end) => (char-or-string) uppercase (char-or-string, #key start, end) => (new-char-or-string) - uppercase! (char-or-string, #key start, end) => (new-char-or-string) + uppercase! (char-or-string, #key start, end) => (char-or-string) -The above are provided despite the existence of ``as-uppercase`` and -``as-lowercase`` in the dylan module because they provide ``start`` -and ``end`` parameters, which makes them consistent with the rest of -the API. +The above are provided despite the existence of :drm:`as-uppercase` +and :drm:`as-lowercase` in the dylan module because they provide +*start* and *end* parameters, which makes them consistent with the +rest of the API. :: @@ -286,9 +288,9 @@ the API. strip-left (string, #key test = whitespace?) => (new-string) strip-right (string, #key test = whitespace?) => (new-string) -Return a copy of ``string`` with characters matching ``test`` removed. -Characters are removed from the left and/or right side of ``string`` -until the first character *not* matching ``test`` is found. +Return a copy of *string* with characters matching *test* removed. +Characters are removed from the left and/or right side of *string* +until the first character *not* matching *test* is found. :: @@ -296,15 +298,15 @@ until the first character *not* matching ``test`` is found. align-left (string, width, #key fill = ' ') align-right (string, width, #key fill = ' ') -The above return a new string of the given ``width``. If ``string`` -is shorter than ``width``, add the ``fill`` character to the left +The above return a new string of the given *width*. If *string* +is shorter than *width*, add the *fill* character to the left and/or right side of the string as appropriate. -Examples:: + Examples:: - align-center("x", 5) => " x " - align-center("x", 4) => " x " or " x " (unspecified) - align-center("x", 7, fill: '.') => "...x..." + align-center("x", 5) => " x " + align-center("x", 4) => " x " or " x " (unspecified) + align-center("x", 7, fill: '.') => "...x..." :: @@ -316,12 +318,19 @@ These common operations are for convenience and readability. :: find-substring (string, pattern-string, #key start, end, test) => (index-or-#f) - replace-substrings (string, pattern-string, new, #key test, count) -``find-substring`` is like ``subsequence-position`` except that it -accepts start/end keyword arguments and it only applies to strings. +``find-substring`` is like :drm:`subsequence-position` except that it +accepts start/end keyword arguments instead of *count*, and it only +applies to strings. + +:: + + replace-substrings (string, pattern-string, new, #key start, end, test, count) -``replace-substrings`` returns a new string with +``replace-substrings`` returns a new string with each occurrence of +*pattern-string* replaced by *new*. If *count* is supplied then +only *count* occurrences (moving left to right through *string*) +are replaced. *test* defaults to *==*. :: @@ -336,19 +345,19 @@ already in common-dylan but are included here for completeness. Dropped string-extensions Names ------------------------------- -A few names exported from ``string-extensions`` have no equivalent in this +A few names exported from *string-extensions* have no equivalent in this library: -* The ``%parse-string`` module. This should be moved to - ``regular-expressions`` if it's needed at all. +* The *%parse-string* module. This should be moved to + *regular-expressions* if it's needed at all. -* The ``string-hacking`` module. This includes character sets, and a +* The *string-hacking* module. This includes character sets, and a few character utilities. -* The ``string-conversions`` module. The only names this exports that - aren't available elsewhere are ``digit-to-integer`` and - ``integer-to-digit``. I suggest we put basic conversions like this - into ``common-dylan`` alongside ``string-to-integer`` et al. +* The *string-conversions* module. The only names this exports that + aren't available elsewhere are *digit-to-integer* and + *integer-to-digit*. I suggest we put basic conversions like this + into *common-dylan* alongside *string-to-integer* et al. -* Two names from the ``substring-search`` module: - ``make-substring-positioner`` and ``make-substring-replacer``. +* Two names from the *substring-search* module: + *make-substring-positioner* and *make-substring-replacer*. From d9fc562bc7984b15bc5553f82891b99a9702d033 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sat, 14 Apr 2012 09:51:05 -0400 Subject: [PATCH 195/519] test => ignore-case?, minor fixes --- .../website/source/proposals/dep-0004.rst | 58 ++++++++----------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 0afe1be593..5b29b83ff3 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -103,14 +103,12 @@ Export the following functions from the "strings" module of the octal-digit? (char-or-string, #key start, end) => (boolean) hexadecimal-digit? (char-or-string, #key start, end) => (boolean) - char-equal? (char1, char2) => (boolean) - char-less? (char1, char2) => (boolean) - char-greater? (char1, char2) => (boolean) - char-equal-ic? (char1, char2) => (boolean) char-less-ic? (char1, char2) => (boolean) char-greater-ic? (char1, char2) => (boolean) + string-compare(string1, string2, #key, start1, end1, start2, end2) => (one-of(-1, 0, 1)) + string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) @@ -119,10 +117,8 @@ Export the following functions from the "strings" module of the string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-compare(string1, string2, #key, start1, end1, start2, end2) => (one-of(-1, 0, 1)) - - starts-with? (string, pattern-string, #key test) => (boolean) - ends-with? (string, pattern-string, #key test) => (boolean) + starts-with? (string, pattern-string, #key ignore-case?) => (boolean) + ends-with? (string, pattern-string, #key ignore-case?) => (boolean) lowercase (char-or-string, #key start, end) => (new-char-or-string) lowercase! (char-or-string, #key start, end) => (char-or-string) @@ -137,20 +133,20 @@ Export the following functions from the "strings" module of the align-left (string, width, #key fill = ' ') align-right (string, width, #key fill = ' ') - find-substring (string, pattern, #key start, end, test) => (index-or-#f) - replace-substrings (string, pattern, new, #key test, count) + find-substring (string, pattern, #key start, end, ignore-case?) => (index-or-#f) + replace-substrings! (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) - split-lines (string, #rest split-keys) => (strings) + split-lines (string, #key remove-if-empty?) => (strings) // For reference, the following functions are available via dylan // or common-dylan and, although for general sequences, are // often useful for strings as well... - concatenate(sequence, #rest more-sequences) => (new-sequence) + concatenate (sequence, #rest more-sequences) => (new-sequence) join (parts, separator, #key start, end, key, conjunction) => (string) - replace-elements!(big, predicate, new-value-fn, #key count) => (big) - replace-subsequence!(big, small, #key start, end) => (big) - split (string, separator, #key start, end, max, remove-if-empty?) => (strings) + replace-elements! (big, predicate, new-value-fn, #key count) => (big) + replace-subsequence! (big, small, #key start, end) => (big) + split (string, separator, #key start, end, max, remove-if-empty) => (strings) Some observations about this API: @@ -174,6 +170,12 @@ discussion interspersed. Discussion ---------- +In all cases, ``ignore-case?`` parameters default to #f. + +In all cases, ``start`` (or start1 or start2) parameters default to 0. + +In all cases, ``end`` parameters default to #f, meaning the end of the string. + :: control? (char-or-string, #key start, end) => (boolean) @@ -209,14 +211,12 @@ a :drm:`for` loop inline. :: - char-equal? (char1, char2) => (boolean) - char-less? (char1, char2) => (boolean) - char-greater? (char1, char2) => (boolean) - char-equal-ic? (char1, char2) => (boolean) char-less-ic? (char1, char2) => (boolean) char-greater-ic? (char1, char2) => (boolean) + string-compare(string1, string2, #key, start1, end1, start2, end2) => (one-of(-1, 0, 1)) + string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) @@ -310,14 +310,14 @@ and/or right side of the string as appropriate. :: - starts-with? (string, pattern) => (boolean) - ends-with? (string, pattern) => (boolean) + starts-with? (string, pattern, #key ignore-case?) => (boolean) + ends-with? (string, pattern, #key ignore-case?) => (boolean) These common operations are for convenience and readability. :: - find-substring (string, pattern-string, #key start, end, test) => (index-or-#f) + find-substring (string, pattern-string, #key start, end, ignore-case?) => (index-or-#f) ``find-substring`` is like :drm:`subsequence-position` except that it accepts start/end keyword arguments instead of *count*, and it only @@ -325,20 +325,12 @@ applies to strings. :: - replace-substrings (string, pattern-string, new, #key start, end, test, count) + replace-substrings! (string, pattern-string, new, #key start, end, test, count, ignore-case?) => (new-string) -``replace-substrings`` returns a new string with each occurrence of +``replace-substrings!`` returns a new string with each occurrence of *pattern-string* replaced by *new*. If *count* is supplied then only *count* occurrences (moving left to right through *string*) -are replaced. *test* defaults to *==*. - -:: - - join (sequence, separator, #key start, end, key, conjunction) => (string) - split (string, separator, #key start, end, max, remove-if-empty?) => (strings) - -The above apply to sequences in general, not just strings. These are -already in common-dylan but are included here for completeness. +are replaced. *ignore-case?* defaults to #f. From a144549143d11bc74d1fdefc28f2edfc8d66ad49 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Thu, 19 Apr 2012 08:09:31 -0400 Subject: [PATCH 196/519] Rename align* to pad*. Add start/end to more functions. Add TODO comments. --- .../website/source/proposals/dep-0004.rst | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 5b29b83ff3..a73a2018a4 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -8,8 +8,8 @@ Type: Standards Track Author: Carl Gay Status: Draft Created: 08-Apr-2012 -Last-Modified: 08-Apr-2012 -Post-History: None +Last-Modified: 18-Apr-2012 +Post-History: 09-Apr-2012 Dylan-Version: 2012.1 ============== ============================================= @@ -107,16 +107,16 @@ Export the following functions from the "strings" module of the char-less-ic? (char1, char2) => (boolean) char-greater-ic? (char1, char2) => (boolean) - string-compare(string1, string2, #key, start1, end1, start2, end2) => (one-of(-1, 0, 1)) - + # TODO(cgay): Return second value, mismatch-index, in all of these below? + string-compare (string1, string2, #key start1, end1, start2, end2) => (one-of(-1, 0, 1)) string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-equal-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) + # TODO(cgay): Add -ic? versions starts-with? (string, pattern-string, #key ignore-case?) => (boolean) ends-with? (string, pattern-string, #key ignore-case?) => (boolean) @@ -125,19 +125,24 @@ Export the following functions from the "strings" module of the uppercase (char-or-string, #key start, end) => (new-char-or-string) uppercase! (char-or-string, #key start, end) => (char-or-string) - strip (string, #key test = whitespace?) => (new-string) - strip-left (string, #key test = whitespace?) => (new-string) - strip-right (string, #key test = whitespace?) => (new-string) + # TODO(cgay): add start/end parameters + strip (string, #key test = whitespace?, start, end) => (new-string) + strip-left (string, #key test = whitespace?, start, end) => (new-string) + strip-right (string, #key test = whitespace?, start, end) => (new-string) - align-center (string, width, #key fill = ' ') - align-left (string, width, #key fill = ' ') - align-right (string, width, #key fill = ' ') + pad (string, width, #key fill = ' ', start, end) + pad-left (string, width, #key fill = ' ', start, end) + pad-right (string, width, #key fill = ' ', start, end) + # TODO(cgay): from-end?: #t, find-substring-from-end? rfind-substring? find-substring (string, pattern, #key start, end, ignore-case?) => (index-or-#f) replace-substrings! (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) split-lines (string, #key remove-if-empty?) => (strings) + # TODO(cgay): string-hash, string-hash-ci ? + # http://srfi.schemers.org/srfi-13/srfi-13.html#string-hash + // For reference, the following functions are available via dylan // or common-dylan and, although for general sequences, are // often useful for strings as well... @@ -353,3 +358,4 @@ library: * Two names from the *substring-search* module: *make-substring-positioner* and *make-substring-replacer*. + From 525ac755a11da03431d17cdb5ece06fbf6ef69c3 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sat, 28 Apr 2012 20:55:38 -0400 Subject: [PATCH 197/519] char-compare, switch (back) from ignore-case? to test arg, replace-substrings! => replace-substrings, etc --- .../website/source/proposals/dep-0004.rst | 48 ++++++++----------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index a73a2018a4..4e7a35d98e 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -8,7 +8,7 @@ Type: Standards Track Author: Carl Gay Status: Draft Created: 08-Apr-2012 -Last-Modified: 18-Apr-2012 +Last-Modified: 22-Apr-2012 Post-History: 09-Apr-2012 Dylan-Version: 2012.1 ============== ============================================= @@ -103,12 +103,11 @@ Export the following functions from the "strings" module of the octal-digit? (char-or-string, #key start, end) => (boolean) hexadecimal-digit? (char-or-string, #key start, end) => (boolean) + char-compare (char1, char2) => (one-of(-1, 0, 1)) + char-compare-ic (char1, char2) => (one-of(-1, 0, 1)) char-equal-ic? (char1, char2) => (boolean) - char-less-ic? (char1, char2) => (boolean) - char-greater-ic? (char1, char2) => (boolean) - # TODO(cgay): Return second value, mismatch-index, in all of these below? - string-compare (string1, string2, #key start1, end1, start2, end2) => (one-of(-1, 0, 1)) + string-compare (string1, string2, #key start1, end1, start2, end2, test) => (one-of(-1, 0, 1)) string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) @@ -116,27 +115,25 @@ Export the following functions from the "strings" module of the string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) - # TODO(cgay): Add -ic? versions - starts-with? (string, pattern-string, #key ignore-case?) => (boolean) - ends-with? (string, pattern-string, #key ignore-case?) => (boolean) + starts-with? (string, pattern-string, #key test) => (boolean) + ends-with? (string, pattern-string, #key test) => (boolean) lowercase (char-or-string, #key start, end) => (new-char-or-string) lowercase! (char-or-string, #key start, end) => (char-or-string) uppercase (char-or-string, #key start, end) => (new-char-or-string) uppercase! (char-or-string, #key start, end) => (char-or-string) - # TODO(cgay): add start/end parameters strip (string, #key test = whitespace?, start, end) => (new-string) strip-left (string, #key test = whitespace?, start, end) => (new-string) strip-right (string, #key test = whitespace?, start, end) => (new-string) - pad (string, width, #key fill = ' ', start, end) - pad-left (string, width, #key fill = ' ', start, end) - pad-right (string, width, #key fill = ' ', start, end) + pad (string, width, #key fill = ' ') + pad-left (string, width, #key fill = ' ') + pad-right (string, width, #key fill = ' ') # TODO(cgay): from-end?: #t, find-substring-from-end? rfind-substring? - find-substring (string, pattern, #key start, end, ignore-case?) => (index-or-#f) - replace-substrings! (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) + find-substring (string, pattern, #key start, end, ignore-case?) => (index-or-#f) + replace-substrings (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) split-lines (string, #key remove-if-empty?) => (strings) @@ -163,11 +160,6 @@ Some observations about this API: just for readability, despite being trivial to implement in terms of other functions. -* All start/end parameters accept negative values, which means to - index relative to the end of the string. I've found this extremely - useful in Python but I understand it will probably be controvesial - and would be willing to remove that functionality. - The remainder of this proposal will repeat the above API with discussion interspersed. @@ -216,16 +208,14 @@ a :drm:`for` loop inline. :: + char-compare (char1, char2) => (one-of(-1, 0, 1)) + char-compare-ic (char1, char2) => (one-of(-1, 0, 1)) char-equal-ic? (char1, char2) => (boolean) - char-less-ic? (char1, char2) => (boolean) - char-greater-ic? (char1, char2) => (boolean) - - string-compare(string1, string2, #key, start1, end1, start2, end2) => (one-of(-1, 0, 1)) + string-compare (string1, string2, #key start1, end1, start2, end2, test) => (one-of(-1, 0, 1)) string-equal? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-equal-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) @@ -330,12 +320,12 @@ applies to strings. :: - replace-substrings! (string, pattern-string, new, #key start, end, test, count, ignore-case?) => (new-string) + replace-substrings (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) -``replace-substrings!`` returns a new string with each occurrence of -*pattern-string* replaced by *new*. If *count* is supplied then -only *count* occurrences (moving left to right through *string*) -are replaced. *ignore-case?* defaults to #f. +``replace-substrings`` returns a new string with each occurrence of +*pattern-string* replaced by *new*. If *count* is supplied then only +*count* occurrences (moving left to right through *string*) are +replaced. *ignore-case?* defaults to #f. From a3b983dfe070239d162574a0307d0a2b59da7832 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 30 Apr 2012 08:13:07 -0400 Subject: [PATCH 198/519] Make everything match the code. Cleanup examples. Add clarifications. --- .../website/source/proposals/dep-0004.rst | 82 +++++++++++-------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 4e7a35d98e..6d13e3cd8d 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -115,8 +115,8 @@ Export the following functions from the "strings" module of the string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) - starts-with? (string, pattern-string, #key test) => (boolean) - ends-with? (string, pattern-string, #key test) => (boolean) + starts-with? (string, pattern-string, #key test) => (boolean) + ends-with? (string, pattern-string, #key test) => (boolean) lowercase (char-or-string, #key start, end) => (new-char-or-string) lowercase! (char-or-string, #key start, end) => (char-or-string) @@ -167,11 +167,13 @@ discussion interspersed. Discussion ---------- -In all cases, ``ignore-case?`` parameters default to #f. +All comparisons default to being case-sensitive unless the function +name ends with "-ic" or "-ic?" (meaning ignore case). In all cases, ``start`` (or start1 or start2) parameters default to 0. -In all cases, ``end`` parameters default to #f, meaning the end of the string. +In all cases, ``end`` (or end1 or end2) parameters default to the size +of the corresponding string. :: @@ -205,6 +207,11 @@ alternative is to write your own comparison function (which is the solution we have now, resulting in multiple implementations) or write a :drm:`for` loop inline. +Note that ``lowercase?`` and ``uppercase?`` return true for +non-alphabetic characters, so (for example) to determine whether a +string contains all uppercase alphabetic characters you would use:: + + alphabetic?(string) & uppercase?(string) :: @@ -220,8 +227,6 @@ a :drm:`for` loop inline. string-less-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) string-greater-ic? (string1, string2, #key start1, end1, start2, end2) => (boolean) - string-compare(string1, string2, #key, start1, end1, start2, end2) => (one-of(-1, 0, 1)) - String and character comparisons, both case-sensitive and ignoring case (\*-ic?). These default to comparing the entire string but allow comparing substrings via keyword arguments. @@ -239,12 +244,12 @@ common:: Instead one would have to write this:: - sort(seq, test: rcurry(string-less?, test: char-equal-ic?)) + sort(seq, test: rcurry(string-less?, test: char-compare-ic)) -or worse, if char-equal-ic? is removed on the same grounds:: +or worse, if ``char-compare-ic`` is removed on the same grounds:: sort(seq, test: rcurry(string-less?, test: method (c1, c2) - as-lowercase(c1) = as-lowercase(c2) + char-compare(as-lowercase(c1), as-lowercase(c2)) end)) or, the less efficient but more concise:: @@ -259,11 +264,9 @@ or, the less efficient but more concise:: > (char-or-string, char-or-string) => (boolean) If one doesn't mind allocating memory, the above built-in functions -can be used in place of explicit *start* and *end* parameters: - - :: +can be used in place of explicit *start* and *end* parameters:: - copy-sequence(s1, start: x, end: y) = copy-sequence(s2, start: w, end: z) + copy-sequence(s1, start: x, end: y) = copy-sequence(s2, start: w, end: z) :: @@ -279,53 +282,60 @@ rest of the API. :: - strip (string, #key test = whitespace?) => (new-string) - strip-left (string, #key test = whitespace?) => (new-string) - strip-right (string, #key test = whitespace?) => (new-string) + strip (string, #key test = whitespace?, start, end) => (new-string) + strip-left (string, #key test = whitespace?, start, end) => (new-string) + strip-right (string, #key test = whitespace?, start, end) => (new-string) -Return a copy of *string* with characters matching *test* removed. -Characters are removed from the left and/or right side of *string* -until the first character *not* matching *test* is found. +Return a copy of *string* between *start* and *end* with characters +matching *test* removed. Characters are removed from the left and/or +right side of *string* until the first character *not* matching *test* +is found. :: - align-center (string, width, #key fill = ' ') - align-left (string, width, #key fill = ' ') - align-right (string, width, #key fill = ' ') + pad (string, width, #key fill = ' ') + pad-left (string, width, #key fill = ' ') + pad-right (string, width, #key fill = ' ') The above return a new string of the given *width*. If *string* -is shorter than *width*, add the *fill* character to the left +is shorter than *width*, the *fill* character is added to the left and/or right side of the string as appropriate. Examples:: - align-center("x", 5) => " x " - align-center("x", 4) => " x " or " x " (unspecified) - align-center("x", 7, fill: '.') => "...x..." + pad("x", 5) => " x " + pad("x", 4) => " x " or " x " (unspecified) + pad("x", 7, fill: '.') => "...x..." :: - starts-with? (string, pattern, #key ignore-case?) => (boolean) - ends-with? (string, pattern, #key ignore-case?) => (boolean) + starts-with? (string, pattern-string, #key test) => (boolean) + ends-with? (string, pattern-string, #key test) => (boolean) -These common operations are for convenience and readability. +These common operations are for convenience and readability. The +*test* parameter is the same as for ``string-compare``. :: - find-substring (string, pattern-string, #key start, end, ignore-case?) => (index-or-#f) + find-substring (string, pattern, #key start, end, ignore-case?) => (index-or-#f) ``find-substring`` is like :drm:`subsequence-position` except that it -accepts start/end keyword arguments instead of *count*, and it only -applies to strings. +accepts *start* and *end* keyword arguments instead of *count*, and it +only applies to strings so the *ignore-case?* argument has been added. + +Note that this (and replace-substrings) use *ignore-case?* instead of +a *test* parameter. This is because the implementation (Boyer +Moore-ish search) needs to setup skip tables and the code for that +needs to know explicitly whether case is being ignored. :: replace-substrings (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) -``replace-substrings`` returns a new string with each occurrence of -*pattern-string* replaced by *new*. If *count* is supplied then only -*count* occurrences (moving left to right through *string*) are -replaced. *ignore-case?* defaults to #f. +``replace-substrings`` returns a new string with occurrences of +*pattern* replaced by *new*. If *count* is supplied then only *count* +occurrences (moving left to right through *string*) are replaced. +*ignore-case?* defaults to #f. From afab3daca41564dafb825d0ecec5cc0081965cd9 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 30 Apr 2012 13:50:55 -0400 Subject: [PATCH 199/519] Remove TODOs that I'm not going to do. --- documentation/website/source/proposals/dep-0004.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 6d13e3cd8d..a9db9d9ce0 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -131,15 +131,11 @@ Export the following functions from the "strings" module of the pad-left (string, width, #key fill = ' ') pad-right (string, width, #key fill = ' ') - # TODO(cgay): from-end?: #t, find-substring-from-end? rfind-substring? find-substring (string, pattern, #key start, end, ignore-case?) => (index-or-#f) replace-substrings (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) split-lines (string, #key remove-if-empty?) => (strings) - # TODO(cgay): string-hash, string-hash-ci ? - # http://srfi.schemers.org/srfi-13/srfi-13.html#string-hash - // For reference, the following functions are available via dylan // or common-dylan and, although for general sequences, are // often useful for strings as well... From fec6bc646b7a2a3f53e7e48351a8fd107cea38fb Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 1 May 2012 23:27:00 -0400 Subject: [PATCH 200/519] Update headers. --- documentation/website/source/proposals/dep-0004.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index a9db9d9ce0..a33bc8703b 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -8,8 +8,8 @@ Type: Standards Track Author: Carl Gay Status: Draft Created: 08-Apr-2012 -Last-Modified: 22-Apr-2012 -Post-History: 09-Apr-2012 +Last-Modified: 30-Apr-2012 +Post-History: 01-May-2012, 09-Apr-2012 Dylan-Version: 2012.1 ============== ============================================= From 4fc1b1fac3625ff7bfe1dcc57b307f066b33386f Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Wed, 2 May 2012 20:42:46 -0400 Subject: [PATCH 201/519] pattern -> pattern-string, per Faried Nawaz --- documentation/website/source/proposals/dep-0004.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index a33bc8703b..87e0c70485 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -131,8 +131,8 @@ Export the following functions from the "strings" module of the pad-left (string, width, #key fill = ' ') pad-right (string, width, #key fill = ' ') - find-substring (string, pattern, #key start, end, ignore-case?) => (index-or-#f) - replace-substrings (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) + find-substring (string, pattern-string, #key start, end, ignore-case?) => (index-or-#f) + replace-substrings (string, pattern-string, new, #key start, end, count, ignore-case?) => (new-string) split-lines (string, #key remove-if-empty?) => (strings) @@ -313,7 +313,7 @@ These common operations are for convenience and readability. The :: - find-substring (string, pattern, #key start, end, ignore-case?) => (index-or-#f) + find-substring (string, pattern-string, #key start, end, ignore-case?) => (index-or-#f) ``find-substring`` is like :drm:`subsequence-position` except that it accepts *start* and *end* keyword arguments instead of *count*, and it @@ -326,10 +326,10 @@ needs to know explicitly whether case is being ignored. :: - replace-substrings (string, pattern, new, #key start, end, count, ignore-case?) => (new-string) + replace-substrings (string, pattern-string, new, #key start, end, count, ignore-case?) => (new-string) ``replace-substrings`` returns a new string with occurrences of -*pattern* replaced by *new*. If *count* is supplied then only *count* +*pattern-string* replaced by *new*. If *count* is supplied then only *count* occurrences (moving left to right through *string*) are replaced. *ignore-case?* defaults to #f. From be457187f0dfd00d665574769d27d465feb7229a Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sat, 5 May 2012 17:54:22 -0400 Subject: [PATCH 202/519] Add count-substrings. --- documentation/website/source/proposals/dep-0004.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 87e0c70485..42df2b0feb 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -132,6 +132,7 @@ Export the following functions from the "strings" module of the pad-right (string, width, #key fill = ' ') find-substring (string, pattern-string, #key start, end, ignore-case?) => (index-or-#f) + count-substrings (string, pattern-string, #key start, end, ignore-case?) => (count) replace-substrings (string, pattern-string, new, #key start, end, count, ignore-case?) => (new-string) split-lines (string, #key remove-if-empty?) => (strings) @@ -324,6 +325,13 @@ a *test* parameter. This is because the implementation (Boyer Moore-ish search) needs to setup skip tables and the code for that needs to know explicitly whether case is being ignored. +:: + + count-substrings (string, pattern-string, #key start, end, ignore-case?) => (count) + +``count-substrings`` counts the number of non-overlapping occurrences +of *pattern-string* within *big*. + :: replace-substrings (string, pattern-string, new, #key start, end, count, ignore-case?) => (new-string) @@ -334,7 +342,6 @@ occurrences (moving left to right through *string*) are replaced. *ignore-case?* defaults to #f. - Dropped string-extensions Names ------------------------------- From 42ab63b1d2268fe3ea939a457faad645b9b3c4cd Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Wed, 16 May 2012 22:47:54 -0400 Subject: [PATCH 203/519] Status = Accepted --- documentation/website/source/proposals/dep-0004.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/proposals/dep-0004.rst b/documentation/website/source/proposals/dep-0004.rst index 42df2b0feb..5d71b9c9ea 100644 --- a/documentation/website/source/proposals/dep-0004.rst +++ b/documentation/website/source/proposals/dep-0004.rst @@ -6,9 +6,9 @@ New strings Library DEP #: 4 Type: Standards Track Author: Carl Gay -Status: Draft +Status: Accepted Created: 08-Apr-2012 -Last-Modified: 30-Apr-2012 +Last-Modified: 05-May-2012 Post-History: 01-May-2012, 09-Apr-2012 Dylan-Version: 2012.1 ============== ============================================= From 21fe0d7907e7cc442b6f6caa502579f9bff0ba66 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 4 Jun 2012 23:19:44 -0400 Subject: [PATCH 204/519] Add news item for new strings library --- .../website/source/news/2012/05/18/strings.rst | 13 +++++++++++++ documentation/website/source/news/recent.rst.inc | 10 ++++++++++ 2 files changed, 23 insertions(+) create mode 100644 documentation/website/source/news/2012/05/18/strings.rst diff --git a/documentation/website/source/news/2012/05/18/strings.rst b/documentation/website/source/news/2012/05/18/strings.rst new file mode 100644 index 0000000000..783ca67902 --- /dev/null +++ b/documentation/website/source/news/2012/05/18/strings.rst @@ -0,0 +1,13 @@ +:Author: Carl Gay +:Date: 2012-05-18 00:00:00 + +New Strings Library +=================== + +A new library of basic string operations is now available as a +standard library. The new `strings library +`_ replaces most of the code in +the old ``string-extensions`` library and provides a simpler and more +consistent API. ``string-extensions`` will eventually be retired when +the remainder of the code there is moved to the +``regular-expressions`` library, which is its only client. diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index d9158e81e5..6ee01dd7e8 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,3 +1,11 @@ +**New strings library** +*2012-05-18* + +A new library of basic string operations is now available as a +standard library. + +:doc:`Read more... ` + **C3 superclass linearization** *2012-01-25* @@ -8,6 +16,7 @@ further performance improvements. :doc:`Read more... ` + **Dswank - emacs and DIME** *2011-12-12* @@ -18,6 +27,7 @@ more, all from within emacs! :doc:`Read more... ` + **New release: 2011.1** *2011-12-10* From 686118a95c22370f54bb25c5037de90c2beb8502 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 19 Jun 2012 03:35:21 -0400 Subject: [PATCH 205/519] Mark DEP-0004 as final. --- documentation/website/source/proposals/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index aca688e3ba..0ec30f9a85 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -25,7 +25,7 @@ Open Proposals (under consideration) ==== ============= ========== ============================================= 1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) -4 Standard Draft `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) +4 Standard Final `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) ==== ============= ========== ============================================= @@ -36,5 +36,5 @@ All Proposals by Number 1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) 2 Standard Final `define function `_ (`source <../_sources/proposals/dep-0002.txt>`__) 3 Standard Final `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) -4 Standard Draft `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) +4 Standard Final `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) ==== ============= ========== ============================================= From c2c88e8a53e25b8176f84a2232a1f67437ee04a1 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 19 Jun 2012 06:02:02 -0400 Subject: [PATCH 206/519] Add section for parameter lists to cheat sheet. --- .../source/documentation/cheatsheet.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/documentation/website/source/documentation/cheatsheet.rst b/documentation/website/source/documentation/cheatsheet.rst index 84adab5546..4bafd121f6 100644 --- a/documentation/website/source/documentation/cheatsheet.rst +++ b/documentation/website/source/documentation/cheatsheet.rst @@ -150,3 +150,22 @@ Example: ``format(stream, "%s:%d", host, port)`` +-------------+------------------+-----------------------+ | %% | None | literal % | +-------------+------------------+-----------------------+ + + +Parameter Lists +=============== + +This table shows what is required/allowed in method parameter lists, +depending on what is specified in the generic function's parameter +list. + +================================= ========= ============= ============= ========= +Generic function's parameter list ``#key`` ``#key a, b`` ``#all-keys`` ``#rest`` +================================= ========= ============= ============= ========= +``(x)`` Forbidden Forbidden Forbidden Forbidden +``(x, #key)`` Required Allowed Allowed Allowed +``(x, #key a, b)`` Required Required Allowed Allowed +``(x, #key, #all-keys)`` Required Allowed Automatic Allowed +``(x, #key a, b, #all-keys)`` Required Required Automatic Allowed +``(x, #rest r)`` Forbidden Forbidden Forbidden Required +================================= ========= ============= ============= ========= From ac255bd5e2d9eb9b91274bd8cf33ac09adba1a29 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 27 Aug 2012 14:40:54 -0400 Subject: [PATCH 207/519] Remove dep-0004 from list of open deps. --- documentation/website/source/proposals/index.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index 0ec30f9a85..3ebe93e9a2 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -25,7 +25,6 @@ Open Proposals (under consideration) ==== ============= ========== ============================================= 1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) -4 Standard Final `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) ==== ============= ========== ============================================= From 43a30a82d5540c606b7b099a944d22db52531a59 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Tue, 28 Aug 2012 10:42:06 +0200 Subject: [PATCH 208/519] reflect status in README.rst --- documentation/website/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/README.rst b/documentation/website/README.rst index de09351a17..097eb2e0de 100644 --- a/documentation/website/README.rst +++ b/documentation/website/README.rst @@ -1,4 +1,4 @@ -This is an early version of the new Open Dylan website. +This is the Open Dylan website. It is built using `Sphinx `_. All content is written using ReStructured Text with Sphinx extensions. From 5eef28f321387570e2ab652b975e55bf85051185 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Thu, 6 Sep 2012 22:40:56 +0200 Subject: [PATCH 209/519] add subclass proposal --- .../website/source/proposals/dep-0005.rst | 403 ++++++++++++++++++ .../website/source/proposals/index.rst | 1 + 2 files changed, 404 insertions(+) create mode 100644 documentation/website/source/proposals/dep-0005.rst diff --git a/documentation/website/source/proposals/dep-0005.rst b/documentation/website/source/proposals/dep-0005.rst new file mode 100644 index 0000000000..a33fbf6eb7 --- /dev/null +++ b/documentation/website/source/proposals/dep-0005.rst @@ -0,0 +1,403 @@ +******** +Subclass +******** + +============== ============================================= +DEP #: 5 +Type: Standards Track +Affects-DRM: Yes +Author: Keith Playford +Status: Accepted +Created: 13-Jul-1995 +Last-Modified: 08-Aug-1995 +Post-History: None +============== ============================================= + +*Note: This DEP was converted from the old Dylan Change Proposal +Format to DEP format with minimal changes for ReStructuredText. It +does not fully conform to the new format.* + +Abstract +======== + + Methods on generic functions such as Dylan's standard "make" and "as" + which take types as arguments are impossible to reuse in Dylan without + resorting to ad hoc techniques. As things stand, the only available + mechanism for specializing such methods is through the use of + singleton types. A singleton type specializer used in this way, by + definition, gives a method applicable to exactly one type. In + particular, such methods are not applicable to subtypes of the type in + question. + + In order to define reusable methods on generic functions like this, we + need a type which allows us to express applicability to a type and all + its subtypes. + +Specification +============= + + Define the following: + + .. code-block:: dylan + + subclass (class) => type + + A call to this function returns a type which describes all the + objects representing subclasses of the given class. We term such a + type a "subclass type". + + The subclass function is allowed to return an existing type if that + type is type equivalent to the subclass type requested. + + For an object O and class Y, the following instance? relationship + applies: + + * INSTANCE-1. instance?(O, subclass(Y)) + This will be true if and only if O is a class and O is a subclass of Y. + + For classes X and Y the following subtype? relationships hold (note + that a rule applies only when no preceding rule matches): + + * SUBTYPE-1. subtype?(subclass(X), subclass(Y)) + This will be true if and only if X is a subclass of Y. + + * SUBTYPE-2. subtype?(singleton(X), subclass(Y)) + This will be true if and only if X is a class and X is a subclass of + Y. + + * SUBTYPE-3. subtype?(subclass(X), singleton(Y)) + This is always false. + + * SUBTYPE-4. subtype?(subclass(X), Y), where Y is not a subclass type + This will be true if Y is or any proper superclass of + (including , any implementation-defined supertypes, + and unions involving any of these). There may be other + implementation-defined combinations of types X and Y for which this + is also true. + + * SUBTYPE-5. subtype?(X, subclass(Y)), where X is not a subclass type + This will be true if Y is or any proper supertype of + and X is a subclass of . + + Note that by subclass relationships SUBYPE-4 and SUBTYPE-5, we get + this correspondance: + + * and subclass() are type equivalent. + + Where the subtype? test has not been sufficient to determine an + ordering for a method's argument position, the following further + method ordering rules apply to cases involving subclass types (note + that a rule applies only when no preceding rule matches): + + * SPECIFICITY+1. subclass(X) precedes subclass(Y) when the argument is + a class C and X precedes Y in the class precedence list of C. + + * SPECIFICITY+2. subclass(X) always precedes Y, Y not a subclass type. + That is, applicable subclass types precede any other applicable + class-describing specializer. + + The constraints implied by sealing come by direct application of + sealing rules 1 - 3 and the following disjointness criteria for + subclass types (note that a rule applies only when no preceding rule + matches): + + * DISJOINTNESS+1. A subclass type subclass(X) and a type Y are + disjoint if Y is disjoint from . + + * DISJOINTNESS+2. Two subclass types subclass(X) and subclass(Y) are + disjoint if the classes X and Y are disjoint. + + * DISJOINTNESS+3. A subclass type subclass(X) and a singleton type + singleton(O) are disjoint unless O is a class and O is a subclass of + X. + + Method sealing's rule 3 must be changed to include the following: + + * A method M (with specializers S1...Sn) in G also potentially blocks + C at argument position i if there exist j and k such that + subclass(Dj) is a pseudosubtype of Si, subclass(Dk) is a + pseudosubtype of Ti, and subclass(Dk) is not a pseudosubtype of Si. + + This relies on the acceptance of Version 6 of "Method Sealing Bug". + +Amendment +========= + + Specify that a subclass of is considered disjoint from a + subclass type until a class is created that is a common instance of + both. + + Do this by changing the disjointness rule: + + * A subclass type subclass(X) and a type Y are disjoint if Y is + disjoint from . + + to read: + + * A subclass type subclass(X) and a type Y are disjoint if Y is + disjoint from , or if Y is a subclass of without + instance classes that are also subclasses of X. + +Rationale +========= + + Subclass types don't address everything in the problem description, + particularly limited collection types, but are simpler to understand + than subtype types and still very useful, particularly within user- + defined frameworks where limited types are not an issue. + + The guiding principle behind the semantics is that, as far as + possible, methods on classes called with an instance should behave + isomorphically to corresponding methods on corresponding subclass + types called with the class of that instance. So, for example, given + the heterachy: + +:: + + + \ + + / \ + + \ / + + + and methods: + + .. code-block:: dylan + + method foo () + method foo () + method foo () + method foo () + + method foo-using-type (subclass()) + method foo-using-type (subclass()) + method foo-using-type (subclass()) + method foo-using-type (subclass()) + + that for a direct instance D1 of : + + .. code-block:: dylan + + foo-using-type() + + should behave analogously to: + + .. code-block:: dylan + + foo(D1) + + with respect to method selection. + + The clause added to sealing's "Rule 3" forces class creation to + respect sealing constraints on this parallel heterarchy. Thus, sealing + methods over subclass(C1), ..., subclass(CN) results in the same + constraints on class creation as sealing methods with the same + structure over C1, ..., CN if metaclasses are ignored. + + The rule that has subclass specializers precede other specializers + applicable to types seems arbitrary but looks to be most useful and + leads to the simplest "rule of thumb", being that for a set of + applicable types the general order in decreasing order of + applicability is: + + * singleton specializer + * subclass specializers + * class specializers + + No attempt is made to be "clever" with subtype? relationships. In + particular, the simplifying assumption is made that any class might + have subclasses we know nothing about, regardless of any sealing + declarations that might appear in the code. This seems a reasonable + course to take. + + The rationale for the amendment is to prevent sealing a generic + function over a subclass type of a class from blocking the creation of + new metaclasses unnecessarily. The amendment may or may not be + considered necessary at this point given that Dylan does not currently + address the issue of introducing new metaclasses. Note that even + without the amendment an implementation is free to have a number of + initial, explicitly-defined metaclasses without any problems, in which + case the situation is analogous to that of limited . + +Examples +======== + + .. code-block:: dylan + + // Common usage: + + define class () end; + define class () end; + define class () end; + define class (, ) end; + + define method make (class :: subclass(), #key) + print("Making an "); + next-method(); + end method; + + define method make (class :: subclass(), #key) + print("Making a "); + next-method(); + end method; + + define method make (class :: subclass(), #key) + print("Making a "); + next-method(); + end method; + + define method make (class :: subclass(), #key) + print("Making a "); + next-method(); + end method; + + ? make(); + Making a + Making a + Making a + Making an + {instance of } + + // Less common usage: + + // Metatype methods + + define method classify (type :: ) + print("A type"); + end method; + + define method classify (type :: ) + print("A class"); + next-method(); + end method; + + define method classify (type :: ) + print("A singleton"); + next-method(); + end method; + + // "User" level subclass methods + + define method classify (type :: subclass()) + print("A subclass of "); + next-method(); + end method; + + ? classify(); + A subclass of + A class + A type + + ? classify(singleton()) + A subclass of + A singleton + A type + + ? classify(subclass()) + A subclass of + A type + +Cost to implementors +==================== + + Another type to implement. Given the number of types Dylan has and + allows you to specialize on already, any implementation is going to + require a well thought out type framework. Given this, it should be + reasonable to add in the new rules for as specified. + +Cost to users +============= + + Another type to understand, although they shouldn't have to face it + unless they have need of it, and even then only the "obvious" aspects + of its behaviour are likely to be necessary in user programs. + +Performance impact +================== + + Singleton types, and possibly limited integer types, are likely to be + implemented through some kind of secondary dispatch scheme + already. Subclass types could be dealt with using the same + technique. In the common case where a generic function defines a + restriction on an argument that constrains it to be a type object + (make, as), there is potential to do somewhat better by hijacking the + primary dispatch mechanism in the corresponding argument position. + +Benefits +======== + + Methods that take classes as arguments become reusable! + +Aesthetics +========== + + Good on balance because it fills a tangible hole in the language in a + consistent, intuitive way rather than leaving the hole there to be + fallen into or filled by ad hoc techniques. + +Discussion +========== + + The subclass relationship definitions don't spell everything out + explicitly when it comes to union types - for the definition of new + types to be tractable we have to be able to fall back on existing + definitions of composite types like union, and we do here. + +From Keith Playford in 1995 +=========================== + + Subclass specialisation is interesting in that most groups seem to + recognise the need for it and, in fact, actually implement and use it + in some form or another: we now support it, as does Mindy through an + extension of the "limited" type mechanism, and some of the mail on + collection coercion suggests that Apple Dylan supports it too. + + Our own implementation follows the shelved proposal "Subclass + Specialization" by providing the type constructor "subclass" which + returns a type describing all the subclasses of its argument class. + The method specificity rules are extended such that the CPL of the + argument class is taken into account. Loosely, this means that a + method set specialising on the subclass types subclass(Ci) will be + selected and ordered by a class argument C in a way isomorphic to a + corresponding method set specialising on Ci given argument make(C). + + We'd like to bring "Subclass Specialization" up to date, hopefully in + line with the above, and try to get it agreed between the partners. + Like all of these issues, if it can't be included in the book, we need + to at least negotiate a standard way (library/module) of getting at + "subclass" in implementations that support it. This could imply + registry as a standard implementation-dependent library, with + Gwydion's agreement. + + +From the Gwydion docs +===================== + + Gwydion compilers supports subclass specializers via the *limited* function. + A subclass specializer causes a method to be invoked whenever the generic + function was called on a value that is the specified class or any subclass + of the specified class. The method is never invoked on a value that is an + instance (direct or indirect) of the specified class, only when the value + is a subclass of the specified class. The following is an example: + + .. code-block:: dylan + + define method make (result-class :: limited(, subclass-of: )) + let x = next-method(); + do-special-logging-or-something(x); + x; + end method; + +Revision History +================ +:: + + Version 1, 13th July 95, Keith Playford (Harlequin) + Version 2, 8th August 95, Keith Playford (Harlequin) + +Status +====== + + Accepted 08 August 1995 diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index 3ebe93e9a2..7e60614884 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -36,4 +36,5 @@ All Proposals by Number 2 Standard Final `define function `_ (`source <../_sources/proposals/dep-0002.txt>`__) 3 Standard Final `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) 4 Standard Final `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) +5 Standard Final `Subclass `_ (`source <../_sources/proposals/dep-0005.txt>`__) ==== ============= ========== ============================================= From 107a5475d792a62524d1d21ec0577d98c31ebcba Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sun, 9 Sep 2012 11:18:28 -0400 Subject: [PATCH 210/519] Fix formatting in Rationale section of dep-0005 --- .../website/source/proposals/dep-0005.rst | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/documentation/website/source/proposals/dep-0005.rst b/documentation/website/source/proposals/dep-0005.rst index a33fbf6eb7..6d57112de0 100644 --- a/documentation/website/source/proposals/dep-0005.rst +++ b/documentation/website/source/proposals/dep-0005.rst @@ -150,17 +150,15 @@ Rationale possible, methods on classes called with an instance should behave isomorphically to corresponding methods on corresponding subclass types called with the class of that instance. So, for example, given - the heterachy: - -:: - - - \ - - / \ - - \ / - + the heterachy:: + + + \ + + / \ + + \ / + and methods: From 82439ad3265d8621a01c6831c57b5cab0dd96089 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 16 Oct 2012 19:23:35 -0400 Subject: [PATCH 211/519] News item about new command-line-parser changes. --- .../news/2012/10/15/command-line-parser.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 documentation/website/source/news/2012/10/15/command-line-parser.rst diff --git a/documentation/website/source/news/2012/10/15/command-line-parser.rst b/documentation/website/source/news/2012/10/15/command-line-parser.rst new file mode 100644 index 0000000000..42c2ca0047 --- /dev/null +++ b/documentation/website/source/news/2012/10/15/command-line-parser.rst @@ -0,0 +1,16 @@ +:Author: Carl Gay +:Date: 2012-10-15 00:00:00 + +New command-line-parser Library +=============================== + +The `_ library has +been completely rewritten to + + * be far less verbose + * have simplified usage + * have automatic support for --help + * be documented + +Testworks and the HTTP server are using the new library. More +enhancements coming soon. From c6bcfb1c95d448a3f8b9c4c28fafa11347182a2c Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 16 Oct 2012 21:49:11 -0400 Subject: [PATCH 212/519] fix links --- .../website/source/news/2012/10/15/command-line-parser.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/news/2012/10/15/command-line-parser.rst b/documentation/website/source/news/2012/10/15/command-line-parser.rst index 42c2ca0047..1b03ab915c 100644 --- a/documentation/website/source/news/2012/10/15/command-line-parser.rst +++ b/documentation/website/source/news/2012/10/15/command-line-parser.rst @@ -4,13 +4,14 @@ New command-line-parser Library =============================== -The `_ library has -been completely rewritten to +The `command-line-parser +`_ library has been +completely rewritten to * be far less verbose * have simplified usage * have automatic support for --help - * be documented + * be `documented `_ Testworks and the HTTP server are using the new library. More enhancements coming soon. From ae7d081a06dbc9186afe3ef4143c7832dbe0bec1 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Tue, 16 Oct 2012 21:49:43 -0400 Subject: [PATCH 213/519] add entry for command-line-parser --- documentation/website/source/news/recent.rst.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index 6ee01dd7e8..bc97b77f1f 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,3 +1,13 @@ +**command-line-parser library** +*2012-10-15* + +The `command-line-parser +`_ library has been +completely rewritten. + +:doc:`Read more... ` + + **New strings library** *2012-05-18* From f738350528528add3b79d620f58925bf37230ae6 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 18 Oct 2012 09:33:59 +0700 Subject: [PATCH 214/519] Add news entry about improved editor support. --- .../source/news/2012/10/18/dylan-vim.png | Bin 0 -> 108486 bytes .../source/news/2012/10/18/editor-support.rst | 56 ++++++++++++++++++ .../source/news/2012/10/18/sublime-text.png | Bin 0 -> 158038 bytes documentation/website/source/news/index.rst | 21 +++++++ .../website/source/news/recent.rst.inc | 30 +++------- 5 files changed, 85 insertions(+), 22 deletions(-) create mode 100644 documentation/website/source/news/2012/10/18/dylan-vim.png create mode 100644 documentation/website/source/news/2012/10/18/editor-support.rst create mode 100644 documentation/website/source/news/2012/10/18/sublime-text.png diff --git a/documentation/website/source/news/2012/10/18/dylan-vim.png b/documentation/website/source/news/2012/10/18/dylan-vim.png new file mode 100644 index 0000000000000000000000000000000000000000..212acee1b512e934a761b56cc78ee2244f22db27 GIT binary patch literal 108486 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 + +Vim +--- + +.. figure:: dylan-vim.png + :align: right + + Syntax highlighting in vim + +As for vim, I have: + +* Improved comment handling such that all comments should + be highlighted correctly now. +* Improved operator highlighting. +* Enabled spell checking for strings, comments and headers. + To see this, you can toggle ``:set spell`` in vim. +* Enabled highlighting for the built-in functions as defined + in the DRM. + +The files for vim can be found in https://github.com/dylan-lang/dylan-vim. + +Patches and further improvements are welcome! + diff --git a/documentation/website/source/news/2012/10/18/sublime-text.png b/documentation/website/source/news/2012/10/18/sublime-text.png new file mode 100644 index 0000000000000000000000000000000000000000..3c29a683bd7a595e2cbbdde540bbfedf544e6688 GIT binary patch literal 158038 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 + + +**New release: 2011.1** +*2011-12-10* + +We just released Open Dylan 2011.1. This release is our first +since moving to GitHub and relicensing under a more liberal +license. It brings many bugfixes, inmproved platform support +and new features. + +:doc:`Read more... ` + **New Documentation** *2011-11-22* diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index bc97b77f1f..f42518384e 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,3 +1,11 @@ +**Improved editor support** +*2012-10-18* + +Bugs in the syntax highlighting support for Textmate +and Sublime Text as well as for vim have been fixed. + +:doc:`Read more... ` + **command-line-parser library** *2012-10-15* @@ -26,25 +34,3 @@ further performance improvements. :doc:`Read more... ` - -**Dswank - emacs and DIME** -*2011-12-12* - -We developed DIME, the Dylan interaction mode for emacs, based -on SLIME. Now, you can browse the class hierarchy, get -argument lists, locate definitions, compile, view warnings and -more, all from within emacs! - -:doc:`Read more... ` - - -**New release: 2011.1** -*2011-12-10* - -We just released Open Dylan 2011.1. This release is our first -since moving to GitHub and relicensing under a more liberal -license. It brings many bugfixes, inmproved platform support -and new features. - -:doc:`Read more... ` - From a5bf11ad629cb1043985de6d6208c0edf8322d83 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 19 Oct 2012 13:15:19 +0200 Subject: [PATCH 215/519] reformulate using collective we instead of I --- .../website/source/news/2012/10/18/editor-support.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/news/2012/10/18/editor-support.rst b/documentation/website/source/news/2012/10/18/editor-support.rst index 31132032d9..e056a866e9 100644 --- a/documentation/website/source/news/2012/10/18/editor-support.rst +++ b/documentation/website/source/news/2012/10/18/editor-support.rst @@ -4,7 +4,7 @@ Improving Editor Support ======================== -I have recently fixed some bugs in the syntax highlighting +We have recently fixed some bugs in the syntax highlighting support for Textmate and Sublime Text as well as for vim. Sublime Text and Textmate @@ -24,7 +24,7 @@ be found on GitHub at https://github.com/dylan-lang/dylan.tmbundle. correctly now. * Keyword / header highlighting at the start of a file is improved. -Also, I've submitted a request for this plugin to be made +Also, we've submitted a request for this plugin to be made available via Package Control for Sublime Text and hope that this is ready in the near future. @@ -40,7 +40,7 @@ Vim Syntax highlighting in vim -As for vim, I have: +We extended the Dylan support of vim: * Improved comment handling such that all comments should be highlighted correctly now. From 6f45cb1ba17f273de4e772dda2fd8e3b84a0f83b Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 20 Dec 2012 13:27:15 +0700 Subject: [PATCH 216/519] 2012.1 release. --- .../website/source/download/index.rst | 61 +++++++++---------- .../source/news/2012/12/20/new-release.rst | 47 ++++++++++++++ documentation/website/source/news/index.rst | 9 +++ .../website/source/news/recent.rst.inc | 19 +++--- 4 files changed, 93 insertions(+), 43 deletions(-) create mode 100644 documentation/website/source/news/2012/12/20/new-release.rst diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index 1400a20413..4644f6d3a9 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -8,34 +8,30 @@ Open Dylan Downloads

          Binary Releases

          -.. warning:: The 32 bit version of Open Dylan does NOT work on 64 bit Windows. - There is no workaround at this time, unfortunately. We hope to resolve this - in an upcoming release. +.. warning:: The 32 bit version of Open Dylan does NOT work on 64 bit Windows + prior to Windows 8. There is no workaround at this time, unfortunately. We + hope to resolve this in an upcoming release. :class: alert alert-warning .. table:: :class: table-striped - +-----------------------+--------------------+--------------------+---------------+ - | Platform | Version | Date Released | Revision ID | - +=======================+====================+====================+===============+ - | `Windows (32 bit)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | - +-----------------------+--------------------+--------------------+---------------+ - | `Mac OS X (Intel)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | - +-----------------------+--------------------+--------------------+---------------+ - | `Mac OS X (PowerPC)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | - +-----------------------+--------------------+--------------------+---------------+ - | `Linux (x86)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | - +-----------------------+--------------------+--------------------+---------------+ - | `Linux (x86-64)`_ | 2011.1 | December 11, 2011 | `23f8ab5878`_ | - +-----------------------+--------------------+--------------------+---------------+ - | `FreeBSD (x86)`_ | 2011.1 | December 10, 2011 | `23f8ab5878`_ | - +-----------------------+--------------------+--------------------+---------------+ - | `FreeBSD (x86-64)`_ | 1.0beta5 | November 27, 2008 | ... | - +-----------------------+--------------------+--------------------+---------------+ + +---------------------------+--------------------+--------------------+---------------+ + | Platform | Version | Date Released | Revision ID | + +===========================+====================+====================+===============+ + | `Windows (32 bit)`_ | 2011.1 | December 10, 2011 | `0ff69dce5d`_ | + +---------------------------+--------------------+--------------------+---------------+ + | `Mac OS X Lion+ (Intel)`_ | 2012.1 | December 20, 2012 | `0ff69dce5d`_ | + +---------------------------+--------------------+--------------------+---------------+ + | `Linux (x86)`_ | 2012.1 | December 20, 2012 | `0ff69dce5d`_ | + +---------------------------+--------------------+--------------------+---------------+ + | `Linux (x86-64)`_ | 2012.1 | December 20, 2012 | `0ff69dce5d`_ | + +---------------------------+--------------------+--------------------+---------------+ + | `FreeBSD (x86)`_ | 2012.1 | December 20, 2012 | `0ff69dce5d`_ | + +---------------------------+--------------------+--------------------+---------------+ - -Old builds can be found by browsing the `download directories`_. +Old builds (including PowerPC Mac OS X and 64 bit FreeBSD) can be found by +browsing the `download directories`_. .. raw:: html @@ -55,23 +51,24 @@ Installation on Windows For installation, double-click on the installer, and follow instructions. You need to have either the PellesC linker or the linker of VC++ 6.0, 7.0 -or the current .NET platform SDK installed. +or the current .NET platform SDK installed. PellesC is the best option. Installation on Mac OS X, FreeBSD, Linux ---------------------------------------- The README file inside the tarball describes installation and basic usage. The easiest way is extracting the tarball in /opt. The -Linux platform should have binutils installed, in order to allow +Linux platform should have gcc installed, in order to allow linking. Note that these versions only have a command-line compiler and no IDE. -.. _Windows (32 bit): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-win32.exe -.. _Mac OS X (Intel): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-darwin.tar.bz2 -.. _Mac OS X (PowerPC): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-ppc-darwin.tar.bz2 -.. _Linux (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-linux.tar.bz2 -.. _Linux (x86-64): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86_64-linux.tar.bz2 -.. _FreeBSD (x86): http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-FreeBSD.tar.bz2 -.. _FreeBSD (x86-64): http://opendylan.org/downloads/opendylan/old/1.0beta5/opendylan-1.0beta5-r11990-amd64-FreeBSD7.tar.bz2 +64 bit Linux requires that the Boehm GC is installed +(For example, ``apt-get install libgc`` on Ubuntu). + +.. _Windows (32 bit): http://opendylan.org/downloads/opendylan/2012.1/opendylan-2012.1-win32.exe +.. _Mac OS X Lion+ (Intel): http://opendylan.org/downloads/opendylan/2012.1/opendylan-2012.1-x86-darwin.tar.bz2 +.. _Linux (x86): http://opendylan.org/downloads/opendylan/2012.1/opendylan-2012.1-x86-linux.tar.bz2 +.. _Linux (x86-64): http://opendylan.org/downloads/opendylan/2012.1/opendylan-2012.1-x86_64-linux.tar.bz2 +.. _FreeBSD (x86): http://opendylan.org/downloads/opendylan/2012.1/opendylan-2012.1-x86-freebsd.tar.bz2 .. _download directories: http://opendylan.org/downloads/opendylan/ -.. _23f8ab5878: https://github.com/dylan-lang/opendylan/tree/v2011.1 +.. _0ff69dce5d: https://github.com/dylan-lang/opendylan/tree/v2012.1 diff --git a/documentation/website/source/news/2012/12/20/new-release.rst b/documentation/website/source/news/2012/12/20/new-release.rst new file mode 100644 index 0000000000..bd75993d18 --- /dev/null +++ b/documentation/website/source/news/2012/12/20/new-release.rst @@ -0,0 +1,47 @@ +:Author: Bruce Mitchener, Jr. +:Date: 2012-12-20 00:00:00 + +Open Dylan 2012.1 released +========================== + +Dear Dylan Hacker, + +It is a pleasure for us to finally announce a release of Open Dylan. + +The last release with an announcement was 2011.1, in December, 2011. +For a variety of reasons, we didn't get to carry out our plan for +more frequent releases in 2012, but hope to have more frequent releases +in 2013. + +While we have extensive `release notes `_, +there are some important changes that we feel are worth calling out +separately: + +* We now use the C3 superclass linearization. See `DEP-0003 `_ + for more details. +* Multithreading now works in the C backend. +* Binaries and libraries built by ``dylan-compiler`` no longer have + their directory location hard-coded within the executables. +* ``dylan-compiler`` places output into a local ``_build`` directory + and can read from a local registry rather than relying on global + directories. +* Many bugs have been fixed, especially involving the usage of floats. +* Linux and FreeBSD 32 bit builds have been updated to a new version + of the Memory Pool System GC which is much faster and stable. +* A new ``strings`` library has been provided which replaces the old + ``strings`` and ``string-extensions`` libraries with a more consistent + and straightforward API. ``string-extensions`` has been removed. +* The ``command-line-parser`` library has been cleaned up and integrated + with the OpenDylan distribution. +* We no longer provide PowerPC builds of OpenDylan on Mac OS X. Also, + our Intel builds are for Mac OS X Lion and later. If you desire Snow + Leopard support, please get in touch with us. + +Please report problems that you have in our `issue tracker `_. + +You can get it from our website, `http://opendylan.org/download/ `_. +On Windows there is an installer, on UNIX systems unpack into ``/opt``. +On 64 bit Linux, you will need to have the Boehm GC installed for our +executables to run. (Ubuntu: ``apt-get install libgc``) + +Good luck and happy Dylan hacking! \ No newline at end of file diff --git a/documentation/website/source/news/index.rst b/documentation/website/source/news/index.rst index ad0cc21f7a..56ad3ac760 100644 --- a/documentation/website/source/news/index.rst +++ b/documentation/website/source/news/index.rst @@ -11,6 +11,15 @@ News & Articles .. include:: recent.rst.inc +**C3 superclass linearization** +*2012-01-25* + +We implemented the C3 superclass linearization algorithm and +enabled it by default. This is more intuitive and will allow for +further performance improvements. + +:doc:`Read more... ` + **Dswank - emacs and DIME** *2011-12-12* diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index f42518384e..f9082fe113 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,3 +1,11 @@ +**New release: 2012.1** +*2012-12-20* + +We just released Open Dylan 2012.1. This release brings many +bugfixes, inmproved platform support and new features. + +:doc:`Read more... ` + **Improved editor support** *2012-10-18* @@ -23,14 +31,3 @@ A new library of basic string operations is now available as a standard library. :doc:`Read more... ` - - -**C3 superclass linearization** -*2012-01-25* - -We implemented the C3 superclass linearization algorithm and -enabled it by default. This is more intuitive and will allow for -further performance improvements. - -:doc:`Read more... ` - From 570e43f8141c2245387a18b761985797b22f4791 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 20 Dec 2012 23:10:21 +0700 Subject: [PATCH 217/519] Fix typo. --- documentation/website/source/documentation/publications.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/documentation/publications.rst b/documentation/website/source/documentation/publications.rst index 7afd332981..b5415f88f7 100644 --- a/documentation/website/source/documentation/publications.rst +++ b/documentation/website/source/documentation/publications.rst @@ -120,7 +120,7 @@ Toby Weinberg - Communications of the ACM May 1998 to simplifying this programming problem. This article describes how three programming language implementations provide access to Microsoft's Component Object Model (COM), and how they attempt to reduce the - complexity of writing nad using COM objects. + complexity of writing and using COM objects. http://dl.acm.org/citation.cfm?id=274957 From 30ec4a6120ed84e23976ef8ce4d918a3e651c473 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 21 Dec 2012 00:29:41 +0700 Subject: [PATCH 218/519] Correct download text for Windows. --- documentation/website/source/download/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index 4644f6d3a9..cb97531ae8 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -19,7 +19,7 @@ Open Dylan Downloads +---------------------------+--------------------+--------------------+---------------+ | Platform | Version | Date Released | Revision ID | +===========================+====================+====================+===============+ - | `Windows (32 bit)`_ | 2011.1 | December 10, 2011 | `0ff69dce5d`_ | + | `Windows (32 bit)`_ | 2012.1 | December 20, 2012 | `0ff69dce5d`_ | +---------------------------+--------------------+--------------------+---------------+ | `Mac OS X Lion+ (Intel)`_ | 2012.1 | December 20, 2012 | `0ff69dce5d`_ | +---------------------------+--------------------+--------------------+---------------+ From e2cd6091f8392b060279f50c5bfccb16946f0ff9 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 3 Jan 2013 14:05:55 +0700 Subject: [PATCH 219/519] Bump copyright date. --- documentation/website/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/conf.py b/documentation/website/source/conf.py index 8c7d5f62af..b5cc62ba17 100644 --- a/documentation/website/source/conf.py +++ b/documentation/website/source/conf.py @@ -42,7 +42,7 @@ # General information about the project. project = u'Open Dylan' -copyright = u'2011, Dylan Hackers' +copyright = u'2011-2013, Dylan Hackers' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the From c9c81e7c4492f9eb94b10cd96004cf19ade12fc5 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 3 Jan 2013 17:14:18 +0700 Subject: [PATCH 220/519] Add a simple iteration cheatsheet. Cheatsheets are also moved to a more visible / prominent location. --- .../documentation/cheatsheets/iteration.rst | 160 ++++++++++++++++++ .../website/source/documentation/index.rst | 25 ++- documentation/website/source/index.rst | 1 + 3 files changed, 173 insertions(+), 13 deletions(-) create mode 100644 documentation/website/source/documentation/cheatsheets/iteration.rst diff --git a/documentation/website/source/documentation/cheatsheets/iteration.rst b/documentation/website/source/documentation/cheatsheets/iteration.rst new file mode 100644 index 0000000000..c22af1f128 --- /dev/null +++ b/documentation/website/source/documentation/cheatsheets/iteration.rst @@ -0,0 +1,160 @@ +****************** +Iteration in Dylan +****************** + +.. contents:: + :local: + :backlinks: none + +Simple iteration with ``while`` and ``until`` +============================================= + +.. raw:: html + +
          +
          + +.. code-block:: dylan + + while (condition?) + // do something until condition? is false + end; + +.. raw:: html + +
          +
          + +.. code-block:: dylan + + until (~condition?) + // do something until condition? is true + end; + +.. raw:: html + +
          +
          + +Read more in the DRM: :drm:`while` and :drm:`until`. + +The ``for`` loop +================ + +The :drm:`for` loop can be used in many different ways, but we'll +demonstrate a couple possibilities here: + +Iterating over a collection +--------------------------- + +.. code-block:: dylan + + for (element in collection) + // do something with element + end; + +Iterating over a range +---------------------- + +.. code-block:: dylan + + for (count from 0 below num) + // do work + end; + + for (column from 1 to 3) + // do work + end; + + // Changing the stepping and going in reverse + for (index :: from stop - 1 to start by -1) + end; + +Read more in the DRM: :drm:`for`. + +Breaking out of a loop +====================== + +Breaking out of a loop is just like any other non-local exit in Dylan. +Combine any loop with a :drm:`block` expression: + +.. code-block:: dylan + + block (break) + while (condition?) + if (want-out?) + break(); + end; + end; + end; + +A value can be passed to the exit function (``break`` in this case) +and that will be the value of the ``block`` expression. This shouldn't +be confused with :drm:`break`. + +Collection Functions +==================== + +When working with a collection, some additional operations are available +that remove the need for explicit iteration over the collection. + +In all of these, the function passed in can be any of: + +* An existing function. +* An escaped operator name (``\+`` for example). +* A locally defined method. +* The result of a method that returns a function such as :drm:`curry` + :drm:`rcurry` or other `functional operations `_. + +``do`` +------ + +:drm:`do` iterates over one or more collections, performing side effects: + +.. code-block:: dylan + + do(method (x) format-out("%s\n", x) end, #[1, 2, 3]) + +``map``, ``map-as``, ``map-into`` +--------------------------------- + +:drm:`map` iterates over one or more collections, applying a function and +returns the results in a new collection. :drm:`map-as` and :drm:`map-into` +allow control over the way that the results are returned. + +.. code-block:: dylan + + let type-bindings = map(generate-type-binding, all-var-specs); + +.. code-block:: dylan + + let strings = map(curry(as, ), names); + +.. code-block:: dylan + + let c-direct-superclasses = map-as(, convert, direct-superclasses(c)); + +Read more in the DRM: :drm:`map`, :drm:`map-as`, :drm:`map-into`. + +``reduce``, ``reduce1`` +----------------------- + +:drm:`reduce` combines the elements of a collection and a seed value into +a single value by repeatedly applying a binary function. + +:drm:`reduce1` is similar to :drm:`reduce`, except that the first value of +the collection is used as the seed value. + +.. code-block:: dylan + + reduce(\*, 1, dimensions(x)) + +.. code-block:: dylan + + reduce1(\+, #(1, 2, 3, 4, 5)) + +``reduce`` is often combined with ``map`` operations: + +.. code-block:: dylan + + reduce(\+, 0, map(size, qqs)) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index 3678d06b7f..9ba046306f 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -54,19 +54,6 @@ Documentation the portable window programming toolkit. This is only useful if you are using Open Dylan on Windows. -.. raw:: html - -
          -

          Cheat Sheets

          - -
          -

          Quick one-page sheets for common tasks.

          -
          - -`Dylan Cheat Sheet `_ - - A cheat sheet to get you started with the basics of Dylan syntax. - .. raw:: html
          @@ -101,6 +88,18 @@ Documentation
          +

          Cheat Sheets

          + +
          +

          Quick one-page sheets for common tasks.

          +
          + +* `Basics of Dylan Syntax `_ +* `Iteration `_ + +.. raw:: html + +

          References

          diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index aeefdf6e72..d81f93a415 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -64,6 +64,7 @@ excellent :drm:`Introduction to the Dylan Reference Manual `. */* articles/*/* + documentation/cheatsheets/* news/*/*/*/* community/gsoc/* From 3cd9c0666b7a97e0c7d06e9789661adf1dfb23e4 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 3 Jan 2013 17:38:15 +0700 Subject: [PATCH 221/519] Improve wording. --- .../website/source/documentation/cheatsheets/iteration.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/documentation/cheatsheets/iteration.rst b/documentation/website/source/documentation/cheatsheets/iteration.rst index c22af1f128..c54c12fcaa 100644 --- a/documentation/website/source/documentation/cheatsheets/iteration.rst +++ b/documentation/website/source/documentation/cheatsheets/iteration.rst @@ -17,7 +17,7 @@ Simple iteration with ``while`` and ``until`` .. code-block:: dylan while (condition?) - // do something until condition? is false + // do something while the test condition? is true end; .. raw:: html @@ -27,8 +27,8 @@ Simple iteration with ``while`` and ``until`` .. code-block:: dylan - until (~condition?) - // do something until condition? is true + until (condition?) + // do something until the test condition? is true end; .. raw:: html From 1f1f0e02ffcd8f8f0344a75facd9a77fd04c7113 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 3 Jan 2013 17:47:12 +0700 Subject: [PATCH 222/519] Further improvements (feedback from cpage). --- .../website/source/documentation/cheatsheets/iteration.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/documentation/cheatsheets/iteration.rst b/documentation/website/source/documentation/cheatsheets/iteration.rst index c54c12fcaa..088d9353fa 100644 --- a/documentation/website/source/documentation/cheatsheets/iteration.rst +++ b/documentation/website/source/documentation/cheatsheets/iteration.rst @@ -60,14 +60,19 @@ Iterating over a range for (count from 0 below num) // do work + // count ranges from 0 to the integer below num end; for (column from 1 to 3) // do work + // count ranges from 1 to 3, inclusive. end; // Changing the stepping and going in reverse - for (index :: from stop - 1 to start by -1) + for (index from stop - 1 to start by -1) + // index will start at 'stop - 1' and end at the + // value of 'start', decrementing by 1 with each + // iteration of the loop. end; Read more in the DRM: :drm:`for`. From 3ba6c3f8bc2d86ed98b5377cc1b056f0f27552dd Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 3 Jan 2013 21:24:22 +0700 Subject: [PATCH 223/519] Add first draft of conditionals cheatsheet. --- .../cheatsheets/conditionals.rst | 86 +++++++++++++++++++ .../website/source/documentation/index.rst | 1 + 2 files changed, 87 insertions(+) create mode 100644 documentation/website/source/documentation/cheatsheets/conditionals.rst diff --git a/documentation/website/source/documentation/cheatsheets/conditionals.rst b/documentation/website/source/documentation/cheatsheets/conditionals.rst new file mode 100644 index 0000000000..7c3ab18bcb --- /dev/null +++ b/documentation/website/source/documentation/cheatsheets/conditionals.rst @@ -0,0 +1,86 @@ +********************* +Conditionals in Dylan +********************* + +``if`` +====== + +:drm:`if` is pretty straightforward: + +.. code-block:: dylan + + if (test-expression) + // if test-expression is true + elseif (other-test) + // otherwise, if other-test is true + else + // If no tests above were true + end; + +``unless`` +========== + +:drm:`unless` executes a body of code when the test expression +is false: + +.. code-block:: dylan + + unless (test-expression) + // do work, if test-expression is false + end; + +``case`` +======== + +:drm:`case` tests a series of conditions and executes the body +of code corresponding to the first condition that is true. + +.. code-block:: dylan + + case + player1.money <= 0 + => end-game(player1); + player2.money <= 0 + => end-game(player2); + otherwise + => move(player1); + move(player2); + end case; + +``select`` +========== + +:drm:`select` takes a target object and compares it against +a series of matches and executes the body of code corresponding +to the first match found. + +.. code-block:: dylan + + select (as-uppercase(char)) + 'D' => collect(number-to-string(argument(char, ))); + 'B' => collect(integer-to-string(argument(char, ), base: 2)); + 'O' => collect(integer-to-string(argument(char, ), base: 8)); + 'X' => collect(integer-to-string(argument(char, ), base: 16)); + 'C' => collect-character(argument(char, )); + 'S' => print-pretty-name(buffer, argument(char, )); + '=' => print-unique-name(buffer, argument(char, )); + '%' => collect-character('%'); + otherwise => + error("Invalid format directive '%s' in \"%s\"", + char, format-string); + end; + +``when`` +======== + +This is just a short hand for ``if`` when there's no ``elseif`` or +``else`` branches. + +.. code-block:: dylan + + when (test-expression) + // if test-expression is true + end; + +``when`` isn't defined in the DRM. To use it, you must ``use`` the +``dylan-extensions`` module from the ``dylan`` library. diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index 9ba046306f..b5f1dd8217 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -96,6 +96,7 @@ Documentation * `Basics of Dylan Syntax `_ * `Iteration `_ +* `Conditionals `_ .. raw:: html From f8a880ab1d25fdf12877d5e4331a8b20499b0529 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 3 Jan 2013 23:42:11 +0700 Subject: [PATCH 224/519] Move publications section to left column. --- .../website/source/documentation/index.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index b5f1dd8217..f92959ad6b 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -83,6 +83,13 @@ Documentation An exciting look at using DIME and emacs for Dylan development. +.. raw:: html + +
          +

          Publications

          + +`See our publications page `_. + .. raw:: html @@ -165,13 +172,6 @@ Documentation implementation and related libraries. -.. raw:: html - -
          -

          Publications

          - -`See our publications page `_. - .. raw:: html
          From 602399815e2d293920285b6f22a22029d21aebf3 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 4 Jan 2013 11:50:24 +0700 Subject: [PATCH 225/519] Update Windows download warning. Note that it is the IDE that doesn't work and that the command line tools should work. --- documentation/website/source/download/index.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/download/index.rst b/documentation/website/source/download/index.rst index cb97531ae8..877ee156f1 100644 --- a/documentation/website/source/download/index.rst +++ b/documentation/website/source/download/index.rst @@ -8,11 +8,15 @@ Open Dylan Downloads

          Binary Releases

          -.. warning:: The 32 bit version of Open Dylan does NOT work on 64 bit Windows +.. warning:: The 32 bit version of Open Dylan IDE does NOT work on 64 bit Windows prior to Windows 8. There is no workaround at this time, unfortunately. We hope to resolve this in an upcoming release. :class: alert alert-warning + However, the command line tools should work as the problem is with interaction + between threads, GC and WoW64. + + .. table:: :class: table-striped From 0714fd9464ac91df1668c08c0386899fa2f5bc76 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 9 Jan 2013 11:30:55 +0700 Subject: [PATCH 226/519] Add first draft of a collection cheatsheet. --- .../documentation/cheatsheets/collections.rst | 159 ++++++++++++++++++ .../website/source/documentation/index.rst | 9 +- 2 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 documentation/website/source/documentation/cheatsheets/collections.rst diff --git a/documentation/website/source/documentation/cheatsheets/collections.rst b/documentation/website/source/documentation/cheatsheets/collections.rst new file mode 100644 index 0000000000..f2fe2af56a --- /dev/null +++ b/documentation/website/source/documentation/cheatsheets/collections.rst @@ -0,0 +1,159 @@ +******************** +Collections in Dylan +******************** + +Common Collection Types +======================= + ++--------------------------+------------------------------------+----------------------------------------+ +| Class | Location | Description | ++==========================+====================================+========================================+ +| :drm:`` | ``dylan:dylan`` | Multi-dimensional data, much like a | +| | | matrix. | ++--------------------------+------------------------------------+----------------------------------------+ +| :drm:`` | ``dylan:dylan`` | A one-dimensional array. Vectors | +| | | provide fast random access. | ++--------------------------+------------------------------------+----------------------------------------+ +| :drm:`` | ``dylan:dylan`` | A vector that can have elements | +| | | directly added and removed without | +| | | requiring a complete copy. | ++--------------------------+------------------------------------+----------------------------------------+ +| :drm:`` | ``dylan:dylan`` | A linked list. | ++--------------------------+------------------------------------+----------------------------------------+ +| :drm:`` | ``dylan:dylan`` | A double-ended queue. | ++--------------------------+------------------------------------+----------------------------------------+ +| `\`_ | ``collections:set`` | A set is for efficiently tracking | +| | | membership. | ++--------------------------+------------------------------------+----------------------------------------+ +| `\`_ | ``collections:bit-set`` | A set with bits for members. | ++--------------------------+------------------------------------+----------------------------------------+ +| `\`_ | ``collections:bit-vector`` | A vector optimized for storing bit | +| | | values. | ++--------------------------+------------------------------------+----------------------------------------+ +| `\`_ | ``collections:byte-vector`` | A vector of bytes. | ++--------------------------+------------------------------------+----------------------------------------+ +| :drm:`

          ` | ``dylan:dylan`` | A mapping between keys and values. | ++--------------------------+------------------------------------+----------------------------------------+ +| `\`_ | ``collections:table-extensions`` | A ``
          `` with strings for keys. | ++--------------------------+------------------------------------+----------------------------------------+ + +.. note:: + + Because of the default comparison function for ``
          ``, it is + important to use ```` when the keys will be strings. + +Mutable vs. Immutable +===================== + +Many operations due to modify the collection passed in. The exception +is when you use an operation ending in ``!`` on a *stretchy* collection. + +For this reason, if you want to modify a collection frequently, be sure +to pay attention to the type of collection that you're working with. + +In many cases, you will need to assign the result of an operation +back to the source collection: + +.. code-block:: dylan + + threads := add(threads, thread); + +Common Operations +================= + ++---------------------+------------------------------+------------------------------------------------------+ +| Class | Operation | Summary | ++=====================+==============================+======================================================+ +| :drm:`` | :drm:`any?` | Returns the first true value obtained by iterating | +| | | over one or more collections. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`do` | Iterates over one or more collections for side | +| | | effect. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`empty?` | Returns true if its argument is empty. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`every?` | Returns true if a predicate returns true when | +| | | applied to all corresponding elements of a set of | +| | | collections. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`fill!` | Fills a collection with a specified value. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`find-key` | Returns the key in a collection such that the | +| | | corresponding collection element satisfies a | +| | | predicate. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`map` | Iterates over one or more collections and collects | +| | | the results in a freshly allocated collection. | +| | | See also :drm:`map-as` and :drm:`map-into`. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`member?` | Returns true if a collection contains a particular | +| | | value. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`reduce` | Combines the elements of a collection and a seed | +| | | value into a single value by repeatedly applying a | +| | | binary function. See also :drm:`reduce1`. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`replace-elements!` | Replaces those collection elements that satisfy a | +| | | predicate. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`size` | Returns the size of its argument. | ++---------------------+------------------------------+------------------------------------------------------+ +| :drm:`` | :drm:`add` / :drm:`add!` | Adds an element to a sequence. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`add-new` / | Adds a new element to a sequence. | +| | :drm:`add-new!` | | +| +------------------------------+------------------------------------------------------+ +| | :drm:`choose` | Returns those elements of a sequence that satisfy a | +| | | predicate. See also :drm:`choose-by`. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`concatenate` | Returns the concatenation of one or more sequences | +| | | in a sequence of a type determined by the | +| | | :drm:`type-for-copy` of its first argument. | +| | | See also :drm:`concatenate-as`. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`copy-sequence` | Returns a freshly allocated copy of some subsequence | +| | | of a sequence. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`intersection` | Returns the intersection of two sequences. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`remove` / | Removes an element from a sequence. | +| | :drm:`remove!` | | +| +------------------------------+------------------------------------------------------+ +| | :drm:`remove-duplicates` | Returns a sequence without duplicates. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`replace-subsequence!` | Replaces a portion of a sequence with the elements | +| | | of another sequence. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`reverse` / | Returns a sequence with elements in the reverse | +| | :drm:`reverse!` | order of its argument sequence. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`sort` / :drm:`sort!` | Returns a sequence containing the elements of its | +| | | argument sequence, sorted. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`subsequence-position` | Returns the position where a pattern appears in a | +| | | sequence. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`union` | Returns the union of two sequences. | ++---------------------+------------------------------+------------------------------------------------------+ +| :drm:`` | :drm:`head` | Returns the head of a list. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`tail` | Returns the tail of a list. | ++---------------------+------------------------------+------------------------------------------------------+ +| :drm:`` | :drm:`push` | Adds an element to the front of a deque. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`pop` | Removes and returns the first element of a deque. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`push-last` | Adds an element to the end of a deque. | +| +------------------------------+------------------------------------------------------+ +| | :drm:`pop-last` | Removes and returns an element from the end of a | +| | | deque. | ++---------------------+------------------------------+------------------------------------------------------+ +| :drm:`
          ` | :drm:`remove-key!` | Modifies an explicit key collection so it no longer | +| | | has a particular key. | ++---------------------+------------------------------+------------------------------------------------------+ + +.. _: http://opendylan.org/documentation/library-reference/collections/set.html +.. _: http://opendylan.org/documentation/library-reference/collections/bit-set.html +.. _: http://opendylan.org/documentation/library-reference/collections/bit-vector.html +.. _: http://opendylan.org/documentation/library-reference/collections/byte-vector.html +.. _: http://opendylan.org/documentation/library-reference/collections/table-extensions.html#collections:table-extensions:[string-table] diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index f92959ad6b..f7ec3b8d02 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -101,9 +101,12 @@ Documentation

          Quick one-page sheets for common tasks.

          -* `Basics of Dylan Syntax `_ -* `Iteration `_ -* `Conditionals `_ +.. hlist:: + + * `Basics of Dylan Syntax `_ + * `Iteration `_ + * `Conditionals `_ + * `Collections `_ .. raw:: html From 088a287133ecdb4e1509d8eb28831cbf45e2c885 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 9 Jan 2013 11:41:10 +0700 Subject: [PATCH 227/519] Improve wording. --- .../source/documentation/cheatsheets/collections.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/documentation/cheatsheets/collections.rst b/documentation/website/source/documentation/cheatsheets/collections.rst index f2fe2af56a..80d1a05f72 100644 --- a/documentation/website/source/documentation/cheatsheets/collections.rst +++ b/documentation/website/source/documentation/cheatsheets/collections.rst @@ -45,7 +45,7 @@ Common Collection Types Mutable vs. Immutable ===================== -Many operations due to modify the collection passed in. The exception +Many operations don't modify the collection passed in. The exception is when you use an operation ending in ``!`` on a *stretchy* collection. For this reason, if you want to modify a collection frequently, be sure @@ -58,6 +58,10 @@ back to the source collection: threads := add(threads, thread); +In cases where you are modifying a collection frequently, you may want +to consider using a :drm:`` rather than a `` +or some other type of collection. + Common Operations ================= From 37cff35430cce1610d9fba9e97696a7bf4c30833 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 18 Jan 2013 16:48:14 +0700 Subject: [PATCH 228/519] Update to CDN-hosted Bootstrap 2.2.2. This also changes the look of the site (for the better, I think). --- documentation/website/README.rst | 7 +- .../source/_themes/opendylan/layout.html | 8 +- .../2.0.2/css/bootstrap-responsive.css | 686 --- .../2.0.2/css/bootstrap-responsive.min.css | 12 - .../static/bootstrap/2.0.2/css/bootstrap.css | 3990 ----------------- .../bootstrap/2.0.2/css/bootstrap.min.css | 689 --- .../2.0.2/img/glyphicons-halflings-white.png | Bin 4352 -> 0 bytes .../2.0.2/img/glyphicons-halflings.png | Bin 4352 -> 0 bytes .../static/bootstrap/2.0.2/js/bootstrap.js | 1726 ------- .../bootstrap/2.0.2/js/bootstrap.min.js | 6 - 10 files changed, 10 insertions(+), 7114 deletions(-) delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.css delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.min.css delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.css delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.min.css delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/img/glyphicons-halflings-white.png delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/img/glyphicons-halflings.png delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.js delete mode 100644 documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.min.js diff --git a/documentation/website/README.rst b/documentation/website/README.rst index 097eb2e0de..ca4fd56564 100644 --- a/documentation/website/README.rst +++ b/documentation/website/README.rst @@ -34,7 +34,12 @@ that you run it with an argument:: make.bat html -The generated site will be in ``build/html``. +The generated site will be in ``build/html``. For the stylesheets and +JavaScript to load correctly, we suggest running a local webserver +pointing to this directory:: + + cd build/html + python -m SimpleHTTPServer Link Validation --------------- diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index 596e72ef4e..23dda0c750 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -9,10 +9,7 @@ {% block doctype %} {% endblock %} -{% set css_files = css_files + ['_static/bootstrap/2.0.2/css/bootstrap.min.css', - '_static/bootstrap/2.0.2/css/bootstrap-responsive.min.css', - '_static/opendylan.org/css/opendylan.css'] -%} -{% set script_files = script_files + ['_static/bootstrap/2.0.2/js/bootstrap.min.js'] -%} +{% set css_files = css_files + ['_static/opendylan.org/css/opendylan.css'] -%} {% set navigation_bar = [ ('index', 'Home'), ('about/index', 'About'), @@ -24,6 +21,9 @@ {% set active_page = pagename|default('index') -%} {% block extrahead %} + + + diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.css deleted file mode 100644 index 0bc6de916b..0000000000 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.css +++ /dev/null @@ -1,686 +0,0 @@ -/*! - * 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; - } -} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.min.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.min.css deleted file mode 100644 index 60a47c9494..0000000000 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap-responsive.min.css +++ /dev/null @@ -1,12 +0,0 @@ -.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;-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;-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;}} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.css deleted file mode 100644 index 495188af7f..0000000000 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.css +++ /dev/null @@ -1,3990 +0,0 @@ -/*! - * Bootstrap 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. - */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} -audio:not([controls]) { - display: none; -} -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -a:hover, -a:active { - outline: 0; -} -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} -img { - height: auto; - border: 0; - -ms-interpolation-mode: bicubic; - vertical-align: middle; -} -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, -input { - *overflow: visible; - line-height: normal; -} -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} -input[type="search"] { - -webkit-appearance: textfield; - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} -textarea { - overflow: auto; - vertical-align: top; -} -.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; -} -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #333333; - background-color: #ffffff; -} -a { - color: #0088cc; - text-decoration: none; -} -a:hover { - color: #005580; - text-decoration: underline; -} -.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: 940px; -} -.span12 { - width: 940px; -} -.span11 { - width: 860px; -} -.span10 { - width: 780px; -} -.span9 { - width: 700px; -} -.span8 { - width: 620px; -} -.span7 { - width: 540px; -} -.span6 { - width: 460px; -} -.span5 { - width: 380px; -} -.span4 { - width: 300px; -} -.span3 { - width: 220px; -} -.span2 { - width: 140px; -} -.span1 { - width: 60px; -} -.offset12 { - margin-left: 980px; -} -.offset11 { - margin-left: 900px; -} -.offset10 { - margin-left: 820px; -} -.offset9 { - margin-left: 740px; -} -.offset8 { - margin-left: 660px; -} -.offset7 { - margin-left: 580px; -} -.offset6 { - margin-left: 500px; -} -.offset5 { - margin-left: 420px; -} -.offset4 { - margin-left: 340px; -} -.offset3 { - margin-left: 260px; -} -.offset2 { - margin-left: 180px; -} -.offset1 { - margin-left: 100px; -} -.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.127659574%; -} -.row-fluid > [class*="span"]:first-child { - margin-left: 0; -} -.row-fluid > .span12 { - width: 99.99999998999999%; -} -.row-fluid > .span11 { - width: 91.489361693%; -} -.row-fluid > .span10 { - width: 82.97872339599999%; -} -.row-fluid > .span9 { - width: 74.468085099%; -} -.row-fluid > .span8 { - width: 65.95744680199999%; -} -.row-fluid > .span7 { - width: 57.446808505%; -} -.row-fluid > .span6 { - width: 48.93617020799999%; -} -.row-fluid > .span5 { - width: 40.425531911%; -} -.row-fluid > .span4 { - width: 31.914893614%; -} -.row-fluid > .span3 { - width: 23.404255317%; -} -.row-fluid > .span2 { - width: 14.89361702%; -} -.row-fluid > .span1 { - width: 6.382978723%; -} -.container { - margin-left: auto; - margin-right: auto; - *zoom: 1; -} -.container:before, -.container:after { - display: table; - content: ""; -} -.container:after { - clear: both; -} -.container-fluid { - padding-left: 20px; - padding-right: 20px; - *zoom: 1; -} -.container-fluid:before, -.container-fluid:after { - display: table; - content: ""; -} -.container-fluid:after { - clear: both; -} -p { - margin: 0 0 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; -} -.lead { - margin-bottom: 18px; - font-size: 20px; - font-weight: 200; - line-height: 27px; -} -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-family: inherit; - font-weight: bold; - color: inherit; - text-rendering: optimizelegibility; -} -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} -h1 { - font-size: 30px; - line-height: 36px; -} -h1 small { - font-size: 18px; -} -h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; -} -h3 { - line-height: 27px; - font-size: 18px; -} -h3 small { - font-size: 14px; -} -h4, -h5, -h6 { - line-height: 18px; -} -h4 { - font-size: 14px; -} -h4 small { - font-size: 12px; -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} -.page-header { - padding-bottom: 17px; - margin: 18px 0; - border-bottom: 1px solid #eeeeee; -} -.page-header h1 { - line-height: 1; -} -ul, -ol { - padding: 0; - margin: 0 0 9px 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -ul { - list-style: disc; -} -ol { - list-style: decimal; -} -li { - line-height: 18px; -} -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} -dl { - margin-bottom: 18px; -} -dt, -dd { - line-height: 18px; -} -dt { - font-weight: bold; - line-height: 17px; -} -dd { - margin-left: 9px; -} -.dl-horizontal dt { - float: left; - clear: left; - width: 120px; - text-align: right; -} -.dl-horizontal dd { - margin-left: 130px; -} -hr { - margin: 18px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { - border-bottom: 1px dotted #ddd; - cursor: help; -} -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} -blockquote { - padding: 0 0 0 15px; - margin: 0 0 18px; - border-left: 5px solid #eeeeee; -} -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 22.5px; -} -blockquote small { - display: block; - line-height: 18px; - color: #999999; -} -blockquote small:before { - content: '\2014 \00A0'; -} -blockquote.pull-right { - float: right; - padding-left: 0; - padding-right: 15px; - border-left: 0; - border-right: 5px solid #eeeeee; -} -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} -address { - display: block; - margin-bottom: 18px; - line-height: 18px; - font-style: normal; -} -small { - font-size: 100%; -} -cite { - font-style: normal; -} -code, -pre { - padding: 0 3px 2px; - font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -code { - padding: 2px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} -pre { - display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - white-space: pre; - white-space: pre-wrap; - word-break: break-all; - word-wrap: break-word; -} -pre.prettyprint { - margin-bottom: 18px; -} -pre code { - padding: 0; - color: inherit; - background-color: transparent; - border: 0; -} -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} -form { - margin: 0 0 18px; -} -fieldset { - padding: 0; - margin: 0; - border: 0; -} -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; - color: #333333; - border: 0; - border-bottom: 1px solid #eee; -} -legend small { - font-size: 13.5px; - color: #999999; -} -label, -input, -button, -select, -textarea { - font-size: 13px; - font-weight: normal; - line-height: 18px; -} -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} -label { - display: block; - margin-bottom: 5px; - color: #333333; -} -input, -textarea, -select, -.uneditable-input { - display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; - color: #555555; - border: 1px solid #cccccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; -} -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; - height: auto; - padding: 0; - margin: 3px 0; - *margin-top: 0; - /* IE7 */ - - line-height: normal; - cursor: pointer; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0 \9; - /* IE9 and down */ - -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - border: initial; - background-color: #ffffff; - background-color: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -input[type="button"], -input[type="reset"], -input[type="submit"] { - width: auto; - height: auto; -} -select, -input[type="file"] { - height: 28px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; -} -select { - width: 220px; - background-color: #ffffff; -} -select[multiple], -select[size] { - height: auto; -} -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -textarea { - height: auto; -} -input[type="hidden"] { - display: none; -} -.radio, -.checkbox { - padding-left: 18px; -} -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} -input, -textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.input-mini { - width: 60px; -} -.input-small { - width: 90px; -} -.input-medium { - width: 150px; -} -.input-large { - width: 210px; -} -.input-xlarge { - width: 270px; -} -.input-xxlarge { - width: 530px; -} -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input { - float: none; - margin-left: 0; -} -input, -textarea, -.uneditable-input { - margin-left: 0; -} -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; -} -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; -} -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; -} -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; -} -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; -} -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; -} -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - background-color: #eeeeee; - border-color: #ddd; - cursor: not-allowed; -} -.control-group.warning > label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; - border-color: #c09853; -} -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; -} -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} -.control-group.error > label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; - border-color: #b94a48; -} -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; - box-shadow: 0 0 6px #d59392; -} -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} -.control-group.success > label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; - border-color: #468847; -} -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; -} -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; -} -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} -.form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; - background-color: #eeeeee; - border-top: 1px solid #ddd; - *zoom: 1; -} -.form-actions:before, -.form-actions:after { - display: table; - content: ""; -} -.form-actions:after { - clear: both; -} -.uneditable-input { - display: block; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - cursor: not-allowed; -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} -.help-block, -.help-inline { - color: #555555; -} -.help-block { - display: block; - margin-bottom: 9px; -} -.help-inline { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - vertical-align: middle; - padding-left: 5px; -} -.input-prepend, -.input-append { - margin-bottom: 5px; -} -.input-prepend input, -.input-append input, -.input-prepend select, -.input-append select, -.input-prepend .uneditable-input, -.input-append .uneditable-input { - *margin-left: 0; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-prepend input:focus, -.input-append input:focus, -.input-prepend select:focus, -.input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { - position: relative; - z-index: 2; -} -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { - display: inline-block; - width: auto; - min-width: 16px; - height: 18px; - padding: 4px 5px; - font-weight: normal; - line-height: 18px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; - background-color: #eeeeee; - border: 1px solid #ccc; -} -.input-prepend .add-on, -.input-append .add-on, -.input-prepend .btn, -.input-append .btn { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-prepend .active, -.input-append .active { - background-color: #a9dba9; - border-color: #46a546; -} -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} -.input-append input, -.input-append select .uneditable-input { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-append .uneditable-input { - border-left-color: #eee; - border-right-color: #ccc; -} -.input-append .add-on, -.input-append .btn { - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.search-query { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; -} -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - margin-bottom: 0; -} -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} -.form-search label, -.form-inline label { - display: inline-block; -} -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-left: 0; - margin-right: 3px; -} -.control-group { - margin-bottom: 9px; -} -legend + .control-group { - margin-top: 18px; - -webkit-margin-top-collapse: separate; -} -.form-horizontal .control-group { - margin-bottom: 18px; - *zoom: 1; -} -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - content: ""; -} -.form-horizontal .control-group:after { - clear: both; -} -.form-horizontal .control-label { - float: left; - width: 140px; - padding-top: 5px; - text-align: right; -} -.form-horizontal .controls { - margin-left: 160px; - /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */ - - *display: inline-block; - *margin-left: 0; - *padding-left: 20px; -} -.form-horizontal .help-block { - margin-top: 9px; - margin-bottom: 0; -} -.form-horizontal .form-actions { - padding-left: 160px; -} -table { - max-width: 100%; - border-collapse: collapse; - border-spacing: 0; - background-color: transparent; -} -.table { - width: 100%; - margin-bottom: 18px; -} -.table th, -.table td { - padding: 8px; - line-height: 18px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} -.table th { - font-weight: bold; -} -.table thead th { - vertical-align: bottom; -} -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} -.table tbody + tbody { - border-top: 2px solid #dddddd; -} -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} -.table-bordered { - border: 1px solid #dddddd; - border-left: 0; - border-collapse: separate; - *border-collapse: collapsed; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-radius: 4px 0 0 0; - -moz-border-radius: 4px 0 0 0; - border-radius: 4px 0 0 0; -} -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-radius: 0 4px 0 0; - -moz-border-radius: 0 4px 0 0; - border-radius: 0 4px 0 0; -} -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; -} -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; -} -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: #f9f9f9; -} -.table tbody tr:hover td, -.table tbody tr:hover th { - background-color: #f5f5f5; -} -table .span1 { - float: none; - width: 44px; - margin-left: 0; -} -table .span2 { - float: none; - width: 124px; - margin-left: 0; -} -table .span3 { - float: none; - width: 204px; - margin-left: 0; -} -table .span4 { - float: none; - width: 284px; - margin-left: 0; -} -table .span5 { - float: none; - width: 364px; - margin-left: 0; -} -table .span6 { - float: none; - width: 444px; - margin-left: 0; -} -table .span7 { - float: none; - width: 524px; - margin-left: 0; -} -table .span8 { - float: none; - width: 604px; - margin-left: 0; -} -table .span9 { - float: none; - width: 684px; - margin-left: 0; -} -table .span10 { - float: none; - width: 764px; - margin-left: 0; -} -table .span11 { - float: none; - width: 844px; - margin-left: 0; -} -table .span12 { - float: none; - width: 924px; - margin-left: 0; -} -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} -table .span17 { - float: none; - width: 1324px; - margin-left: 0; -} -table .span18 { - float: none; - width: 1404px; - margin-left: 0; -} -table .span19 { - float: none; - width: 1484px; - margin-left: 0; -} -table .span20 { - float: none; - width: 1564px; - margin-left: 0; -} -table .span21 { - float: none; - width: 1644px; - margin-left: 0; -} -table .span22 { - float: none; - width: 1724px; - margin-left: 0; -} -table .span23 { - float: none; - width: 1804px; - margin-left: 0; -} -table .span24 { - float: none; - width: 1884px; - margin-left: 0; -} -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; - *margin-right: .3em; -} -[class^="icon-"]:last-child, -[class*=" icon-"]:last-child { - *margin-left: 0; -} -.icon-white { - background-image: url("../img/glyphicons-halflings-white.png"); -} -.icon-glass { - background-position: 0 0; -} -.icon-music { - background-position: -24px 0; -} -.icon-search { - background-position: -48px 0; -} -.icon-envelope { - background-position: -72px 0; -} -.icon-heart { - background-position: -96px 0; -} -.icon-star { - background-position: -120px 0; -} -.icon-star-empty { - background-position: -144px 0; -} -.icon-user { - background-position: -168px 0; -} -.icon-film { - background-position: -192px 0; -} -.icon-th-large { - background-position: -216px 0; -} -.icon-th { - background-position: -240px 0; -} -.icon-th-list { - background-position: -264px 0; -} -.icon-ok { - background-position: -288px 0; -} -.icon-remove { - background-position: -312px 0; -} -.icon-zoom-in { - background-position: -336px 0; -} -.icon-zoom-out { - background-position: -360px 0; -} -.icon-off { - background-position: -384px 0; -} -.icon-signal { - background-position: -408px 0; -} -.icon-cog { - background-position: -432px 0; -} -.icon-trash { - background-position: -456px 0; -} -.icon-home { - background-position: 0 -24px; -} -.icon-file { - background-position: -24px -24px; -} -.icon-time { - background-position: -48px -24px; -} -.icon-road { - background-position: -72px -24px; -} -.icon-download-alt { - background-position: -96px -24px; -} -.icon-download { - background-position: -120px -24px; -} -.icon-upload { - background-position: -144px -24px; -} -.icon-inbox { - background-position: -168px -24px; -} -.icon-play-circle { - background-position: -192px -24px; -} -.icon-repeat { - background-position: -216px -24px; -} -.icon-refresh { - background-position: -240px -24px; -} -.icon-list-alt { - background-position: -264px -24px; -} -.icon-lock { - background-position: -287px -24px; -} -.icon-flag { - background-position: -312px -24px; -} -.icon-headphones { - background-position: -336px -24px; -} -.icon-volume-off { - background-position: -360px -24px; -} -.icon-volume-down { - background-position: -384px -24px; -} -.icon-volume-up { - background-position: -408px -24px; -} -.icon-qrcode { - background-position: -432px -24px; -} -.icon-barcode { - background-position: -456px -24px; -} -.icon-tag { - background-position: 0 -48px; -} -.icon-tags { - background-position: -25px -48px; -} -.icon-book { - background-position: -48px -48px; -} -.icon-bookmark { - background-position: -72px -48px; -} -.icon-print { - background-position: -96px -48px; -} -.icon-camera { - background-position: -120px -48px; -} -.icon-font { - background-position: -144px -48px; -} -.icon-bold { - background-position: -167px -48px; -} -.icon-italic { - background-position: -192px -48px; -} -.icon-text-height { - background-position: -216px -48px; -} -.icon-text-width { - background-position: -240px -48px; -} -.icon-align-left { - background-position: -264px -48px; -} -.icon-align-center { - background-position: -288px -48px; -} -.icon-align-right { - background-position: -312px -48px; -} -.icon-align-justify { - background-position: -336px -48px; -} -.icon-list { - background-position: -360px -48px; -} -.icon-indent-left { - background-position: -384px -48px; -} -.icon-indent-right { - background-position: -408px -48px; -} -.icon-facetime-video { - background-position: -432px -48px; -} -.icon-picture { - background-position: -456px -48px; -} -.icon-pencil { - background-position: 0 -72px; -} -.icon-map-marker { - background-position: -24px -72px; -} -.icon-adjust { - background-position: -48px -72px; -} -.icon-tint { - background-position: -72px -72px; -} -.icon-edit { - background-position: -96px -72px; -} -.icon-share { - background-position: -120px -72px; -} -.icon-check { - background-position: -144px -72px; -} -.icon-move { - background-position: -168px -72px; -} -.icon-step-backward { - background-position: -192px -72px; -} -.icon-fast-backward { - background-position: -216px -72px; -} -.icon-backward { - background-position: -240px -72px; -} -.icon-play { - background-position: -264px -72px; -} -.icon-pause { - background-position: -288px -72px; -} -.icon-stop { - background-position: -312px -72px; -} -.icon-forward { - background-position: -336px -72px; -} -.icon-fast-forward { - background-position: -360px -72px; -} -.icon-step-forward { - background-position: -384px -72px; -} -.icon-eject { - background-position: -408px -72px; -} -.icon-chevron-left { - background-position: -432px -72px; -} -.icon-chevron-right { - background-position: -456px -72px; -} -.icon-plus-sign { - background-position: 0 -96px; -} -.icon-minus-sign { - background-position: -24px -96px; -} -.icon-remove-sign { - background-position: -48px -96px; -} -.icon-ok-sign { - background-position: -72px -96px; -} -.icon-question-sign { - background-position: -96px -96px; -} -.icon-info-sign { - background-position: -120px -96px; -} -.icon-screenshot { - background-position: -144px -96px; -} -.icon-remove-circle { - background-position: -168px -96px; -} -.icon-ok-circle { - background-position: -192px -96px; -} -.icon-ban-circle { - background-position: -216px -96px; -} -.icon-arrow-left { - background-position: -240px -96px; -} -.icon-arrow-right { - background-position: -264px -96px; -} -.icon-arrow-up { - background-position: -289px -96px; -} -.icon-arrow-down { - background-position: -312px -96px; -} -.icon-share-alt { - background-position: -336px -96px; -} -.icon-resize-full { - background-position: -360px -96px; -} -.icon-resize-small { - background-position: -384px -96px; -} -.icon-plus { - background-position: -408px -96px; -} -.icon-minus { - background-position: -433px -96px; -} -.icon-asterisk { - background-position: -456px -96px; -} -.icon-exclamation-sign { - background-position: 0 -120px; -} -.icon-gift { - background-position: -24px -120px; -} -.icon-leaf { - background-position: -48px -120px; -} -.icon-fire { - background-position: -72px -120px; -} -.icon-eye-open { - background-position: -96px -120px; -} -.icon-eye-close { - background-position: -120px -120px; -} -.icon-warning-sign { - background-position: -144px -120px; -} -.icon-plane { - background-position: -168px -120px; -} -.icon-calendar { - background-position: -192px -120px; -} -.icon-random { - background-position: -216px -120px; -} -.icon-comment { - background-position: -240px -120px; -} -.icon-magnet { - background-position: -264px -120px; -} -.icon-chevron-up { - background-position: -288px -120px; -} -.icon-chevron-down { - background-position: -313px -119px; -} -.icon-retweet { - background-position: -336px -120px; -} -.icon-shopping-cart { - background-position: -360px -120px; -} -.icon-folder-close { - background-position: -384px -120px; -} -.icon-folder-open { - background-position: -408px -120px; -} -.icon-resize-vertical { - background-position: -432px -119px; -} -.icon-resize-horizontal { - background-position: -456px -118px; -} -.dropdown { - position: relative; -} -.dropdown-toggle { - *margin-bottom: -3px; -} -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000000; - opacity: 0.3; - filter: alpha(opacity=30); - content: ""; -} -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} -.dropdown:hover .caret, -.open.dropdown .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - float: left; - display: none; - min-width: 160px; - padding: 4px 0; - margin: 0; - list-style: none; - background-color: #ffffff; - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 1px; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - *border-right-width: 2px; - *border-bottom-width: 2px; -} -.dropdown-menu.pull-right { - right: 0; - left: auto; -} -.dropdown-menu .divider { - height: 1px; - margin: 8px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; - *width: 100%; - *margin: -5px 0 5px; -} -.dropdown-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #333333; - white-space: nowrap; -} -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0088cc; -} -.dropdown.open { - *z-index: 1000; -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { - display: block; -} -.pull-right .dropdown-menu { - left: auto; - right: 0; -} -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: "\2191"; -} -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} -.typeahead { - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.fade { - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; - opacity: 0; -} -.fade.in { - opacity: 1; -} -.collapse { - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; - position: relative; - overflow: hidden; - height: 0; -} -.collapse.in { - height: auto; -} -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 18px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} -.close:hover { - color: #000000; - text-decoration: none; - opacity: 0.4; - filter: alpha(opacity=40); - cursor: pointer; -} -.btn { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - padding: 4px 10px 4px; - margin-bottom: 0; - font-size: 13px; - line-height: 18px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - background-color: #f5f5f5; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(top, #ffffff, #e6e6e6); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - border: 1px solid #cccccc; - border-bottom-color: #b3b3b3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - cursor: pointer; - *margin-left: .3em; -} -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - background-color: #e6e6e6; -} -.btn:active, -.btn.active { - background-color: #cccccc \9; -} -.btn:first-child { - *margin-left: 0; -} -.btn:hover { - color: #333333; - text-decoration: none; - background-color: #e6e6e6; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.btn.active, -.btn:active { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - background-color: #e6e6e6; - background-color: #d9d9d9 \9; - outline: 0; -} -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - background-color: #e6e6e6; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-large [class^="icon-"] { - margin-top: 1px; -} -.btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; -} -.btn-small [class^="icon-"] { - margin-top: -1px; -} -.btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; -} -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - color: #ffffff; -} -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} -.btn-primary { - background-color: #0074cc; - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); - background-image: -ms-linear-gradient(top, #0088cc, #0055cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); - background-image: -o-linear-gradient(top, #0088cc, #0055cc); - background-image: linear-gradient(top, #0088cc, #0055cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); - border-color: #0055cc #0055cc #003580; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - background-color: #0055cc; -} -.btn-primary:active, -.btn-primary.active { - background-color: #004099 \9; -} -.btn-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - background-color: #f89406; -} -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} -.btn-danger { - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - background-color: #bd362f; -} -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} -.btn-success { - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - background-color: #51a351; -} -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} -.btn-info { - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - background-color: #2f96b4; -} -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} -.btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - background-color: #222222; -} -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} -button.btn, -input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; -} -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} -.btn-group { - position: relative; - *zoom: 1; - *margin-left: .3em; -} -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} -.btn-group:first-child { - *margin-left: 0; -} -.btn-group + .btn-group { - margin-left: 5px; -} -.btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; -} -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} -.btn-group .btn { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.btn-group .btn:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; -} -.btn-group .btn:last-child, -.btn-group .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; -} -.btn-group .btn.large:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; -} -.btn-group .btn.large:last-child, -.btn-group .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; -} -.btn-group .btn:hover, -.btn-group .btn:focus, -.btn-group .btn:active, -.btn-group .btn.active { - z-index: 2; -} -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} -.btn-group .dropdown-toggle { - padding-left: 8px; - padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - *padding-top: 3px; - *padding-bottom: 3px; -} -.btn-group .btn-mini.dropdown-toggle { - padding-left: 5px; - padding-right: 5px; - *padding-top: 1px; - *padding-bottom: 1px; -} -.btn-group .btn-small.dropdown-toggle { - *padding-top: 4px; - *padding-bottom: 4px; -} -.btn-group .btn-large.dropdown-toggle { - padding-left: 12px; - padding-right: 12px; -} -.btn-group.open { - *z-index: 1000; -} -.btn-group.open .dropdown-menu { - display: block; - margin-top: 1px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn .caret { - margin-top: 7px; - margin-left: 0; -} -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { - margin-top: 6px; -} -.btn-large .caret { - margin-top: 6px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); -} -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 18px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - color: #c09853; -} -.alert-heading { - color: inherit; -} -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 18px; -} -.alert-success { - background-color: #dff0d8; - border-color: #d6e9c6; - color: #468847; -} -.alert-danger, -.alert-error { - background-color: #f2dede; - border-color: #eed3d7; - color: #b94a48; -} -.alert-info { - background-color: #d9edf7; - border-color: #bce8f1; - color: #3a87ad; -} -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} -.nav { - margin-left: 0; - margin-bottom: 18px; - list-style: none; -} -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} -.nav .nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} -.nav li + .nav-header { - margin-top: 9px; -} -.nav-list { - padding-left: 15px; - padding-right: 15px; - margin-bottom: 0; -} -.nav-list > li > a, -.nav-list .nav-header { - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.nav-list > li > a { - padding: 3px 15px; -} -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} -.nav-list [class^="icon-"] { - margin-right: 2px; -} -.nav-list .divider { - height: 1px; - margin: 8px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; - *width: 100%; - *margin: -5px 0 5px; -} -.nav-tabs, -.nav-pills { - *zoom: 1; -} -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - content: ""; -} -.nav-tabs:after, -.nav-pills:after { - clear: both; -} -.nav-tabs > li, -.nav-pills > li { - float: left; -} -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} -.nav-tabs { - border-bottom: 1px solid #ddd; -} -.nav-tabs > li { - margin-bottom: -1px; -} -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 18px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} -.nav-stacked > li { - float: none; -} -.nav-stacked > li > a { - margin-right: 0; -} -.nav-tabs.nav-stacked { - border-bottom: 0; -} -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.nav-tabs.nav-stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} -.nav-tabs .dropdown-menu, -.nav-pills .dropdown-menu { - margin-top: 1px; - border-width: 1px; -} -.nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #0088cc; - border-bottom-color: #0088cc; - margin-top: 6px; -} -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; -} -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > .open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} -.nav .open .caret, -.nav .open.active .caret, -.nav .open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} -.tabs-stacked .open > a:hover { - border-color: #999999; -} -.tabbable { - *zoom: 1; -} -.tabbable:before, -.tabbable:after { - display: table; - content: ""; -} -.tabbable:after { - clear: both; -} -.tab-content { - display: table; - width: 100%; -} -.tabs-below .nav-tabs, -.tabs-right .nav-tabs, -.tabs-left .nav-tabs { - border-bottom: 0; -} -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} -.tab-content > .active, -.pill-content > .active { - display: block; -} -.tabs-below .nav-tabs { - border-top: 1px solid #ddd; -} -.tabs-below .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabs-below .nav-tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; -} -.tabs-below .nav-tabs .active > a, -.tabs-below .nav-tabs .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} -.tabs-left .nav-tabs > li, -.tabs-right .nav-tabs > li { - float: none; -} -.tabs-left .nav-tabs > li > a, -.tabs-right .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} -.tabs-left .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} -.tabs-left .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} -.tabs-left .nav-tabs .active > a, -.tabs-left .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} -.tabs-right .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} -.tabs-right .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} -.tabs-right .nav-tabs .active > a, -.tabs-right .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} -.navbar { - *position: relative; - *z-index: 2; - overflow: visible; - margin-bottom: 18px; -} -.navbar-inner { - padding-left: 20px; - padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -} -.navbar .container { - width: auto; -} -.btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} -.btn-navbar:hover, -.btn-navbar:active, -.btn-navbar.active, -.btn-navbar.disabled, -.btn-navbar[disabled] { - background-color: #222222; -} -.btn-navbar:active, -.btn-navbar.active { - background-color: #080808 \9; -} -.btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} -.nav-collapse.collapse { - height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; -} -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; -} -.navbar .navbar-text { - margin-bottom: 0; - line-height: 40px; -} -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} -.navbar .btn-group .btn { - margin-top: 0; -} -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} -.navbar-form:before, -.navbar-form:after { - display: table; - content: ""; -} -.navbar-form:after { - clear: both; -} -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} -.navbar-form input, -.navbar-form select { - display: inline-block; - margin-bottom: 0; -} -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 6px; - white-space: nowrap; -} -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-left: 0; - padding-right: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} -.navbar-fixed-top { - top: 0; -} -.navbar-fixed-bottom { - bottom: 0; -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; -} -.navbar .nav > li { - display: block; - float: left; -} -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; -} -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} -.navbar .dropdown-menu { - margin-top: 1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar-fixed-bottom .dropdown-menu:before { - border-top: 7px solid #ccc; - border-top-color: rgba(0, 0, 0, 0.2); - border-bottom: 0; - bottom: -7px; - top: auto; -} -.navbar-fixed-bottom .dropdown-menu:after { - border-top: 6px solid #ffffff; - border-bottom: 0; - bottom: -6px; - top: auto; -} -.navbar .nav .dropdown-toggle .caret, -.navbar .nav .open.dropdown .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav .active .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.navbar .nav .open > .dropdown-toggle, -.navbar .nav .active > .dropdown-toggle, -.navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #ffffff; -} -.navbar .nav.pull-right .dropdown-menu, -.navbar .nav .dropdown-menu.pull-right { - left: auto; - right: 0; -} -.navbar .nav.pull-right .dropdown-menu:before, -.navbar .nav .dropdown-menu.pull-right:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .dropdown-menu:after, -.navbar .nav .dropdown-menu.pull-right:after { - left: auto; - right: 13px; -} -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; -} -.breadcrumb .divider { - padding: 0 5px; - color: #999999; -} -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; -} -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} -.pagination li { - display: inline; -} -.pagination a { - float: left; - padding: 0 14px; - line-height: 34px; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; -} -.pagination a:hover, -.pagination .active a { - background-color: #f5f5f5; -} -.pagination .active a { - color: #999999; - cursor: default; -} -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { - color: #999999; - background-color: transparent; - cursor: default; -} -.pagination li:first-child a { - border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} -.pager { - margin-left: 0; - margin-bottom: 18px; - list-style: none; - text-align: center; - *zoom: 1; -} -.pager:before, -.pager:after { - display: table; - content: ""; -} -.pager:after { - clear: both; -} -.pager li { - display: inline; -} -.pager a { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pager a:hover { - text-decoration: none; - background-color: #f5f5f5; -} -.pager .next a { - float: right; -} -.pager .previous a { - float: left; -} -.pager .disabled a, -.pager .disabled a:hover { - color: #999999; - background-color: #fff; - cursor: default; -} -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} -.modal-backdrop.fade { - opacity: 0; -} -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 1050; - overflow: auto; - width: 560px; - margin: -250px 0 0 -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - /* IE6-7 */ - - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.modal.fade { - -webkit-transition: opacity .3s linear, top .3s ease-out; - -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; - -o-transition: opacity .3s linear, top .3s ease-out; - transition: opacity .3s linear, top .3s ease-out; - top: -25%; -} -.modal.fade.in { - top: 50%; -} -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} -.modal-header .close { - margin-top: 2px; -} -.modal-body { - overflow-y: auto; - max-height: 400px; - padding: 15px; -} -.modal-form { - margin-bottom: 0; -} -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; - *zoom: 1; -} -.modal-footer:before, -.modal-footer:after { - display: table; - content: ""; -} -.modal-footer:after { - clear: both; -} -.modal-footer .btn + .btn { - margin-left: 5px; - margin-bottom: 0; -} -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} -.tooltip { - position: absolute; - z-index: 1020; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); -} -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.tooltip.top { - margin-top: -2px; -} -.tooltip.right { - margin-left: 2px; -} -.tooltip.bottom { - margin-top: 2px; -} -.tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; -} -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} -.thumbnails:before, -.thumbnails:after { - display: table; - content: ""; -} -.thumbnails:after { - clear: both; -} -.thumbnails > li { - float: left; - margin: 0 0 18px 20px; -} -.thumbnail { - display: block; - padding: 4px; - line-height: 1; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} -.thumbnail > img { - display: block; - max-width: 100%; - margin-left: auto; - margin-right: auto; -} -.thumbnail .caption { - padding: 9px; -} -.label { - padding: 1px 4px 2px; - font-size: 10.998px; - font-weight: bold; - line-height: 13px; - color: #ffffff; - vertical-align: middle; - white-space: nowrap; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.label:hover { - color: #ffffff; - text-decoration: none; -} -.label-important { - background-color: #b94a48; -} -.label-important:hover { - background-color: #953b39; -} -.label-warning { - background-color: #f89406; -} -.label-warning:hover { - background-color: #c67605; -} -.label-success { - background-color: #468847; -} -.label-success:hover { - background-color: #356635; -} -.label-info { - background-color: #3a87ad; -} -.label-info:hover { - background-color: #2d6987; -} -.label-inverse { - background-color: #333333; -} -.label-inverse:hover { - background-color: #1a1a1a; -} -.badge { - padding: 1px 9px 2px; - font-size: 12.025px; - font-weight: bold; - white-space: nowrap; - color: #ffffff; - background-color: #999999; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} -.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} -.badge-error { - background-color: #b94a48; -} -.badge-error:hover { - background-color: #953b39; -} -.badge-warning { - background-color: #f89406; -} -.badge-warning:hover { - background-color: #c67605; -} -.badge-success { - background-color: #468847; -} -.badge-success:hover { - background-color: #356635; -} -.badge-info { - background-color: #3a87ad; -} -.badge-info:hover { - background-color: #2d6987; -} -.badge-inverse { - background-color: #333333; -} -.badge-inverse:hover { - background-color: #1a1a1a; -} -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@-moz-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@-ms-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -.progress { - overflow: hidden; - height: 18px; - margin-bottom: 18px; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.progress .bar { - width: 0%; - height: 18px; - color: #ffffff; - font-size: 12px; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} -.progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress-danger .bar { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} -.progress-danger.progress-striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress-success .bar { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} -.progress-success.progress-striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress-info .bar { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} -.progress-info.progress-striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress-warning .bar { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); -} -.progress-warning.progress-striped .bar { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.accordion { - margin-bottom: 18px; -} -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.accordion-heading { - border-bottom: 0; -} -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} -.carousel { - position: relative; - margin-bottom: 18px; - line-height: 1; -} -.carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} -.carousel .item { - display: none; - position: relative; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel .item > img { - display: block; - line-height: 1; -} -.carousel .active, -.carousel .next, -.carousel .prev { - display: block; -} -.carousel .active { - left: 0; -} -.carousel .next, -.carousel .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel .next { - left: 100%; -} -.carousel .prev { - left: -100%; -} -.carousel .next.left, -.carousel .prev.right { - left: 0; -} -.carousel .active.left { - left: -100%; -} -.carousel .active.right { - left: 100%; -} -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} -.carousel-control.right { - left: auto; - right: 15px; -} -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 10px 15px 5px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} -.carousel-caption h4, -.carousel-caption p { - color: #ffffff; -} -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - color: inherit; - letter-spacing: -1px; -} -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.hide { - display: none; -} -.show { - display: block; -} -.invisible { - visibility: hidden; -} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.min.css b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.min.css deleted file mode 100644 index c951467732..0000000000 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/css/bootstrap.min.css +++ /dev/null @@ -1,689 +0,0 @@ -article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} -audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} -audio:not([controls]){display:none;} -html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} -a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -a:hover,a:active{outline:0;} -sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} -sup{top:-0.5em;} -sub{bottom:-0.25em;} -img{height:auto;border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;} -button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} -button,input{*overflow:visible;line-height:normal;} -button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} -button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} -input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} -input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} -textarea{overflow:auto;vertical-align:top;} -.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;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;} -a{color:#0088cc;text-decoration:none;} -a:hover{color:#005580;text-decoration:underline;} -.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:940px;} -.span12{width:940px;} -.span11{width:860px;} -.span10{width:780px;} -.span9{width:700px;} -.span8{width:620px;} -.span7{width:540px;} -.span6{width:460px;} -.span5{width:380px;} -.span4{width:300px;} -.span3{width:220px;} -.span2{width:140px;} -.span1{width:60px;} -.offset12{margin-left:980px;} -.offset11{margin-left:900px;} -.offset10{margin-left:820px;} -.offset9{margin-left:740px;} -.offset8{margin-left:660px;} -.offset7{margin-left:580px;} -.offset6{margin-left:500px;} -.offset5{margin-left:420px;} -.offset4{margin-left:340px;} -.offset3{margin-left:260px;} -.offset2{margin-left:180px;} -.offset1{margin-left:100px;} -.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.127659574%;} -.row-fluid>[class*="span"]:first-child{margin-left:0;} -.row-fluid > .span12{width:99.99999998999999%;} -.row-fluid > .span11{width:91.489361693%;} -.row-fluid > .span10{width:82.97872339599999%;} -.row-fluid > .span9{width:74.468085099%;} -.row-fluid > .span8{width:65.95744680199999%;} -.row-fluid > .span7{width:57.446808505%;} -.row-fluid > .span6{width:48.93617020799999%;} -.row-fluid > .span5{width:40.425531911%;} -.row-fluid > .span4{width:31.914893614%;} -.row-fluid > .span3{width:23.404255317%;} -.row-fluid > .span2{width:14.89361702%;} -.row-fluid > .span1{width:6.382978723%;} -.container{margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";} -.container:after{clear:both;} -.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";} -.container-fluid:after{clear:both;} -p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;} -.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;} -h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} -h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} -h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} -h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;} -h4,h5,h6{line-height:18px;} -h4{font-size:14px;}h4 small{font-size:12px;} -h5{font-size:12px;} -h6{font-size:11px;color:#999999;text-transform:uppercase;} -.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;} -.page-header h1{line-height:1;} -ul,ol{padding:0;margin:0 0 9px 25px;} -ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} -ul{list-style:disc;} -ol{list-style:decimal;} -li{line-height:18px;} -ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} -dl{margin-bottom:18px;} -dt,dd{line-height:18px;} -dt{font-weight:bold;line-height:17px;} -dd{margin-left:9px;} -.dl-horizontal dt{float:left;clear:left;width:120px;text-align:right;} -.dl-horizontal dd{margin-left:130px;} -hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} -strong{font-weight:bold;} -em{font-style:italic;} -.muted{color:#999999;} -abbr[title]{border-bottom:1px dotted #ddd;cursor:help;} -abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} -blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} -blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} -q:before,q:after,blockquote:before,blockquote:after{content:"";} -address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} -small{font-size:100%;} -cite{font-style:normal;} -code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} -pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;word-wrap:break-word;}pre.prettyprint{margin-bottom:18px;} -pre code{padding:0;color:inherit;background-color:transparent;border:0;} -.pre-scrollable{max-height:340px;overflow-y:scroll;} -form{margin:0 0 18px;} -fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}legend small{font-size:13.5px;color:#999999;} -label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;} -input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} -label{display:block;margin-bottom:5px;color:#333333;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.uneditable-textarea{width:auto;height:auto;} -label input,label textarea,label select{display:block;} -input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;border:0 \9;} -input[type="image"]{border:0;} -input[type="file"]{width:auto;padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;} -select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;} -input[type="file"]{line-height:18px \9;} -select{width:220px;background-color:#ffffff;} -select[multiple],select[size]{height:auto;} -input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -textarea{height:auto;} -input[type="hidden"]{display:none;} -.radio,.checkbox{padding-left:18px;} -.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} -.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} -.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} -.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} -input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} -input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} -input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.input-mini{width:60px;} -.input-small{width:90px;} -.input-medium{width:150px;} -.input-large{width:210px;} -.input-xlarge{width:270px;} -.input-xxlarge{width:530px;} -input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;} -input,textarea,.uneditable-input{margin-left:0;} -input.span12, textarea.span12, .uneditable-input.span12{width:930px;} -input.span11, textarea.span11, .uneditable-input.span11{width:850px;} -input.span10, textarea.span10, .uneditable-input.span10{width:770px;} -input.span9, textarea.span9, .uneditable-input.span9{width:690px;} -input.span8, textarea.span8, .uneditable-input.span8{width:610px;} -input.span7, textarea.span7, .uneditable-input.span7{width:530px;} -input.span6, textarea.span6, .uneditable-input.span6{width:450px;} -input.span5, textarea.span5, .uneditable-input.span5{width:370px;} -input.span4, textarea.span4, .uneditable-input.span4{width:290px;} -input.span3, textarea.span3, .uneditable-input.span3{width:210px;} -input.span2, textarea.span2, .uneditable-input.span2{width:130px;} -input.span1, textarea.span1, .uneditable-input.span1{width:50px;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#eeeeee;border-color:#ddd;cursor:not-allowed;} -.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} -.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} -.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} -.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} -.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} -.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} -.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} -.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} -input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} -.form-actions:after{clear:both;} -.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} -:-moz-placeholder{color:#999999;} -::-webkit-input-placeholder{color:#999999;} -.help-block,.help-inline{color:#555555;} -.help-block{display:block;margin-bottom:9px;} -.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} -.input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{*margin-left:0;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} -.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} -.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} -.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} -.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} -.input-append input,.input-append select .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append .uneditable-input{border-left-color:#eee;border-right-color:#ccc;} -.input-append .add-on,.input-append .btn{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} -.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;margin-bottom:0;} -.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;} -.form-search label,.form-inline label{display:inline-block;} -.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} -.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} -.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-left:0;margin-right:3px;} -.control-group{margin-bottom:9px;} -legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;} -.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";} -.form-horizontal .control-group:after{clear:both;} -.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right;} -.form-horizontal .controls{margin-left:160px;*display:inline-block;*margin-left:0;*padding-left:20px;} -.form-horizontal .help-block{margin-top:9px;margin-bottom:0;} -.form-horizontal .form-actions{padding-left:160px;} -table{max-width:100%;border-collapse:collapse;border-spacing:0;background-color:transparent;} -.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} -.table th{font-weight:bold;} -.table thead th{vertical-align:bottom;} -.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} -.table tbody+tbody{border-top:2px solid #dddddd;} -.table-condensed th,.table-condensed td{padding:4px 5px;} -.table-bordered{border:1px solid #dddddd;border-left:0;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;} -.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} -.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} -.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} -.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} -.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} -.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} -.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5;} -table .span1{float:none;width:44px;margin-left:0;} -table .span2{float:none;width:124px;margin-left:0;} -table .span3{float:none;width:204px;margin-left:0;} -table .span4{float:none;width:284px;margin-left:0;} -table .span5{float:none;width:364px;margin-left:0;} -table .span6{float:none;width:444px;margin-left:0;} -table .span7{float:none;width:524px;margin-left:0;} -table .span8{float:none;width:604px;margin-left:0;} -table .span9{float:none;width:684px;margin-left:0;} -table .span10{float:none;width:764px;margin-left:0;} -table .span11{float:none;width:844px;margin-left:0;} -table .span12{float:none;width:924px;margin-left:0;} -table .span13{float:none;width:1004px;margin-left:0;} -table .span14{float:none;width:1084px;margin-left:0;} -table .span15{float:none;width:1164px;margin-left:0;} -table .span16{float:none;width:1244px;margin-left:0;} -table .span17{float:none;width:1324px;margin-left:0;} -table .span18{float:none;width:1404px;margin-left:0;} -table .span19{float:none;width:1484px;margin-left:0;} -table .span20{float:none;width:1564px;margin-left:0;} -table .span21{float:none;width:1644px;margin-left:0;} -table .span22{float:none;width:1724px;margin-left:0;} -table .span23{float:none;width:1804px;margin-left:0;} -table .span24{float:none;width:1884px;margin-left:0;} -[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;} -.icon-white{background-image:url("../img/glyphicons-halflings-white.png");} -.icon-glass{background-position:0 0;} -.icon-music{background-position:-24px 0;} -.icon-search{background-position:-48px 0;} -.icon-envelope{background-position:-72px 0;} -.icon-heart{background-position:-96px 0;} -.icon-star{background-position:-120px 0;} -.icon-star-empty{background-position:-144px 0;} -.icon-user{background-position:-168px 0;} -.icon-film{background-position:-192px 0;} -.icon-th-large{background-position:-216px 0;} -.icon-th{background-position:-240px 0;} -.icon-th-list{background-position:-264px 0;} -.icon-ok{background-position:-288px 0;} -.icon-remove{background-position:-312px 0;} -.icon-zoom-in{background-position:-336px 0;} -.icon-zoom-out{background-position:-360px 0;} -.icon-off{background-position:-384px 0;} -.icon-signal{background-position:-408px 0;} -.icon-cog{background-position:-432px 0;} -.icon-trash{background-position:-456px 0;} -.icon-home{background-position:0 -24px;} -.icon-file{background-position:-24px -24px;} -.icon-time{background-position:-48px -24px;} -.icon-road{background-position:-72px -24px;} -.icon-download-alt{background-position:-96px -24px;} -.icon-download{background-position:-120px -24px;} -.icon-upload{background-position:-144px -24px;} -.icon-inbox{background-position:-168px -24px;} -.icon-play-circle{background-position:-192px -24px;} -.icon-repeat{background-position:-216px -24px;} -.icon-refresh{background-position:-240px -24px;} -.icon-list-alt{background-position:-264px -24px;} -.icon-lock{background-position:-287px -24px;} -.icon-flag{background-position:-312px -24px;} -.icon-headphones{background-position:-336px -24px;} -.icon-volume-off{background-position:-360px -24px;} -.icon-volume-down{background-position:-384px -24px;} -.icon-volume-up{background-position:-408px -24px;} -.icon-qrcode{background-position:-432px -24px;} -.icon-barcode{background-position:-456px -24px;} -.icon-tag{background-position:0 -48px;} -.icon-tags{background-position:-25px -48px;} -.icon-book{background-position:-48px -48px;} -.icon-bookmark{background-position:-72px -48px;} -.icon-print{background-position:-96px -48px;} -.icon-camera{background-position:-120px -48px;} -.icon-font{background-position:-144px -48px;} -.icon-bold{background-position:-167px -48px;} -.icon-italic{background-position:-192px -48px;} -.icon-text-height{background-position:-216px -48px;} -.icon-text-width{background-position:-240px -48px;} -.icon-align-left{background-position:-264px -48px;} -.icon-align-center{background-position:-288px -48px;} -.icon-align-right{background-position:-312px -48px;} -.icon-align-justify{background-position:-336px -48px;} -.icon-list{background-position:-360px -48px;} -.icon-indent-left{background-position:-384px -48px;} -.icon-indent-right{background-position:-408px -48px;} -.icon-facetime-video{background-position:-432px -48px;} -.icon-picture{background-position:-456px -48px;} -.icon-pencil{background-position:0 -72px;} -.icon-map-marker{background-position:-24px -72px;} -.icon-adjust{background-position:-48px -72px;} -.icon-tint{background-position:-72px -72px;} -.icon-edit{background-position:-96px -72px;} -.icon-share{background-position:-120px -72px;} -.icon-check{background-position:-144px -72px;} -.icon-move{background-position:-168px -72px;} -.icon-step-backward{background-position:-192px -72px;} -.icon-fast-backward{background-position:-216px -72px;} -.icon-backward{background-position:-240px -72px;} -.icon-play{background-position:-264px -72px;} -.icon-pause{background-position:-288px -72px;} -.icon-stop{background-position:-312px -72px;} -.icon-forward{background-position:-336px -72px;} -.icon-fast-forward{background-position:-360px -72px;} -.icon-step-forward{background-position:-384px -72px;} -.icon-eject{background-position:-408px -72px;} -.icon-chevron-left{background-position:-432px -72px;} -.icon-chevron-right{background-position:-456px -72px;} -.icon-plus-sign{background-position:0 -96px;} -.icon-minus-sign{background-position:-24px -96px;} -.icon-remove-sign{background-position:-48px -96px;} -.icon-ok-sign{background-position:-72px -96px;} -.icon-question-sign{background-position:-96px -96px;} -.icon-info-sign{background-position:-120px -96px;} -.icon-screenshot{background-position:-144px -96px;} -.icon-remove-circle{background-position:-168px -96px;} -.icon-ok-circle{background-position:-192px -96px;} -.icon-ban-circle{background-position:-216px -96px;} -.icon-arrow-left{background-position:-240px -96px;} -.icon-arrow-right{background-position:-264px -96px;} -.icon-arrow-up{background-position:-289px -96px;} -.icon-arrow-down{background-position:-312px -96px;} -.icon-share-alt{background-position:-336px -96px;} -.icon-resize-full{background-position:-360px -96px;} -.icon-resize-small{background-position:-384px -96px;} -.icon-plus{background-position:-408px -96px;} -.icon-minus{background-position:-433px -96px;} -.icon-asterisk{background-position:-456px -96px;} -.icon-exclamation-sign{background-position:0 -120px;} -.icon-gift{background-position:-24px -120px;} -.icon-leaf{background-position:-48px -120px;} -.icon-fire{background-position:-72px -120px;} -.icon-eye-open{background-position:-96px -120px;} -.icon-eye-close{background-position:-120px -120px;} -.icon-warning-sign{background-position:-144px -120px;} -.icon-plane{background-position:-168px -120px;} -.icon-calendar{background-position:-192px -120px;} -.icon-random{background-position:-216px -120px;} -.icon-comment{background-position:-240px -120px;} -.icon-magnet{background-position:-264px -120px;} -.icon-chevron-up{background-position:-288px -120px;} -.icon-chevron-down{background-position:-313px -119px;} -.icon-retweet{background-position:-336px -120px;} -.icon-shopping-cart{background-position:-360px -120px;} -.icon-folder-close{background-position:-384px -120px;} -.icon-folder-open{background-position:-408px -120px;} -.icon-resize-vertical{background-position:-432px -119px;} -.icon-resize-horizontal{background-position:-456px -118px;} -.dropdown{position:relative;} -.dropdown-toggle{*margin-bottom:-3px;} -.dropdown-toggle:active,.open .dropdown-toggle{outline:0;} -.caret{display:inline-block;width:0;height:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"";} -.dropdown .caret{margin-top:8px;margin-left:2px;} -.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.pull-right{right:0;left:auto;} -.dropdown-menu .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} -.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;} -.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;} -.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} -.dropdown.open .dropdown-menu{display:block;} -.pull-right .dropdown-menu{left:auto;right:0;} -.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";} -.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;} -.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} -.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} -.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;} -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);border:1px solid #cccccc;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;} -.btn:active,.btn.active{background-color:#cccccc \9;} -.btn:first-child{*margin-left:0;} -.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} -.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} -.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.btn-large [class^="icon-"]{margin-top:1px;} -.btn-small{padding:5px 9px;font-size:11px;line-height:16px;} -.btn-small [class^="icon-"]{margin-top:-1px;} -.btn-mini{padding:2px 6px;font-size:11px;line-height:14px;} -.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;} -.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} -.btn-primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0055cc;} -.btn-primary:active,.btn-primary.active{background-color:#004099 \9;} -.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;} -.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} -.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;} -.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;} -.btn-info:active,.btn-info.active{background-color:#24748c \9;} -.btn-inverse{background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-ms-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(top, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222222;} -.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} -button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} -button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} -button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} -button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} -.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";} -.btn-group:after{clear:both;} -.btn-group:first-child{*margin-left:0;} -.btn-group+.btn-group{margin-left:5px;} -.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} -.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} -.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} -.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} -.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} -.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;} -.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} -.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:3px;*padding-bottom:3px;} -.btn-group .btn-mini.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:1px;*padding-bottom:1px;} -.btn-group .btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px;} -.btn-group .btn-large.dropdown-toggle{padding-left:12px;padding-right:12px;} -.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} -.btn .caret{margin-top:7px;margin-left:0;} -.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);} -.btn-mini .caret{margin-top:5px;} -.btn-small .caret{margin-top:6px;} -.btn-large .caret{margin-top:6px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} -.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;} -.alert-heading{color:inherit;} -.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;} -.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;} -.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} -.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;} -.alert-block{padding-top:14px;padding-bottom:14px;} -.alert-block>p,.alert-block>ul{margin-bottom:0;} -.alert-block p+p{margin-top:5px;} -.nav{margin-left:0;margin-bottom:18px;list-style:none;} -.nav>li>a{display:block;} -.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} -.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} -.nav li+.nav-header{margin-top:9px;} -.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} -.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} -.nav-list>li>a{padding:3px 15px;} -.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} -.nav-list [class^="icon-"]{margin-right:2px;} -.nav-list .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} -.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";} -.nav-tabs:after,.nav-pills:after{clear:both;} -.nav-tabs>li,.nav-pills>li{float:left;} -.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} -.nav-tabs{border-bottom:1px solid #ddd;} -.nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} -.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} -.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;} -.nav-stacked>li{float:none;} -.nav-stacked>li>a{margin-right:0;} -.nav-tabs.nav-stacked{border-bottom:0;} -.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} -.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} -.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;} -.nav-pills.nav-stacked>li>a{margin-bottom:3px;} -.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} -.nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;} -.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;} -.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;} -.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} -.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;} -.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;} -.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);} -.tabs-stacked .open>a:hover{border-color:#999999;} -.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";} -.tabbable:after{clear:both;} -.tab-content{display:table;width:100%;} -.tabs-below .nav-tabs,.tabs-right .nav-tabs,.tabs-left .nav-tabs{border-bottom:0;} -.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} -.tab-content>.active,.pill-content>.active{display:block;} -.tabs-below .nav-tabs{border-top:1px solid #ddd;} -.tabs-below .nav-tabs>li{margin-top:-1px;margin-bottom:0;} -.tabs-below .nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} -.tabs-below .nav-tabs .active>a,.tabs-below .nav-tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;} -.tabs-left .nav-tabs>li,.tabs-right .nav-tabs>li{float:none;} -.tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} -.tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} -.tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} -.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} -.tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} -.tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} -.tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} -.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} -.tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} -.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;} -.navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.navbar .container{width:auto;} -.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;} -.btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;} -.btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} -.btn-navbar .icon-bar+.icon-bar{margin-top:3px;} -.nav-collapse.collapse{height:auto;} -.navbar{color:#999999;}.navbar .brand:hover{text-decoration:none;} -.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} -.navbar .navbar-text{margin-bottom:0;line-height:40px;} -.navbar .btn,.navbar .btn-group{margin-top:5px;} -.navbar .btn-group .btn{margin-top:0;} -.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";} -.navbar-form:after{clear:both;} -.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} -.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;} -.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} -.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} -.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;} -.navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} -.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} -.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} -.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} -.navbar-fixed-top{top:0;} -.navbar-fixed-bottom{bottom:0;} -.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} -.navbar .nav.pull-right{float:right;} -.navbar .nav>li{display:block;float:left;} -.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;} -.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;} -.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;} -.navbar .nav.pull-right{margin-left:10px;margin-right:0;} -.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} -.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} -.navbar-fixed-bottom .dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} -.navbar-fixed-bottom .dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} -.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} -.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);} -.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;} -.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;} -.navbar .nav.pull-right .dropdown-menu,.navbar .nav .dropdown-menu.pull-right{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before,.navbar .nav .dropdown-menu.pull-right:before{left:auto;right:12px;} -.navbar .nav.pull-right .dropdown-menu:after,.navbar .nav .dropdown-menu.pull-right:after{left:auto;right:13px;} -.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} -.breadcrumb .divider{padding:0 5px;color:#999999;} -.breadcrumb .active a{color:#333333;} -.pagination{height:36px;margin:18px 0;} -.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} -.pagination li{display:inline;} -.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} -.pagination a:hover,.pagination .active a{background-color:#f5f5f5;} -.pagination .active a{color:#999999;cursor:default;} -.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} -.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.pagination-centered{text-align:center;} -.pagination-right{text-align:right;} -.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";} -.pager:after{clear:both;} -.pager li{display:inline;} -.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} -.pager a:hover{text-decoration:none;background-color:#f5f5f5;} -.pager .next a{float:right;} -.pager .previous a{float:left;} -.pager .disabled a,.pager .disabled a:hover{color:#999999;background-color:#fff;cursor:default;} -.modal-open .dropdown-menu{z-index:2050;} -.modal-open .dropdown.open{*z-index:2050;} -.modal-open .popover{z-index:2060;} -.modal-open .tooltip{z-index:2070;} -.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} -.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} -.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} -.modal.fade.in{top:50%;} -.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} -.modal-body{overflow-y:auto;max-height:400px;padding:15px;} -.modal-form{margin-bottom:0;} -.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";} -.modal-footer:after{clear:both;} -.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;} -.modal-footer .btn-group .btn+.btn{margin-left:-1px;} -.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} -.tooltip.top{margin-top:-2px;} -.tooltip.right{margin-left:2px;} -.tooltip.bottom{margin-top:2px;} -.tooltip.left{margin-left:-2px;} -.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.tooltip-arrow{position:absolute;width:0;height:0;} -.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;} -.popover.right{margin-left:5px;} -.popover.bottom{margin-top:5px;} -.popover.left{margin-left:-5px;} -.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.popover .arrow{position:absolute;width:0;height:0;} -.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} -.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} -.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;} -.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";} -.thumbnails:after{clear:both;} -.thumbnails>li{float:left;margin:0 0 18px 20px;} -.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);} -a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} -.thumbnail .caption{padding:9px;} -.label{padding:1px 4px 2px;font-size:10.998px;font-weight:bold;line-height:13px;color:#ffffff;vertical-align:middle;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.label:hover{color:#ffffff;text-decoration:none;} -.label-important{background-color:#b94a48;} -.label-important:hover{background-color:#953b39;} -.label-warning{background-color:#f89406;} -.label-warning:hover{background-color:#c67605;} -.label-success{background-color:#468847;} -.label-success:hover{background-color:#356635;} -.label-info{background-color:#3a87ad;} -.label-info:hover{background-color:#2d6987;} -.label-inverse{background-color:#333333;} -.label-inverse:hover{background-color:#1a1a1a;} -.badge{padding:1px 9px 2px;font-size:12.025px;font-weight:bold;white-space:nowrap;color:#ffffff;background-color:#999999;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} -.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} -.badge-error{background-color:#b94a48;} -.badge-error:hover{background-color:#953b39;} -.badge-warning{background-color:#f89406;} -.badge-warning:hover{background-color:#c67605;} -.badge-success{background-color:#468847;} -.badge-success:hover{background-color:#356635;} -.badge-info{background-color:#3a87ad;} -.badge-info:hover{background-color:#2d6987;} -.badge-inverse{background-color:#333333;} -.badge-inverse:hover{background-color:#1a1a1a;} -@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} -.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} -.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} -.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);} -.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);} -.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} -.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);} -.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.accordion{margin-bottom:18px;} -.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.accordion-heading{border-bottom:0;} -.accordion-heading .accordion-toggle{display:block;padding:8px 15px;} -.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} -.carousel{position:relative;margin-bottom:18px;line-height:1;} -.carousel-inner{overflow:hidden;width:100%;position:relative;} -.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} -.carousel .item>img{display:block;line-height:1;} -.carousel .active,.carousel .next,.carousel .prev{display:block;} -.carousel .active{left:0;} -.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} -.carousel .next{left:100%;} -.carousel .prev{left:-100%;} -.carousel .next.left,.carousel .prev.right{left:0;} -.carousel .active.left{left:-100%;} -.carousel .active.right{left:100%;} -.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} -.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} -.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} -.carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} -.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;} -.pull-right{float:right;} -.pull-left{float:left;} -.hide{display:none;} -.show{display:block;} -.invisible{visibility:hidden;} diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/img/glyphicons-halflings-white.png b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/img/glyphicons-halflings-white.png deleted file mode 100644 index a20760bfde58d1c92cee95116059fba03c68d689..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4352 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 diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.js b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.js deleted file mode 100644 index ca868671ca..0000000000 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.js +++ /dev/null @@ -1,1726 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - $(function () { - - "use strict" - - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - - return support && { - end: (function () { - var transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - return transitionEnd - }()) - } - })() - - }) - -}( window.jQuery );/* ========================================================== - * bootstrap-alert.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype = { - - constructor: Alert - - , close: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.trigger('close') - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent - .trigger('close') - .removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - $.fn.alert = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}( window.jQuery );/* ============================================================ - * bootstrap-button.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype = { - - constructor: Button - - , setState: function ( state ) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - , toggle: function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - $.fn.button = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON DATA-API - * =============== */ - - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - }) - -}( window.jQuery );/* ========================================================== - * bootstrap-carousel.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.carousel.defaults, options) - this.options.slide && this.slide(this.options.slide) - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function () { - this.interval = setInterval($.proxy(this.next, this), this.options.interval) - return this - } - - , to: function (pos) { - var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } - - , pause: function () { - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if ($next.hasClass('active')) return - - if (!$.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger('slide') - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } else { - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.trigger('slide') - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - $.fn.carousel = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = typeof option == 'object' && option - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() - else data.cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) - }) - -}( window.jQuery );/* ============================================================= - * bootstrap-collapse.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - var Collapse = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options["parent"]) { - this.$parent = $(this.options["parent"]) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension = this.dimension() - , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('.in') - , hasData - - if (actives && actives.length) { - hasData = actives.data('collapse') - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', 'show', 'shown') - this.$element[dimension](this.$element[0][scroll]) - - } - - , hide: function () { - var dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', 'hide', 'hidden') - this.$element[dimension](0) - } - - , reset: function ( size ) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function ( method, startEvent, completeEvent ) { - var that = this - , complete = function () { - if (startEvent == 'show') that.reset() - that.$element.trigger(completeEvent) - } - - this.$element - .trigger(startEvent) - [method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}( window.jQuery );/* ============================================================ - * bootstrap-dropdown.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function( $ ){ - - "use strict" - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle="dropdown"]' - , Dropdown = function ( element ) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - , isActive - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - isActive = $parent.hasClass('open') - - clearMenus() - !isActive && $parent.toggleClass('open') - - return false - } - - } - - function clearMenus() { - $(toggle).parent().removeClass('open') - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html').on('click.dropdown.data-api', clearMenus) - $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) - }) - -}( window.jQuery );/* ========================================================= - * bootstrap-modal.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function( $ ){ - - "use strict" - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function ( content, options ) { - this.options = options - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - - if (this.isShown) return - - $('body').addClass('modal-open') - - this.isShown = true - this.$element.trigger('show') - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function ( e ) { - e && e.preventDefault() - - if (!this.isShown) return - - var that = this - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element - .trigger('hide') - .removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } - - } - - - /* MODAL PRIVATE METHODS - * ===================== */ - - function hideWithTransition() { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) - }) - } - - function hideModal( that ) { - this.$element - .hide() - .trigger('hidden') - - backdrop.call(this) - } - - function backdrop( callback ) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
          ') - .appendTo(document.body) - - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) - - } else if (callback) { - callback() - } - } - - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null - } - - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL DATA-API - * ============== */ - - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) - - e.preventDefault() - $target.modal(option) - }) - }) - -}( window.jQuery );/* =========================================================== - * bootstrap-tooltip.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - "use strict" - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function ( element, options ) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function ( type, element, options ) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function ( options ) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - self.hoverState = 'in' - setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) - } - } - - , leave: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - self.hoverState = 'out' - setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) - } - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , setContent: function () { - var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - title = (title || '').toString().replace(/(^\s*|\s*$)/, "") - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , delay: 0 - , selector: false - , placement: 'top' - , trigger: 'hover' - , title: '' - , template: '
          ' - } - -}( window.jQuery );/* =========================================================== - * bootstrap-popover.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function( $ ) { - - "use strict" - - var Popover = function ( element, options ) { - this.init('popover', element, options) - } - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) - $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - content = content.toString().replace(/(^\s*|\s*$)/, "") - - return content - } - - , tip: function() { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

          ' - }) - -}( window.jQuery );/* ============================================================= - * bootstrap-scrollspy.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - -!function ( $ ) { - - "use strict" - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy( element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body').on('click.scroll.data-api', this.selector, process) - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - this.targets = this.$body - .find(this.selector) - .map(function () { - var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null - }) - - this.offsets = $.map(this.targets, function (id) { - return $(id).position().top - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - - this.activeTarget = target - - this.$body - .find(this.selector).parent('.active') - .removeClass('active') - - active = this.$body - .find(this.selector + '[href="' + target + '"]') - .parent('li') - .addClass('active') - - if ( active.parent('.dropdown-menu') ) { - active.closest('li.dropdown').addClass('active') - } - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollspy = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}( window.jQuery );/* ======================================================== - * bootstrap-tab.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function( $ ){ - - "use strict" - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function ( element ) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active a').last()[0] - - $this.trigger({ - type: 'show' - , relatedTarget: previous - }) - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB DATA-API - * ============ */ - - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - }) - -}( window.jQuery );/* ============================================================= - * bootstrap-typeahead.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - var Typeahead = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element.val(val) - this.$element.change(); - return this.hide() - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var that = this - , items - , q - - this.query = this.$element.val() - - if (!this.query) { - return this.shown ? this.hide() : this - } - - items = $.grep(this.source, function (item) { - if (that.matcher(item)) return item - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keypress, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , keypress: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - $.fn.typeahead = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
            ' - , item: '
            • ' - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) - }) - -}( window.jQuery ); \ No newline at end of file diff --git a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.min.js b/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.min.js deleted file mode 100644 index ffaefa691d..0000000000 --- a/documentation/website/source/_themes/opendylan/static/bootstrap/2.0.2/js/bootstrap.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/** -* Bootstrap.js by @fat & @mdo -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger("close").removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;return!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
            ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=(a||"").toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
            '}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

            '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.$element.change(),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
              ',item:'
              • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); \ No newline at end of file From 6d77e1c2a8aef017a8128c7e9627ff87ffce774f Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 21 Jan 2013 10:24:22 +0700 Subject: [PATCH 229/519] Fix typo. --- documentation/website/source/news/recent.rst.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index f9082fe113..d2886c4a54 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -2,7 +2,7 @@ *2012-12-20* We just released Open Dylan 2012.1. This release brings many -bugfixes, inmproved platform support and new features. +bugfixes, improved platform support and new features. :doc:`Read more... ` From 27c07785ddbb2a30efb3b76ddef4ab05c8d93764 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 21 Jan 2013 12:20:04 +0700 Subject: [PATCH 230/519] Start of a new approach to the main index page. --- documentation/website/source/index.rst | 64 +++++++++++++------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index d81f93a415..cdd5205e79 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -1,27 +1,19 @@ -Welcome to Open Dylan! -====================== - .. raw:: html -
              -

              Dylan is an advanced, object-oriented, dynamic language which - supports rapid program development. When needed, programs can be - optimized for more efficient execution by supplying more type - information to the compiler. Nearly all entities in Dylan - (including functions, classes, and basic data types such as - integers) are first class objects. Additionally Dylan supports - multiple inheritance, polymorphism, multiple dispatch, keyword - arguments, object introspection, macros, and many other advanced - features... --Peter Hinely

              - -
              -
              -
              - +
              + +
              +

              Dylan is an advanced, object-oriented, dynamic language which + supports rapid program development. When needed, programs can be + optimized for more efficient execution by supplying more type + information to the compiler. Nearly all entities in Dylan + (including functions, classes, and basic data types such as + integers) are first class objects. Additionally Dylan supports + multiple inheritance, polymorphism, multiple dispatch, keyword + arguments, object introspection, macros, and many other advanced + features... --Peter Hinely

              +

              Recent News

              @@ -37,20 +29,30 @@ Welcome to Open Dylan!
              All news »
              -
              +

              Get Started

              -
              -

              Just getting started with Open Dylan? We recommend that - you read the Introduction to - Dylan to get a feel for the language. After that, you can broaden - your knowledge with the Dylan Programming - book.

              -
              +The `Dylan Foundry `_ has written about +`getting started with the 2012.1 release `_ or just go ahead and `download `_ it. + +.. raw:: html -For more on the background and goals of the Dylan language, see the -excellent :drm:`Introduction to the Dylan Reference Manual `. +

              Learn about Dylan

              + +Dylan has a large amount of documentation available: + +* `Introduction to Dylan `_: + A tutorial is written primarily for those with solid programming + experience in C++ or another object-oriented, static language. It + provides a gentler introduction to Dylan than does the Dylan + Reference Manual (DRM). +* `Dylan Programming Guide `_: + A good, book length Dylan tutorial by several Harlequin employees. +* `Dylan Reference Manual `_: + The official definition of the Dylan language and standard library. +* `OpenDylan Documentation `_: + All of the OpenDylan documentation. .. raw:: html From 3a0761f0ef0ee7442bb38330a7854ccf349c63b3 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 21 Jan 2013 13:30:19 +0700 Subject: [PATCH 231/519] Fix sk8 image link by hosting the image ourselves. --- .../website/source/_static/images/sk8.jpg | Bin 0 -> 173603 bytes .../source/about/apple-dylan/eulogy.rst | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 documentation/website/source/_static/images/sk8.jpg diff --git a/documentation/website/source/_static/images/sk8.jpg b/documentation/website/source/_static/images/sk8.jpg new file mode 100644 index 0000000000000000000000000000000000000000..dd188fe1e8352b525f38b66d4fb64ca744695aa1 GIT binary patch literal 173603 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�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
              ",""],legend:[1,"
              ","
              "],thead:[1,"
              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 literal 0 HcmV?d00001 diff --git a/documentation/website/source/about/apple-dylan/eulogy.rst b/documentation/website/source/about/apple-dylan/eulogy.rst index 90ec12e5e2..72ee9ecdf5 100644 --- a/documentation/website/source/about/apple-dylan/eulogy.rst +++ b/documentation/website/source/about/apple-dylan/eulogy.rst @@ -111,8 +111,7 @@ by Apple is SK8. SK8 has an even cooler environment than Apple Dylan and has been used in dozens of projects many years ago. The programming language of SK8 is a kind of object-oriented AppleScript (written in MCL). Here is a `picture of Sk8 running on a PowerMac -`_. Sk8 has -been released by Apple as source code. +<../../_static/images/sk8.jpg>`_. Sk8 has been released by Apple as source code. Apple Dylan influences ====================== From b06a0f3204aca0641ce5981deb664ae01135f06a Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 21 Jan 2013 13:30:53 +0700 Subject: [PATCH 232/519] Improve home page title since I removed the big title text. --- documentation/website/source/_themes/opendylan/layout.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index 23dda0c750..bf887fdc92 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -19,7 +19,9 @@ ('download/index', 'Download'), ] -%} {% set active_page = pagename|default('index') -%} - +{%- block htmltitle %} +{% if title == "<no title>" %}Open Dylan{% else %}{{ title|striptags|e }}{% endif %}{{ titlesuffix }} +{%- endblock %} {% block extrahead %} From 75dbd261df64e8478fe5220dc1819f48a6bc0c7e Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 21 Jan 2013 13:50:35 +0700 Subject: [PATCH 233/519] Improve footer appearance. --- .../source/_themes/opendylan/layout.html | 22 +++++++++---------- .../static/opendylan.org/css/opendylan.css | 4 ++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index bf887fdc92..b295b7bb2a 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -72,16 +72,15 @@ {% endblock %} {% block footer %} -
              -
              -
              +
              +
              +
              {%- if show_source and has_source and sourcename %} +

              {{ _('Show Source') }} + rel="nofollow">{{ _('Show Source') }}

              {%- endif %} -
              - -
              +

              {%- if show_copyright %} {%- if hasdoc('copyright') %} {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} @@ -95,9 +94,9 @@ {%- if show_sphinx %} {% trans sphinx_version=sphinx_version|e %}Created using Sphinx {{ sphinx_version }}.{% endtrans %} {%- endif %} -

              -
              - +

              +
              +
              @@ -112,8 +111,7 @@ } catch( err ) {} - -
              + {% endblock %} {% block relbar1 %}{% endblock %} diff --git a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css index dd217348cc..796d96e262 100644 --- a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css +++ b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css @@ -17,6 +17,10 @@ body { -moz-border-radius:3px; border-radius:3px; } +footer.navbar { + margin-top: 20px; + margin-bottom: 0; +} /* Make the headerlink less obnoxiously visible */ a.headerlink { color: silver; From c12e4466448e25d034cab0df4e540f29374f0697 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 21 Jan 2013 14:01:50 +0700 Subject: [PATCH 234/519] OpenDylan -> Open Dylan. --- documentation/website/source/index.rst | 4 ++-- .../website/source/news/2012/10/18/editor-support.rst | 2 +- .../website/source/news/2012/12/20/new-release.rst | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index cdd5205e79..9ac55fa67e 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -51,8 +51,8 @@ Dylan has a large amount of documentation available: A good, book length Dylan tutorial by several Harlequin employees. * `Dylan Reference Manual `_: The official definition of the Dylan language and standard library. -* `OpenDylan Documentation `_: - All of the OpenDylan documentation. +* `Open Dylan Documentation `_: + All of the Open Dylan documentation. .. raw:: html diff --git a/documentation/website/source/news/2012/10/18/editor-support.rst b/documentation/website/source/news/2012/10/18/editor-support.rst index e056a866e9..e028af7408 100644 --- a/documentation/website/source/news/2012/10/18/editor-support.rst +++ b/documentation/website/source/news/2012/10/18/editor-support.rst @@ -18,7 +18,7 @@ Sublime Text and Textmate Textmate and Sublime Text used the same plugin which can be found on GitHub at https://github.com/dylan-lang/dylan.tmbundle. -* Using OpenDylan specific modifiers (``dynamic``, ``sideways``, etc) +* Using Open Dylan specific modifiers (``dynamic``, ``sideways``, etc) won't break the highlighting. * ``locked`` and ``thread`` variable definitions are highlighted correctly now. diff --git a/documentation/website/source/news/2012/12/20/new-release.rst b/documentation/website/source/news/2012/12/20/new-release.rst index bd75993d18..1e81e66bf2 100644 --- a/documentation/website/source/news/2012/12/20/new-release.rst +++ b/documentation/website/source/news/2012/12/20/new-release.rst @@ -32,8 +32,8 @@ separately: ``strings`` and ``string-extensions`` libraries with a more consistent and straightforward API. ``string-extensions`` has been removed. * The ``command-line-parser`` library has been cleaned up and integrated - with the OpenDylan distribution. -* We no longer provide PowerPC builds of OpenDylan on Mac OS X. Also, + with the Open Dylan distribution. +* We no longer provide PowerPC builds of Open Dylan on Mac OS X. Also, our Intel builds are for Mac OS X Lion and later. If you desire Snow Leopard support, please get in touch with us. @@ -44,4 +44,4 @@ On Windows there is an installer, on UNIX systems unpack into ``/opt``. On 64 bit Linux, you will need to have the Boehm GC installed for our executables to run. (Ubuntu: ``apt-get install libgc``) -Good luck and happy Dylan hacking! \ No newline at end of file +Good luck and happy Dylan hacking! From 0015e2edbc063ff46e9ee7e46515688c87cf283d Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 21 Jan 2013 16:05:20 +0700 Subject: [PATCH 235/519] Add links to new PDF & ePub versions of DPG. --- documentation/website/source/documentation/index.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index f7ec3b8d02..f880533c73 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -33,6 +33,8 @@ Documentation Manual (DRM). `Dylan Programming `_ +[`pdf `__] +[`epub `__] A good, book length Dylan tutorial by several Harlequin employees. From 0be932a03ccd07aef77ca87a868dccdeea92b1d6 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 21 Jan 2013 16:25:16 +0700 Subject: [PATCH 236/519] Announce the DPG updates. --- .../2013/01/21/dylan-programming-guide.rst | 38 +++++++++++++++++++ documentation/website/source/news/index.rst | 18 +++++++++ .../website/source/news/recent.rst.inc | 27 +++++-------- 3 files changed, 65 insertions(+), 18 deletions(-) create mode 100644 documentation/website/source/news/2013/01/21/dylan-programming-guide.rst diff --git a/documentation/website/source/news/2013/01/21/dylan-programming-guide.rst b/documentation/website/source/news/2013/01/21/dylan-programming-guide.rst new file mode 100644 index 0000000000..665328d63d --- /dev/null +++ b/documentation/website/source/news/2013/01/21/dylan-programming-guide.rst @@ -0,0 +1,38 @@ +:Author: Bruce Mitchener, Jr. +:Date: 2013-01-21 00:00:00 + +Dylan Programming Guide +======================= + +The `Dylan Programming Guide`_ has been updated to +use our new documentation format. As a result it is +now available in `PDF`_ and `ePub`_ formats as well +as much improved HTML. + +The Dylan Programming Guide is a great introduction +to programming in Dylan and was written by Neil +Feinberg, Sonya E. Keene, Robert O. Matthews, and +P. Tucker Withington while they were employed by +Harlequin in the 1990s. The book covers everything +from the basics up through advanced concepts such as +Dylan macros and the condition system. + +This was exported from the 1996-era Framemaker files +and largely reformatted by hand. During this work, +we also rewrote the lexer used in `Pygments`_ for +processing and syntax highlighting Dylan source code. +This new lexer will be available in the upcoming +Pygments 1.6. + +In the future, we will add some errata to the book to +address some of the changes that have happened since +the book was originally published. + +We hope that this will be helpful in introducing a +new generation of programmers to the Dylan programming +language. + +.. _Dylan Programming Guide: http://opendylan.org/books/dpg/ +.. _PDF: http://opendylan.org/books/dpg/DylanProgramming.pdf +.. _ePub: http://opendylan.org/books/dpg/DylanProgramming.epub +.. _Pygments: http://pygments.org/ diff --git a/documentation/website/source/news/index.rst b/documentation/website/source/news/index.rst index 56ad3ac760..76ff4bfaa5 100644 --- a/documentation/website/source/news/index.rst +++ b/documentation/website/source/news/index.rst @@ -11,6 +11,24 @@ News & Articles .. include:: recent.rst.inc +**command-line-parser library** +*2012-10-15* + +The `command-line-parser +`_ library has been +completely rewritten. + +:doc:`Read more... ` + + +**New strings library** +*2012-05-18* + +A new library of basic string operations is now available as a +standard library. + +:doc:`Read more... ` + **C3 superclass linearization** *2012-01-25* diff --git a/documentation/website/source/news/recent.rst.inc b/documentation/website/source/news/recent.rst.inc index d2886c4a54..2ccb4947e0 100644 --- a/documentation/website/source/news/recent.rst.inc +++ b/documentation/website/source/news/recent.rst.inc @@ -1,3 +1,12 @@ +**Updated Dylan Programming Guide** +*2013-01-21* + +The Dylan Programming Guide has been updated to our +new documentation format and is now available in +PDF and ePub formats. + +:doc:`Read more... ` + **New release: 2012.1** *2012-12-20* @@ -13,21 +22,3 @@ Bugs in the syntax highlighting support for Textmate and Sublime Text as well as for vim have been fixed. :doc:`Read more... ` - -**command-line-parser library** -*2012-10-15* - -The `command-line-parser -`_ library has been -completely rewritten. - -:doc:`Read more... ` - - -**New strings library** -*2012-05-18* - -A new library of basic string operations is now available as a -standard library. - -:doc:`Read more... ` From 3741d1f9ff504f4ee3e0a2dec487169dd1f82cb0 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 22 Jan 2013 22:39:17 +0700 Subject: [PATCH 237/519] Add Scheme cheatsheet. This is from Jonathan Sobel from many years ago. It was originally located at http://www.cs.indiana.edu/~jsobel/forschemers.html and is reproduced here with his permission. --- .../documentation/cheatsheets/scheme.rst | 617 ++++++++++++++++++ .../website/source/documentation/index.rst | 1 + 2 files changed, 618 insertions(+) create mode 100644 documentation/website/source/documentation/cheatsheets/scheme.rst diff --git a/documentation/website/source/documentation/cheatsheets/scheme.rst b/documentation/website/source/documentation/cheatsheets/scheme.rst new file mode 100644 index 0000000000..69dc12fc57 --- /dev/null +++ b/documentation/website/source/documentation/cheatsheets/scheme.rst @@ -0,0 +1,617 @@ +A Dylan Primer for Scheme Programmers +===================================== + +This document was originally authored by Jonathan Sobel. + +Almost everything you already do in Scheme can be translated easily into +Dylan. In fact, with one exception, Dylan is a proper superset of Scheme. +The one exception is that continuations have indefinite extent in Scheme +and dynamic extent in Dylan. Some individual implementations of Dylan +might provide a mechanism for producing continuations with indefinite +extent, making all Scheme programs be Dylan programs, too. (Of course, +you won't be taking full advantage of the power of Dylan if you only +write Scheme programs in it.) + +This document is really just a large table in two columns. On the left, +you will see a Scheme expression, and on the right, its Dylan counterpart. +If one column contains N/A, then that language has no corresponding +direct way to express what is in the other column. + +Please remember, there is much more to Dylan than what you'll find here! +For example, this document doesn't show you how to define new classes or +create generic functions (functions which support ad hoc polymorphic +behavior). This document is only intended to help ease your transition +from Scheme to Dylan. + +Literals +-------- + ++------------------------+-----------------------+ +| Scheme | Dylan | ++========================+=======================+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| #t | #t | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| #f | #f | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| 23 | 23 | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| #b1011 | #b1011 | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| #o644 | #o644 | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| #x2A5F | #x2A5F | ++------------------------+-----------------------+ +| .. code-block:: scheme | N/A | +| | | +| -4/5 | | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| 6.02E23 | 6.02E23 | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| #\a | 'a' | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| #\newline | '\n' | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| "Hello" | "Hello" | ++------------------------+-----------------------+ +| N/A | .. code-block:: dylan | +| | | +| | "Hello\n" | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| 'apple | #"apple" | +| | apple: | ++------------------------+-----------------------+ +| N/A | .. code-block:: dylan | +| | | +| | #"two words" | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| '(1 #\a dog) | #(1, 'a', #"dog") | ++------------------------+-----------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| '#(5 10 15) | #[5, 10, 15] | ++------------------------+-----------------------+ +| .. code-block:: scheme | N/A | +| | | +| `(1 2 ,x ,@y) | | ++------------------------+-----------------------+ + +Syntax +------ + +Note that, in Dylan, any words after an ``end`` (e.g. +``end method``) are optional. + ++----------------------------------+---------------------------------------+ +| Scheme | Dylan | ++==================================+=======================================+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (define var exp) | define variable var = exp | +| | define constant var = exp | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (f x y z) | f(x, y, z) | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (begin 1 2 3) | begin 1; 2; 3; end | +| | begin 1; 2; 3 end | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | N/A | +| | | +| (quote datum) | | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (lambda (x y . z) | method (x, y, #rest z) | +| (say "hello") | say("hello"); | +| (f x y z) | f(x, y, z); | +| ) | end method | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (let ((x 5)) | let x = 5; | +| body) | body | +| | // (Scope ends at next | +| | // "body-ender.") | ++----------------------------------+---------------------------------------+ +| N/A | .. code-block:: dylan | +| | | +| | let (x, y) = exp; | +| | // (Binds multiple values | +| | // returned by exp.) | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (let ((x 5) (y 6)) | let (x, y) = values(5, 6); | +| (f x y)) | f(x, y) | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (letrec ((f (lambda (x) | local method f (x) | +| f-body) | f-body | +| ) | end method f, | +| (g (lambda (y z) | method g (y, z) | +| g-body) | g-body | +| )) | end method g; | +| body) | body | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (if test | if (test) | +| (begin then1 | then1; | +| then2) | then2; | +| (begin else1 | else | +| else2) | else1; | +| ) | else2; | +| | end if | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (set! var value) | var := value | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (and a b c) | a & b & c | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (or a b c) | a | b | c | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (cond | case | +| (test1 result1) | test1 => result1; | +| (test2 result2) | test2 => result2; | +| (else result) | otherwise => result; | +| ) | end case | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (case exp | select (exp) | +| ((a 2) result1) | #"a", 2 => result1; | +| (('a' 'b') result2) | 'a', 'b' => result2; | +| (else result) | otherwise => result; | +| ) | end select | ++----------------------------------+---------------------------------------+ +| N/A | .. code-block:: dylan | +| | | +| | select (exp by comparison-func) | +| | f(x) => result1; | +| | g(y), h(z) => result2; | +| | otherwise => result; | +| | end select | ++----------------------------------+---------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (do ((var1 init1 step1) | for (var1 = init1 then step1, | +| (var2 init2 step2)) | var2 = init2 then step2, | +| (test result) | until: test) | +| body | body | +| ) | finally result | +| | end for | ++----------------------------------+---------------------------------------+ + +Predefined functions +-------------------- + +These are organized based on the "Standard Procedures" section of R4RS. + ++--------------------------------+-----------------------------------------------+ +| **Boolean functions** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (not obj) | ~ obj | +| | ~obj | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (boolean? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| **Equivalance predicates** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (eqv? x y) | x == y | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | N/A | +| | | +| (eq? x y) | | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (equal? x y) | x = y | ++--------------------------------+-----------------------------------------------+ +| **Pairs and Lists** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (pair? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (cons x y) | pair(x, y) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (car ls) | head(ls) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (cdr ls) | tail(ls) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (set-car! ls val) | head-setter(val, ls) | +| | head(ls) := val | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (set-cdr! ls val) | tail-setter(val, ls) | +| | tail(ls) := val | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (cadadr ls) | N/A | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (null? obj) | instance?(obj, ) | +| | obj = #() | +| | empty?(ls) // most common | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (list? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (list x y z) | list(x, y, z) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (length ls) | size(ls) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (append ls1 ls2 ls3) | concatenate(ls1, ls2, ls3) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (reverse ls) | reverse(ls) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (list-ref ls n) | element(ls, n) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (member obj ls) | member?(obj, ls) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (memv obj ls) | member?(obj, ls, test: \==) | ++--------------------------------+-----------------------------------------------+ +| **Symbols** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (symbol? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (symbol->string sym) | as(, sym) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (string->symbol str) | as(, str) | ++--------------------------------+-----------------------------------------------+ +| **Numerical operations** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (number? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (complex? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (real? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (rational? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (integer? obj) | instance?(obj, ) | +| | integral?(num) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (= n1 n2) | n1 = n2 | +| | n1 == n2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (< n1 n2) | n1 < n2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (> n1 n2) | n1 > n2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (<= n1 n2) | n1 <= n2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (>= n1 n2) | n1 >= n2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (zero? n) | zero?(n) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (positive? n) | positive?(n) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (negative? n) | negative?(n) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (odd? i) | odd?(i) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (even? i) | even?(i) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (+ 1 2 3) | 1 + 2 + 3 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (* 1 2 3) | 1 * 2 * 3 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (- 5 3) | 5 - 3 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (/ 2.3 1.7) | 2.3 / 1.7 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (- x) | - x | +| | -x | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (expt 2 16) | 2 ^ 16 | ++--------------------------------+-----------------------------------------------+ +| *[Most of the standard Scheme numeric functions (e.g. max, remainder) are | +| defined similarly in Dylan. No need to list them all here.]* | ++--------------------------------+-----------------------------------------------+ +| ** Characters** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (char? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (char=? char1 char2) | char1 = char2 | +| | char1 == char2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (char? char1 char2) | char1 > char2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (char<=? char1 char2) | char1 <= char2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (char>=? char1 char2) | char1 >= char2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (char->integer char) | as(, char) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (integer->char n) | as(, n) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (char-upcase char) | as-uppercase(char) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (char-downcase char) | as-lowercase(char) | ++--------------------------------+-----------------------------------------------+ +| **Strings** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (string? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (make-string k char) | make(, size: k, fill: char) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | N/A | +| | | +| (string char ...) | | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (string-length str) | size(str) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (string-ref str k) | element(str, k) | +| | str[k] | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (string-set! str k char) | element-setter(char, str, k) | +| | str[k] := char | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (string=? str1 str2) | str1 = str2 | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (stringlist str) | as(, str) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (list->string chars) | as(, chars) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (string-copy str) | shallow-copy(str) | +| | copy-sequence(str) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (string-fill! str char) | fill!(str, char) | ++--------------------------------+-----------------------------------------------+ +| **Vectors** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (vector? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (make-vector k fill) | make(, size: k, fill: fill) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (vector obj ...) | vector(obj, ...); | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (vector-length vec) | size(vec) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (vector-ref vec k) | element(vec, k) | +| | vec[k] | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (vector-set! vec k obj) | element-setter(obj, vec, k) | +| | vec[k] := obj | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (vector->list vec) | as(, vec) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (list>vector list) | as(, list) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (vector-fill! vec obj) | fill!(vec, obj) | ++--------------------------------+-----------------------------------------------+ +| **Control Features** | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (procedure? obj) | instance?(obj, ) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (apply proc arg1 arg2 args) | apply(proc, arg1, arg2, args) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (map proc list1 list2) | map(proc, list1, list2) | ++--------------------------------+-----------------------------------------------+ +| N/A | .. code-block:: dylan | +| | | +| | map(proc, vec1, vec2) | ++--------------------------------+-----------------------------------------------+ +| N/A | .. code-block:: dylan | +| | | +| | map(proc, string1, string2) | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (for-each proc list1 list2) | do(proc, list1, list2) | ++--------------------------------+-----------------------------------------------+ +| **Continuations** | +| | +| As mentioned before, continuations have dynamic extent in Dylan. Also, whereas | +| ``call/cc`` is a function, Dylan uses a syntax form to grab a continuation. | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (call/cc | block (k) | +| (lambda (k) | body | +| body)) | end block | ++--------------------------------+-----------------------------------------------+ +| .. code-block:: scheme | .. code-block:: dylan | +| | | +| (call/cc | block (k) | +| (lambda (k) | body | +| (dynamic-wind | cleanup | +| (lambda () #f) | cleanup-stuff | +| (lambda () body) | end block | +| (lambda () | | +| cleanup-stuff)))) | | ++--------------------------------+-----------------------------------------------+ diff --git a/documentation/website/source/documentation/index.rst b/documentation/website/source/documentation/index.rst index f880533c73..7261fc39fc 100644 --- a/documentation/website/source/documentation/index.rst +++ b/documentation/website/source/documentation/index.rst @@ -109,6 +109,7 @@ Documentation * `Iteration `_ * `Conditionals `_ * `Collections `_ + * `For Scheme programmers `_ .. raw:: html From d5a761ec02525b1628e52239e0139797860c82d2 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 22 Jan 2013 23:16:51 +0700 Subject: [PATCH 238/519] fix indentation error. --- .../website/source/documentation/cheatsheets/scheme.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/documentation/cheatsheets/scheme.rst b/documentation/website/source/documentation/cheatsheets/scheme.rst index 69dc12fc57..81da371ac8 100644 --- a/documentation/website/source/documentation/cheatsheets/scheme.rst +++ b/documentation/website/source/documentation/cheatsheets/scheme.rst @@ -189,7 +189,7 @@ Note that, in Dylan, any words after an ``end`` (e.g. | (test1 result1) | test1 => result1; | | (test2 result2) | test2 => result2; | | (else result) | otherwise => result; | -| ) | end case | +| ) | end case | +----------------------------------+---------------------------------------+ | .. code-block:: scheme | .. code-block:: dylan | | | | From fb77f1ab0e7d4d1617eef41bdf3de309c00ff858 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 25 Jan 2013 14:56:22 +0700 Subject: [PATCH 239/519] Fix a variety of broken links. --- documentation/website/source/community/gsoc/2012/cilk.rst | 2 +- documentation/website/source/community/gsoc/2012/cocoa.rst | 2 +- documentation/website/source/community/gsoc/2012/dylint.rst | 1 - .../website/source/community/gsoc/2012/frontend-lisp.rst | 2 +- .../website/source/news/2011/11/22/new_documentation.rst | 2 +- documentation/website/source/proposals/dep-0003.rst | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/documentation/website/source/community/gsoc/2012/cilk.rst b/documentation/website/source/community/gsoc/2012/cilk.rst index 4cd3d4c53f..250d8e6359 100644 --- a/documentation/website/source/community/gsoc/2012/cilk.rst +++ b/documentation/website/source/community/gsoc/2012/cilk.rst @@ -11,4 +11,4 @@ trying to interoperate with the existing Cilk runtime. Cilk information: -- http://software.intel.com/en-us/articles/intel-cilk-plus/ +- http://software.intel.com/en-us/intel-cilk-plus diff --git a/documentation/website/source/community/gsoc/2012/cocoa.rst b/documentation/website/source/community/gsoc/2012/cocoa.rst index 0a4948bfde..f8f1b677ed 100644 --- a/documentation/website/source/community/gsoc/2012/cocoa.rst +++ b/documentation/website/source/community/gsoc/2012/cocoa.rst @@ -18,4 +18,4 @@ Interesting prior art: - `LuaCocoa `_ - `Clozure CL Objective C bridge `_ - `LispWorks Objective C interface `_ -- `A list of a lot of Cocoa Bridges `_ +- `A list of a lot of Cocoa Bridges `_ diff --git a/documentation/website/source/community/gsoc/2012/dylint.rst b/documentation/website/source/community/gsoc/2012/dylint.rst index 33358d6c91..8c64857ea1 100644 --- a/documentation/website/source/community/gsoc/2012/dylint.rst +++ b/documentation/website/source/community/gsoc/2012/dylint.rst @@ -10,5 +10,4 @@ This can draw inspiration from: - `PMD `_ - `PyLint `_ -- `AnalysisTool `_ - Clang plugins diff --git a/documentation/website/source/community/gsoc/2012/frontend-lisp.rst b/documentation/website/source/community/gsoc/2012/frontend-lisp.rst index e48a23bb7f..2391ee6ddb 100644 --- a/documentation/website/source/community/gsoc/2012/frontend-lisp.rst +++ b/documentation/website/source/community/gsoc/2012/frontend-lisp.rst @@ -14,4 +14,4 @@ Some references: - `Dylan Interim Reference Manual `_ - `Dylan Macros with S-Expressions `_ -- `S-Expression Syntax `_ +- `S-Expression Syntax `_ diff --git a/documentation/website/source/news/2011/11/22/new_documentation.rst b/documentation/website/source/news/2011/11/22/new_documentation.rst index 292d3e30f8..b29778050f 100644 --- a/documentation/website/source/news/2011/11/22/new_documentation.rst +++ b/documentation/website/source/news/2011/11/22/new_documentation.rst @@ -27,7 +27,7 @@ There will still be a fair bit of work to update and improve the documentation, but this should prove much easier now that we have it in a modern format that we all can work with! -.. _Sphinx: http://sphinx.pocoo.org/ +.. _Sphinx: http://sphinx-doc.org/ .. _documentation: https://github.com/dylan-lang/opendylan/tree/master/documentation .. _sphinx-extensions: https://github.com/dylan-lang/sphinx-extensions diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index 0e487cb715..4a54b2d407 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -57,7 +57,7 @@ consistent superclass linearization algorithm is needed. After the C3 linearization was proposed in 1996, it was subsequently adapted in Python 2.3 (`article `__) and Perl 6 (`article -`__). +`__). Rationale ========= From 3e71fa9d62d414fe5fe19501ab9c5add3c991058 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 9 Feb 2013 06:05:47 +0700 Subject: [PATCH 240/519] Bump to new Twitter Bootstrap version. --- documentation/website/source/_themes/opendylan/layout.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/website/source/_themes/opendylan/layout.html b/documentation/website/source/_themes/opendylan/layout.html index b295b7bb2a..307081174e 100644 --- a/documentation/website/source/_themes/opendylan/layout.html +++ b/documentation/website/source/_themes/opendylan/layout.html @@ -23,9 +23,9 @@ {% if title == "<no title>" %}Open Dylan{% else %}{{ title|striptags|e }}{% endif %}{{ titlesuffix }} {%- endblock %} {% block extrahead %} - - - + + + From 839392f57064a6d723d0f5d24a56695f2a26b48a Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Wed, 13 Feb 2013 10:31:53 -0500 Subject: [PATCH 241/519] Initial draft of DEP 6, single file libraries --- .../website/source/proposals/dep-0006.rst | 172 ++++++++++++++++++ .../website/source/proposals/index.rst | 2 + 2 files changed, 174 insertions(+) create mode 100644 documentation/website/source/proposals/dep-0006.rst diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst new file mode 100644 index 0000000000..6c43715c38 --- /dev/null +++ b/documentation/website/source/proposals/dep-0006.rst @@ -0,0 +1,172 @@ +********************* +Single File Libraries +********************* + +============== ============================================= +DEP #: 6 +Type: Standards Track +Author: Carl Gay +Status: Draft +Created: 12-Feb-2013 (Darwin's birthday) +Last-Modified: 12-Feb-2013 +Post-History: None +Dylan-Version: 2012.1 +============== ============================================= + +.. contents:: Contents + :local: + + +Abstract +======== + +Open Dylan currently requires users to create three source files to +define a simple library like hello-world: + +#. A project file (i.e., .lid file) to describe source files to + include, link options, etc. + +#. A library definition source file, often named library.dylan. + +#. At least one source file for main program logic, in a module + defined by the library definition. + +This DEP proposes a standard way to define a Dylan library in a single +source file. This DEP targets implementations of Dylan but does not +propose a change to the Dylan language itself. In particular it is +proposed as an enhancement for Open Dylan. + +Rationale +========= + +The three files described above are a lot of overhead for new users +who want to get a feel for the language, who are generally used to +creating a single file and running it directly, perhaps after +compiling it. A simpler setup would provide a better initial +experience for new users, and would help to make Dylan more attractive +for "scripting" purposes. The mantra has been that Dylan was designed +for large projects, but there's no reason it can't also excel at +scripting, with this change and the right set of support libraries. + +Note that even though the ``make-dylan-app`` program will generate a +skeleton project with three files (and a registry), this does not +remove the need to jump back and forth between the library definition +file and the main source file as you figure out which modules you need +to use. There is also the issue of new users figuring out that +``make-dylan-app`` exists in the first place. + +Goals +===== + +* Make it possible to use the full power of the Dylan module system to + define the library and module for a single-file library. + +* Make all LID file options available in the single-file library + format. + +* Do not introduce any new syntax. + +Background +========== + +A typical hello-world application written in Dylan might look like +this: + +**hello-world.lid** + +.. code-block:: dylan + + Library: hello-world + Files: library.dylan + hello-world.dylan + +**library.dylan** + +.. code-block:: dylan + + Module: dylan-user + + define libary hello-world + use common-dylan; + use io; + end; + + define module hello-world + use common-dylan; + use format-out; + end; + +**hello-world.dylan** + +.. code-block:: dylan + + Module: hello-world + + format-out("Hello, world!\n"); + +Therefore a way to encode their information into a regular dylan +source file is needed. After the implementation of this DEP, the +above library can be defined in a single source file, as follows: + +**hello-world.dylan** + +.. code-block:: dylan + + Module: hello-world + + // ----module def---- + + define libary hello-world + use common-dylan; + use io; + end; + + define module hello-world + use common-dylan; + use format-out; + end; + + // ----main body---- + + format-out("Hello, world!\n"); + +This continues to use the standard `Dylan Interchange Format +`_ as defined +in the DRM, with a set of headers, followed by a blank line, followed +by a *code body*. In the above example comments have been added for +reference to show two logical sections: the module definition and the +main body of the program. + + +Specification +============= + +LID files have the same format as the header section of a Dylan +Interchange Format source file. When defining a Dylan library in a +single source file, all LID keywords may appear in the header section. +The compiler or interpreter should handle them in the same way it +would if they were in a separate .lid file. There is no conflict +between the keywords used in LID files and those used in Dylan source +files. (Is this true? --cgay) + +When a compiler or interpreter is given a .dylan file to compile or +execute it must read the headers and then scan the *code body* for the +library and module definitions. + +If a "Library" header is found, then that is the name of the library +to be generated. Otherwise, the library name is the same as the +module specified in the required "Module" header. + +If no "define library" source record is found having the same name as +that specified in the "Library" (or "Module") header, it is an error. + +If no "define module" is found that has the same name as that +specified in the "Module" header, it is an error. The library and +module definitions should precede any other Dylan code in the *code +body*, but comments are allowed. If there is not exactly one library +definition and one module definition it is an error. + +A single-file library has the same semantics as a multi-file library. +Indeed, one possible (if simplistic) implementation is to generate a +multi-file library from the single file, and compile or execute it in +the normal way. diff --git a/documentation/website/source/proposals/index.rst b/documentation/website/source/proposals/index.rst index 7e60614884..69ea1c726c 100644 --- a/documentation/website/source/proposals/index.rst +++ b/documentation/website/source/proposals/index.rst @@ -25,6 +25,7 @@ Open Proposals (under consideration) ==== ============= ========== ============================================= 1 Process Draft `DEP Purpose and Guidelines `_ (`source <../_sources/proposals/dep-0001.txt>`__) +6 Standard Draft `Single File Libraries `_ (`source <../_sources/proposals/dep-0006.txt>`__) ==== ============= ========== ============================================= @@ -37,4 +38,5 @@ All Proposals by Number 3 Standard Final `C3 superclass linearization `_ (`source <../_sources/proposals/dep-0003.txt>`__) 4 Standard Final `New strings library `_ (`source <../_sources/proposals/dep-0004.txt>`__) 5 Standard Final `Subclass `_ (`source <../_sources/proposals/dep-0005.txt>`__) +6 Standard Draft `Single File Libraries `_ (`source <../_sources/proposals/dep-0006.txt>`__) ==== ============= ========== ============================================= From 78d9b6b7e2bfa83d3cb9d8f1b3ea95661e32d0f0 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sat, 16 Feb 2013 22:46:02 -0500 Subject: [PATCH 242/519] Rewrite using headers to define the library and module. --- .../website/source/proposals/dep-0006.rst | 217 ++++++++++++++---- 1 file changed, 176 insertions(+), 41 deletions(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index 6c43715c38..af80e69f20 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -8,7 +8,7 @@ Type: Standards Track Author: Carl Gay Status: Draft Created: 12-Feb-2013 (Darwin's birthday) -Last-Modified: 12-Feb-2013 +Last-Modified: 16-Feb-2013 Post-History: None Dylan-Version: 2012.1 ============== ============================================= @@ -55,16 +55,42 @@ file and the main source file as you figure out which modules you need to use. There is also the issue of new users figuring out that ``make-dylan-app`` exists in the first place. +There are plenty of libraries that are small enough to comfortably fit +in a single file. Of the existing libraries in `the dylan-lang github +repository `_, at least ten could +comfortably fit in a single file. + +Having a library in a single file simplifies sharing of examples and +small tests. Indeed, one of the motivations for this feature was to +be able to contribute Dylan solutions for the `The Computer Language +Benchmarks Game `_, which +prefers to receive one file per solution. Obviously it is possible to +explain to them about LID files and how to unpack and compile a +multi-file solution for each problem, but it is more complex than it +needs to be. + +This DEP is only the first step to adding better support for +scripting. More is needed, such as supporting "hash bang" lines +(``#!/usr/bin/dylan``) and only recompiling when the source has +changed. + +Gwydion Dylan already supports a simple form of single-file library, +but it has limitations that this DEP removes, specifically the +inability to deal with import conflicts. + + Goals ===== * Make it possible to use the full power of the Dylan module system to - define the library and module for a single-file library. + define a library in a single file. * Make all LID file options available in the single-file library format. -* Do not introduce any new syntax. +* Introduce a minimum of new syntax. It should be obvious to someone + already used to Dylan what's going on. + Background ========== @@ -113,60 +139,169 @@ above library can be defined in a single source file, as follows: .. code-block:: dylan Module: hello-world - - // ----module def---- - - define libary hello-world - use common-dylan; - use io; - end; - - define module hello-world - use common-dylan; - use format-out; - end; - - // ----main body---- + Use-Library: common-dylan + Use-Library: io + Use-Module: common-dylan + Use-Module: format-out format-out("Hello, world!\n"); This continues to use the standard `Dylan Interchange Format `_ as defined in the DRM, with a set of headers, followed by a blank line, followed -by a *code body*. In the above example comments have been added for -reference to show two logical sections: the module definition and the -main body of the program. +by a *code body*. Specification ============= +None of the headers mentioned in this document are case sensitive. + +Replacing the LID File +---------------------- + LID files have the same format as the header section of a Dylan Interchange Format source file. When defining a Dylan library in a single source file, all LID keywords may appear in the header section. The compiler or interpreter should handle them in the same way it would if they were in a separate .lid file. There is no conflict between the keywords used in LID files and those used in Dylan source -files. (Is this true? --cgay) +files. (TODO: Verify this. --cgay) + +Library Header +~~~~~~~~~~~~~~ + +The ``Library`` header is optional in a single-source library. If +present, it defines the name of the library. If missing, the library +name is the same as the module name specified by the ``Module`` +header. + +Files Header +~~~~~~~~~~~~ + +The ``Files`` header should not appear in a single-file library. If +it does, it may be ignored. + + +Replacing library.dylan +----------------------- When a compiler or interpreter is given a .dylan file to compile or -execute it must read the headers and then scan the *code body* for the -library and module definitions. - -If a "Library" header is found, then that is the name of the library -to be generated. Otherwise, the library name is the same as the -module specified in the required "Module" header. - -If no "define library" source record is found having the same name as -that specified in the "Library" (or "Module") header, it is an error. - -If no "define module" is found that has the same name as that -specified in the "Module" header, it is an error. The library and -module definitions should precede any other Dylan code in the *code -body*, but comments are allowed. If there is not exactly one library -definition and one module definition it is an error. - -A single-file library has the same semantics as a multi-file library. -Indeed, one possible (if simplistic) implementation is to generate a -multi-file library from the single file, and compile or execute it in -the normal way. +execute, these new headers should be respected: + +Use-Library Header +~~~~~~~~~~~~~~~~~~ + +The ``Use-Library`` header names a library used by the library being +defined. + +The format of this header is:: + + Use-Library: used-library-name [ , options... ] + +In brief, this is the exact same syntax as a *use-clause* in `define +library +`_, +but with the token ``use`` replaced by the ``Use-Library:`` header +keyword. Examples:: + + Use-Library: system + Use-library: system, import: { operating-system } + +Use-Module Header +~~~~~~~~~~~~~~~~~ + +The ``Use-Module`` header names a module used by the library being +defined. + +The format of this header is:: + + Use-Module: used-module-name [ , options... ] + +Again, this is the exact same syntax as a *use-clause* in `define +module +`_, +but with the token ``use`` replaced by the ``Use-Module:`` header +keyword. Examples:: + + Use-Module: operating-system + use-module: operating-system, import: { exit-application } + use-module: operating-system, + prefix: "os/", + export: all + +Module-Exports Header +~~~~~~~~~~~~~~~~~~~~~ + +The ``Module-Exports`` header specifies a list of names exported from +the module named in the ``Module`` header. The syntax matches the +syntax in the ``exports`` clause of `define module +`_, +but with the token ``exports`` replaced by the ``Module-Exports:`` +header keyword. Examples:: + + Module-Exports: foo, bar, baz + +Because it is only possible to define one module in a single-file +library there is no need for a way to specify which modules are +exported from the library. If the ``Module-Exports`` header is +missing then no modules are exported from the library. If the +``Module-Exports`` header is present then the module named in the +``Module`` header is the sole module exported from the library. + + +Model Implementation +==================== + +A simple (but probably not practical) way to implement this proposal +would be via the following source transformations. This example is +provided primarily to demonstrate that a single-file library has the +same semantics as a multi-file library and to make it clear that the +new headers defined in this proposal have the same syntax as that of +``define library`` and ``define module``. + +#. Generate a LID file that includes all the headers except for + ``Module`` and add a ``Files`` header listing ``library.dylan`` and + ``the-given-file.dylan``. + +#. Generate a ``library.dylan`` file:: + + Module: dylan-user + + define library + use <1st-Use-Library-header-value-here>; + use <2nd-Use-Library-header-value-here>; + ... + export ; + end; + + define module + use <1st-Use-Module-header-value-here>; + use <2nd-Use-Module-header-value-here>; + ... + export ; + end; + + Note the addition of semicolons where necessary. + +#. Compile the generated LID file as usual. + +Cost to Implementors +==================== + +[Someone needs to correct this. I (cgay) am not familiar with the +compiler internals.] + +For the current Open Dylan command-line tools the cost of this +proposal is likely fairly low. It should involve some code to handle +the case where a ".dylan" file is passed on the command line. It will +need to parse the file headers and create a "project" object in memory +with generated source records for the library and module definitions +and a LID file representation. Ideally the compiler will be able to +pinpoint errors in the library and module definitions to the +appropriate header lines. + +The Open Dylan IDE can leverage the work done on the command-line +tools, but no doubt it makes some assumptions about projects always +having LID files. There will be substantial work involved if anyone +wants to support this feature in the IDE. From 3abc322e9f226dc7126290343cfcb672b5d389d9 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Sat, 16 Feb 2013 23:35:21 -0500 Subject: [PATCH 243/519] Update Post-History header. --- documentation/website/source/proposals/dep-0006.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index af80e69f20..3121f76f28 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -9,7 +9,7 @@ Author: Carl Gay Status: Draft Created: 12-Feb-2013 (Darwin's birthday) Last-Modified: 16-Feb-2013 -Post-History: None +Post-History: 16-Feb-2013 hackers@lists.opendylan.org Dylan-Version: 2012.1 ============== ============================================= From bc5cb672bef1cde78afb32cda0fd9765e1f5a50c Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sun, 17 Feb 2013 17:28:23 +0100 Subject: [PATCH 244/519] link to C3 paper changed, old link is dead --- documentation/website/source/documentation/publications.rst | 2 +- documentation/website/source/proposals/dep-0003.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/documentation/publications.rst b/documentation/website/source/documentation/publications.rst index b5415f88f7..7bf9849b01 100644 --- a/documentation/website/source/documentation/publications.rst +++ b/documentation/website/source/documentation/publications.rst @@ -127,7 +127,7 @@ Toby Weinberg - Communications of the ACM May 1998 **A Monotonic Superclass Linearization for Dylan** (by Kim Barrett and Bob Cassels and Paul Haahr and David A. Moon and Keith Playford and P. Tucker Withington at OOPSLA 1996 -`html `__ +`html `__ `bib <../_static/documentation/barrett1996.bib>`__) Object-oriented languages with multiple inheritance and automatic diff --git a/documentation/website/source/proposals/dep-0003.rst b/documentation/website/source/proposals/dep-0003.rst index 4a54b2d407..2298dc42c6 100644 --- a/documentation/website/source/proposals/dep-0003.rst +++ b/documentation/website/source/proposals/dep-0003.rst @@ -34,7 +34,7 @@ The C3 superclass linearization has been proposed in 1996 by Kim Barrett, Bob Cassels, Paul Haahr, David A. Moon, Keith Playford, and P. Tucker Withington in a `paper `_ (`html version -`_). +`_). A superclass linearization (also known as a class precedence list) is used for resolving conflicts among multiply-inherited superclasses From 135c8bbfbdc1ee02859fdb1f58ba2d620b4d90c1 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sun, 17 Feb 2013 17:31:14 +0100 Subject: [PATCH 245/519] remove reference from the news item, it is acceessible via the DEP --- documentation/website/source/news/2012/01/25/c3.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/documentation/website/source/news/2012/01/25/c3.rst b/documentation/website/source/news/2012/01/25/c3.rst index c8bb23c5b4..8aa0d3407d 100644 --- a/documentation/website/source/news/2012/01/25/c3.rst +++ b/documentation/website/source/news/2012/01/25/c3.rst @@ -15,6 +15,4 @@ issued if the new C3 linearization is different from the old `_. Further information is available in the accepted Dylan enhancement -proposal `here `_ and in the original `paper -`_ (`doi -`_). +proposal `here `_. From 7c1c41eafb3dd1a6c8758d4d8bc5b645e13d6232 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 18 Feb 2013 12:04:27 -0500 Subject: [PATCH 246/519] Module-Exports -> Export-Names --- .../website/source/proposals/dep-0006.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index 3121f76f28..8c44273749 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -8,7 +8,7 @@ Type: Standards Track Author: Carl Gay Status: Draft Created: 12-Feb-2013 (Darwin's birthday) -Last-Modified: 16-Feb-2013 +Last-Modified: 17-Feb-2013 Post-History: 16-Feb-2013 hackers@lists.opendylan.org Dylan-Version: 2012.1 ============== ============================================= @@ -230,23 +230,23 @@ keyword. Examples:: prefix: "os/", export: all -Module-Exports Header -~~~~~~~~~~~~~~~~~~~~~ +Export-Names Header +~~~~~~~~~~~~~~~~~~~ -The ``Module-Exports`` header specifies a list of names exported from +The ``Export-Names`` header specifies a list of names exported from the module named in the ``Module`` header. The syntax matches the syntax in the ``exports`` clause of `define module `_, -but with the token ``exports`` replaced by the ``Module-Exports:`` +but with the token ``exports`` replaced by the ``Export-Names:`` header keyword. Examples:: - Module-Exports: foo, bar, baz + Export-Names: foo, bar, baz Because it is only possible to define one module in a single-file library there is no need for a way to specify which modules are -exported from the library. If the ``Module-Exports`` header is +exported from the library. If the ``Export-Names`` header is missing then no modules are exported from the library. If the -``Module-Exports`` header is present then the module named in the +``Export-Names`` header is present then the module named in the ``Module`` header is the sole module exported from the library. @@ -279,7 +279,7 @@ new headers defined in this proposal have the same syntax as that of use <1st-Use-Module-header-value-here>; use <2nd-Use-Module-header-value-here>; ... - export ; + export ; end; Note the addition of semicolons where necessary. From 9eb55441e886ee44ddc2653c6277ece4c5664097 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 18 Feb 2013 12:29:36 -0500 Subject: [PATCH 247/519] Minor changes related to case sensitivity. --- .../website/source/proposals/dep-0006.rst | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index 8c44273749..c594a7ff2d 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -155,8 +155,6 @@ by a *code body*. Specification ============= -None of the headers mentioned in this document are case sensitive. - Replacing the LID File ---------------------- @@ -206,7 +204,7 @@ but with the token ``use`` replaced by the ``Use-Library:`` header keyword. Examples:: Use-Library: system - Use-library: system, import: { operating-system } + Use-Library: system, import: { operating-system } Use-Module Header ~~~~~~~~~~~~~~~~~ @@ -225,8 +223,8 @@ but with the token ``use`` replaced by the ``Use-Module:`` header keyword. Examples:: Use-Module: operating-system - use-module: operating-system, import: { exit-application } - use-module: operating-system, + Use-Module: operating-system, import: { exit-application } + Use-Module: operating-system, prefix: "os/", export: all @@ -253,26 +251,22 @@ missing then no modules are exported from the library. If the Model Implementation ==================== -A simple (but probably not practical) way to implement this proposal +A simple (but not recommended) way to implement this proposal would be via the following source transformations. This example is provided primarily to demonstrate that a single-file library has the same semantics as a multi-file library and to make it clear that the new headers defined in this proposal have the same syntax as that of ``define library`` and ``define module``. -#. Generate a LID file that includes all the headers except for - ``Module`` and add a ``Files`` header listing ``library.dylan`` and - ``the-given-file.dylan``. - #. Generate a ``library.dylan`` file:: Module: dylan-user - define library + define library use <1st-Use-Library-header-value-here>; use <2nd-Use-Library-header-value-here>; ... - export ; + export ; end; define module @@ -284,6 +278,10 @@ new headers defined in this proposal have the same syntax as that of Note the addition of semicolons where necessary. +#. Generate a LID file that includes all the headers except for + ``Module`` and add a ``Files`` header listing ``library.dylan`` and + ``the-given-file.dylan``. + #. Compile the generated LID file as usual. Cost to Implementors From b9bf514ae5b4a18883ccf3d1a43bf20f02474e9f Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 18 Feb 2013 16:42:37 -0500 Subject: [PATCH 248/519] Added link to revision history on github. --- documentation/website/source/proposals/dep-0006.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index c594a7ff2d..6cf131a82c 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -16,6 +16,11 @@ Dylan-Version: 2012.1 .. contents:: Contents :local: +Revision History +================ + +The revision history of this document is available here: +https://github.com/cgay/website/commits/master/source/proposals/dep-0006.rst Abstract ======== @@ -247,7 +252,6 @@ missing then no modules are exported from the library. If the ``Export-Names`` header is present then the module named in the ``Module`` header is the sole module exported from the library. - Model Implementation ==================== From b1f872d4ffa271eca2371a7bd24c1f5e2f73d83a Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 18 Feb 2013 16:58:29 -0500 Subject: [PATCH 249/519] Use-Library/Module --> Use-Libraries/Modules --- .../website/source/proposals/dep-0006.rst | 69 ++++++++++--------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index 6cf131a82c..d1e8ac3e33 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -144,10 +144,8 @@ above library can be defined in a single source file, as follows: .. code-block:: dylan Module: hello-world - Use-Library: common-dylan - Use-Library: io - Use-Module: common-dylan - Use-Module: format-out + Use-Libraries: common-dylan; io + Use-Modules: common-dylan; format-out format-out("Hello, world!\n"); @@ -192,46 +190,55 @@ Replacing library.dylan When a compiler or interpreter is given a .dylan file to compile or execute, these new headers should be respected: -Use-Library Header -~~~~~~~~~~~~~~~~~~ +Use-Libraries Header +~~~~~~~~~~~~~~~~~~~~ -The ``Use-Library`` header names a library used by the library being +The ``Use-Libraries`` header names libraries used by the library being defined. The format of this header is:: - Use-Library: used-library-name [ , options... ] + Use-Libraries: libspec1 ; libspec2 ; ... -In brief, this is the exact same syntax as a *use-clause* in `define -library +In brief, each *libspec* has the exact same syntax as a *use-clause* +in `define library `_, -but with the token ``use`` replaced by the ``Use-Library:`` header -keyword. Examples:: +but with the leading token ``use`` removed. Examples:: + + Use-Libraries: system; io { import: streams, format-out}; common-dylan + Use-Libraries: + system; + io { import: streams, format-out}; + common-dylan - Use-Library: system - Use-Library: system, import: { operating-system } +Note that Dylan source code comments are allowed in this header, and +must be ignored. -Use-Module Header -~~~~~~~~~~~~~~~~~ +Use-Modules Header +~~~~~~~~~~~~~~~~~~ -The ``Use-Module`` header names a module used by the library being +The ``Use-Modules`` header names modules used by the library being defined. The format of this header is:: - Use-Module: used-module-name [ , options... ] + Use-Modules: modspec1 ; modspec2 ; ... -Again, this is the exact same syntax as a *use-clause* in `define -module +Again, each *modspec* has the exact same syntax as a *use-clause* in +`define module `_, -but with the token ``use`` replaced by the ``Use-Module:`` header -keyword. Examples:: +but with the leading token ``use`` removed. Examples:: + + Use-Modules: operating-system; common-dylan; format-out + Use-Modules: + operating-system, // from system + prefix: "os/", + export: all; + common-dylan; + format-out // from io - Use-Module: operating-system - Use-Module: operating-system, import: { exit-application } - Use-Module: operating-system, - prefix: "os/", - export: all +Note that Dylan source code comments are allowed in this header, and +must be ignored. Export-Names Header ~~~~~~~~~~~~~~~~~~~ @@ -267,15 +274,15 @@ new headers defined in this proposal have the same syntax as that of Module: dylan-user define library - use <1st-Use-Library-header-value-here>; - use <2nd-Use-Library-header-value-here>; + use libspec1; + use libspec2; ... export ; end; define module - use <1st-Use-Module-header-value-here>; - use <2nd-Use-Module-header-value-here>; + use modspec1 + use modspec2 ... export ; end; From b6a8fe4f622cf9761f5ad04784b23f3c852e9fb9 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 18 Feb 2013 17:31:40 -0500 Subject: [PATCH 250/519] Update Post-History header. --- documentation/website/source/proposals/dep-0006.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index d1e8ac3e33..32f94b5d4f 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -9,7 +9,7 @@ Author: Carl Gay Status: Draft Created: 12-Feb-2013 (Darwin's birthday) Last-Modified: 17-Feb-2013 -Post-History: 16-Feb-2013 hackers@lists.opendylan.org +Post-History: 17-Feb-2013 hackers@lists.opendylan.org Dylan-Version: 2012.1 ============== ============================================= From e67c2c72493b8026e599e73558648a5a377e4eea Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 18 Feb 2013 19:09:24 -0500 Subject: [PATCH 251/519] Fix revision history link. --- documentation/website/source/proposals/dep-0006.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index 32f94b5d4f..343c84b73e 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -20,7 +20,7 @@ Revision History ================ The revision history of this document is available here: -https://github.com/cgay/website/commits/master/source/proposals/dep-0006.rst +https://github.com/dylan-lang/website/commits/master/source/proposals/dep-0006.rst Abstract ======== From c63e3da77bf5facba4eefdfc047ddaa3a4d2fe10 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 18 Feb 2013 20:15:08 -0500 Subject: [PATCH 252/519] Remove TODO comment about verifying no header conflicts. --- documentation/website/source/proposals/dep-0006.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/website/source/proposals/dep-0006.rst b/documentation/website/source/proposals/dep-0006.rst index 343c84b73e..9733209882 100644 --- a/documentation/website/source/proposals/dep-0006.rst +++ b/documentation/website/source/proposals/dep-0006.rst @@ -167,7 +167,8 @@ single source file, all LID keywords may appear in the header section. The compiler or interpreter should handle them in the same way it would if they were in a separate .lid file. There is no conflict between the keywords used in LID files and those used in Dylan source -files. (TODO: Verify this. --cgay) +files. See http://opendylan.org/documentation/library-reference/lid.html +for existing Open Dylan LID file keywords. Library Header ~~~~~~~~~~~~~~ From 2dd06356f469c311242edff5807672e6366f0640 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Wed, 20 Feb 2013 13:49:56 -0500 Subject: [PATCH 253/519] Fix grammar-o in home page, plus some word-smithing while I'm here. --- documentation/website/source/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index 9ac55fa67e..fe84f11670 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -43,12 +43,12 @@ The `Dylan Foundry `_ has written about Dylan has a large amount of documentation available: * `Introduction to Dylan `_: - A tutorial is written primarily for those with solid programming + A tutorial written for those with solid programming experience in C++ or another object-oriented, static language. It provides a gentler introduction to Dylan than does the Dylan Reference Manual (DRM). * `Dylan Programming Guide `_: - A good, book length Dylan tutorial by several Harlequin employees. + A book length Dylan tutorial. * `Dylan Reference Manual `_: The official definition of the Dylan language and standard library. * `Open Dylan Documentation `_: From 604713522be9e60700b08a4382f092cdfb6ec683 Mon Sep 17 00:00:00 2001 From: fracek Date: Fri, 22 Feb 2013 10:03:48 +0100 Subject: [PATCH 254/519] Add carousel containing Dylan code samples --- .../static/opendylan.org/css/opendylan.css | 20 +++++ documentation/website/source/index.rst | 87 ++++++++++++++++--- 2 files changed, 97 insertions(+), 10 deletions(-) diff --git a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css index 796d96e262..999dc1647b 100644 --- a/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css +++ b/documentation/website/source/_themes/opendylan/static/opendylan.org/css/opendylan.css @@ -25,6 +25,26 @@ footer.navbar { a.headerlink { color: silver; } +#code-carousel { + margin: 10px 0; +} +#code-carousel .carousel-inner { + margin: 0 70px; + width: auto; +} +#code-carousel .carousel-indicators { + margin-right: 70px; +} +#code-carousel .carousel-indicators li { + background-color: #EFEFEF; +} +#code-carousel .carousel-indicators li.active { + background-color: #D0D0D0; +} +#code-carousel pre { + height: 29em; + padding-top: 20px; +} /* Responsive Docs -------------------------------------------------- */ diff --git a/documentation/website/source/index.rst b/documentation/website/source/index.rst index fe84f11670..bb0cadb402 100644 --- a/documentation/website/source/index.rst +++ b/documentation/website/source/index.rst @@ -3,16 +3,83 @@
              -
              -

              Dylan is an advanced, object-oriented, dynamic language which - supports rapid program development. When needed, programs can be - optimized for more efficient execution by supplying more type - information to the compiler. Nearly all entities in Dylan - (including functions, classes, and basic data types such as - integers) are first class objects. Additionally Dylan supports - multiple inheritance, polymorphism, multiple dispatch, keyword - arguments, object introspection, macros, and many other advanced - features... --Peter Hinely

              +
              ","
              "],tr:[2,"","
              "],td:[3,"","
              "],col:[2,"","
              "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
              ","
              "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() -{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
              ").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); +/*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0; +}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="
              a",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,"
              ","
              "],area:[1,"",""],param:[1,"",""],thead:[1,"","
              "],tr:[2,"","
              "],col:[2,"","
              "],td:[3,"","
              "],_default:l.htmlSerialize?[0,"",""]:[1,"X
              ","
              "]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?""!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("