Permalink
Browse files

Doshboard fixed as the latest layout shows

  • Loading branch information...
1 parent f3dd588 commit 7b769041beb291758af2bfe8afc932c5301fae4d Filippo committed Jun 17, 2010
Showing with 20,429 additions and 2,615 deletions.
  1. +1 −1 apps/fe/config/settings.yml
  2. +1 −1 apps/fe/config/view.yml
  3. +0 −49 apps/fe/modules/sfGuardAuth/actions/actions.class.php
  4. +0 −32 apps/fe/modules/sfGuardGroup/actions/components.class.php
  5. +0 −18 apps/fe/modules/sfGuardGroup/templates/_sidebar.php
  6. +0 −32 apps/fe/modules/sfGuardPermission/actions/components.class.php
  7. +0 −18 apps/fe/modules/sfGuardPermission/templates/_sidebar.php
  8. +0 −32 apps/fe/modules/sfGuardUser/actions/components.class.php
  9. +0 −18 apps/fe/modules/sfGuardUser/templates/_sidebar.php
  10. +0 −29 apps/fe/modules/sfGuardUser/templates/showSuccess.php
  11. +0 −7 apps/fe/templates/_admin_navigation.php
  12. +0 −12 apps/fe/templates/_main_navigation.php
  13. +43 −49 apps/fe/templates/layout.php
  14. BIN data/phpcollab_unit_test.db
  15. +3 −0 doc/layout/index.php
  16. +164 −0 doc/layout/wireframe/_dashboard-admin.html
  17. +34 −34 doc/layout/wireframe/blueprint/ie.css
  18. +391 −197 doc/layout/wireframe/blueprint/liquid.css
  19. +1 −2 doc/layout/wireframe/blueprint/print.css
  20. +258 −13 doc/layout/wireframe/blueprint/screen.css
  21. +16 −16 doc/layout/wireframe/blueprint/src/forms.css
  22. +44 −45 doc/layout/wireframe/blueprint/src/grid.css
  23. BIN doc/layout/wireframe/blueprint/src/grid.png
  24. +76 −76 doc/layout/wireframe/blueprint/src/ie.css
  25. +7 −7 doc/layout/wireframe/blueprint/src/print.css
  26. +13 −6 doc/layout/wireframe/blueprint/src/reset.css
  27. +14 −13 doc/layout/wireframe/blueprint/src/typography.css
  28. +13 −16 doc/layout/wireframe/calendar.html
  29. +12 −0 doc/layout/wireframe/custom-update.css
  30. +386 −94 doc/layout/wireframe/custom.css
  31. +81 −133 doc/layout/wireframe/dashboard-admin.html
  32. +90 −141 doc/layout/wireframe/dashboard-customer.html
  33. +128 −183 doc/layout/wireframe/dashboard-developer.html
  34. +143 −195 doc/layout/wireframe/dashboard-pm.html
  35. BIN doc/layout/wireframe/images/icons/16-ball-blue.png
  36. BIN doc/layout/wireframe/images/icons/16-ball-green.png
  37. BIN doc/layout/wireframe/images/icons/16-ball-grey.png
  38. BIN doc/layout/wireframe/images/icons/16-ball-red.png
  39. BIN doc/layout/wireframe/images/icons/16-ball-yellow.png
  40. BIN doc/layout/wireframe/images/icons/16-comment.png
  41. BIN doc/layout/wireframe/images/icons/16-data.png
  42. BIN doc/layout/wireframe/images/icons/16-flag-blue.png
  43. BIN doc/layout/wireframe/images/icons/16-flag-green.png
  44. BIN doc/layout/wireframe/images/icons/16-flag-grey.png
  45. BIN doc/layout/wireframe/images/icons/16-flag-red.png
  46. BIN doc/layout/wireframe/images/icons/16-flag-yellow.png
  47. BIN doc/layout/wireframe/images/icons/16-folder.png
  48. BIN doc/layout/wireframe/images/icons/16-group.png
  49. BIN doc/layout/wireframe/images/icons/16-mic.png
  50. BIN doc/layout/wireframe/images/icons/16-money.png
  51. BIN doc/layout/wireframe/images/icons/16-paperclip.png
  52. BIN doc/layout/wireframe/images/icons/16-play.png
  53. BIN doc/layout/wireframe/images/icons/20-cal.png
  54. BIN doc/layout/wireframe/images/temp-cal.jpg
  55. +346 −0 doc/layout/wireframe/lq-custom.css
  56. +158 −0 doc/layout/wireframe/lq-dashboard-admin.html
  57. +4,724 −0 doc/layout/wireframe/master.html
  58. +18 −12 doc/layout/wireframe/messages.html
  59. +7 −12 doc/layout/wireframe/my-admin-projects.html
  60. +8 −13 doc/layout/wireframe/my-flagged.html
  61. +8 −13 doc/layout/wireframe/my-lists.html
  62. +8 −13 doc/layout/wireframe/my-projects.html
  63. +6 −11 doc/layout/wireframe/page-template.html
  64. +12 −16 doc/layout/wireframe/project-add.html
  65. +290 −0 doc/layout/wireframe/project-calendar.html
  66. +35 −38 doc/layout/wireframe/project-dashboard-admin-edit.html
  67. +25 −28 doc/layout/wireframe/project-dashboard-admin.html
  68. +61 −98 doc/layout/wireframe/project-dashboard.html
  69. +55 −76 doc/layout/wireframe/project-discussions.html
  70. +24 −26 doc/layout/wireframe/project-files.html
  71. +38 −30 doc/layout/wireframe/project-list.html
  72. +142 −0 doc/layout/wireframe/project-milestone-add.html
  73. +38 −36 doc/layout/wireframe/project-milestone-list.html
  74. +13 −16 doc/layout/wireframe/project-milestones-alt.html
  75. +148 −79 doc/layout/wireframe/project-milestones.html
  76. +25 −18 doc/layout/wireframe/project-notes.html
  77. +13 −17 doc/layout/wireframe/project-repo.html
  78. +13 −17 doc/layout/wireframe/project-settings.html
  79. +13 −17 doc/layout/wireframe/project-single-discussion.html
  80. +18 −21 doc/layout/wireframe/project-staff.html
  81. +13 −17 doc/layout/wireframe/project-template.html
  82. +72 −27 doc/layout/wireframe/project-ticket-add.html
  83. +21 −21 doc/layout/wireframe/project-ticket-open.html
  84. +9 −14 doc/layout/wireframe/project-ticket-report.html
  85. +112 −29 doc/layout/wireframe/project-tickets.html
  86. +26 −31 doc/layout/wireframe/project-time-client.html
  87. +29 −34 doc/layout/wireframe/project-time-developer.html
  88. +29 −34 doc/layout/wireframe/project-time-pm.html
  89. +13 −16 doc/layout/wireframe/project-todo.html
  90. +41 −0 doc/layout/wireframe/schematic/.svn/all-wcprops
  91. +232 −0 doc/layout/wireframe/schematic/.svn/entries
  92. +97 −0 doc/layout/wireframe/schematic/.svn/text-base/buttons.css.svn-base
  93. +73 −0 doc/layout/wireframe/schematic/.svn/text-base/forms.css.svn-base
  94. +328 −0 doc/layout/wireframe/schematic/.svn/text-base/grid.css.svn-base
  95. +34 −0 doc/layout/wireframe/schematic/.svn/text-base/reset.css.svn-base
  96. +60 −0 doc/layout/wireframe/schematic/.svn/text-base/tabs.css.svn-base
  97. +204 −0 doc/layout/wireframe/schematic/.svn/text-base/typography.css.svn-base
  98. +97 −0 doc/layout/wireframe/schematic/buttons.css
  99. +73 −0 doc/layout/wireframe/schematic/forms.css
  100. +328 −0 doc/layout/wireframe/schematic/grid.css
  101. +34 −0 doc/layout/wireframe/schematic/reset.css
  102. +60 −0 doc/layout/wireframe/schematic/tabs.css
  103. +204 −0 doc/layout/wireframe/schematic/typography.css
  104. +18 −23 doc/layout/wireframe/settings.html
  105. +3,387 −0 doc/layout/wireframe/temp.html
  106. +215 −293 doc/layout/wireframe/time.html
  107. +149 −0 doc/layout/wireframe/updated/.svn/all-wcprops
  108. +853 −0 doc/layout/wireframe/updated/.svn/entries
  109. +13 −0 doc/layout/wireframe/updated/.svn/text-base/content-calendar.php.svn-base
  110. +162 −0 doc/layout/wireframe/updated/.svn/text-base/content-dashboard.php.svn-base
  111. +13 −0 doc/layout/wireframe/updated/.svn/text-base/content-messages.php.svn-base
  112. +13 −0 doc/layout/wireframe/updated/.svn/text-base/content-projects-open.php.svn-base
  113. +73 −0 doc/layout/wireframe/updated/.svn/text-base/content-projects.php.svn-base
  114. +98 −0 doc/layout/wireframe/updated/.svn/text-base/content-time.php.svn-base
  115. +13 −0 doc/layout/wireframe/updated/.svn/text-base/content-todo.php.svn-base
  116. +13 −0 doc/layout/wireframe/updated/.svn/text-base/content-users.php.svn-base
  117. +460 −0 doc/layout/wireframe/updated/.svn/text-base/content.php.svn-base
  118. +257 −0 doc/layout/wireframe/updated/.svn/text-base/custom.css.svn-base
  119. +5 −0 doc/layout/wireframe/updated/.svn/text-base/footer.php.svn-base
  120. +47 −0 doc/layout/wireframe/updated/.svn/text-base/header.php.svn-base
  121. +50 −0 doc/layout/wireframe/updated/.svn/text-base/index.php.svn-base
  122. +11 −0 doc/layout/wireframe/updated/.svn/text-base/pagenav.php.svn-base
  123. +188 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar-calendar.php.svn-base
  124. +108 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar-dashboard.php.svn-base
  125. +188 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar-messages.php.svn-base
  126. +110 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar-projects-list.php.svn-base
  127. +110 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar-projects.php.svn-base
  128. +26 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar-time.php.svn-base
  129. +188 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar-todo.php.svn-base
  130. +188 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar-users.php.svn-base
  131. +188 −0 doc/layout/wireframe/updated/.svn/text-base/sidebar.php.svn-base
  132. +463 −0 doc/layout/wireframe/updated/.svn/text-base/template.php.svn-base
  133. +13 −0 doc/layout/wireframe/updated/content-calendar.php
  134. +162 −0 doc/layout/wireframe/updated/content-dashboard.php
  135. +13 −0 doc/layout/wireframe/updated/content-messages.php
  136. +13 −0 doc/layout/wireframe/updated/content-projects-open.php
  137. +73 −0 doc/layout/wireframe/updated/content-projects.php
  138. +98 −0 doc/layout/wireframe/updated/content-time.php
  139. +13 −0 doc/layout/wireframe/updated/content-todo.php
  140. +13 −0 doc/layout/wireframe/updated/content-users.php
  141. +460 −0 doc/layout/wireframe/updated/content.php
  142. +257 −0 doc/layout/wireframe/updated/custom.css
  143. +5 −0 doc/layout/wireframe/updated/footer.php
  144. +47 −0 doc/layout/wireframe/updated/header.php
  145. +101 −0 doc/layout/wireframe/updated/images/.svn/all-wcprops
  146. +575 −0 doc/layout/wireframe/updated/images/.svn/entries
  147. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/adam-patterson.png.svn-base
  148. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/arrow-left.png.svn-base
  149. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/arrow-right.png.svn-base
  150. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/bg-header.png.svn-base
  151. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/bg.png.svn-base
  152. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/button-cap-sprite.png.svn-base
  153. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/button-sprite.png.svn-base
  154. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/menu-headers.gif.svn-base
  155. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/pagination-left.png.svn-base
  156. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/pagination-right.png.svn-base
  157. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/search-gradient.png.svn-base
  158. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/search-sprite-orig.png.svn-base
  159. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/search-sprite-working.png.svn-base
  160. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/search-sprite.png.svn-base
  161. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/temp-cal.jpg.svn-base
  162. +5 −0 doc/layout/wireframe/updated/images/.svn/prop-base/temp-markitup.png.svn-base
  163. BIN doc/layout/wireframe/updated/images/.svn/text-base/adam-patterson.png.svn-base
  164. BIN doc/layout/wireframe/updated/images/.svn/text-base/arrow-left.png.svn-base
  165. BIN doc/layout/wireframe/updated/images/.svn/text-base/arrow-right.png.svn-base
  166. BIN doc/layout/wireframe/updated/images/.svn/text-base/bg-header.png.svn-base
  167. BIN doc/layout/wireframe/updated/images/.svn/text-base/bg.png.svn-base
  168. BIN doc/layout/wireframe/updated/images/.svn/text-base/button-cap-sprite.png.svn-base
  169. BIN doc/layout/wireframe/updated/images/.svn/text-base/button-sprite.png.svn-base
  170. BIN doc/layout/wireframe/updated/images/.svn/text-base/menu-headers.gif.svn-base
  171. BIN doc/layout/wireframe/updated/images/.svn/text-base/pagination-left.png.svn-base
  172. BIN doc/layout/wireframe/updated/images/.svn/text-base/pagination-right.png.svn-base
  173. BIN doc/layout/wireframe/updated/images/.svn/text-base/search-gradient.png.svn-base
  174. BIN doc/layout/wireframe/updated/images/.svn/text-base/search-sprite-orig.png.svn-base
  175. BIN doc/layout/wireframe/updated/images/.svn/text-base/search-sprite-working.png.svn-base
  176. BIN doc/layout/wireframe/updated/images/.svn/text-base/search-sprite.png.svn-base
  177. BIN doc/layout/wireframe/updated/images/.svn/text-base/temp-cal.jpg.svn-base
  178. BIN doc/layout/wireframe/updated/images/.svn/text-base/temp-markitup.png.svn-base
  179. BIN doc/layout/wireframe/updated/images/adam-patterson.png
  180. BIN doc/layout/wireframe/updated/images/arrow-left.png
  181. BIN doc/layout/wireframe/updated/images/arrow-right.png
  182. BIN doc/layout/wireframe/updated/images/bg-header.png
  183. BIN doc/layout/wireframe/updated/images/bg.png
  184. BIN doc/layout/wireframe/updated/images/button-cap-sprite.png
  185. BIN doc/layout/wireframe/updated/images/button-sprite.png
  186. +545 −0 doc/layout/wireframe/updated/images/icons/.svn/all-wcprops
Sorry, we could not display the entire diff because too many files (1,438) changed.
View
2 apps/fe/config/settings.yml
@@ -53,7 +53,7 @@ all:
i18n: true
default_culture: en
charset: utf-8
- standard_helpers: [I18N, Form, Partial, Date, idPagination, idGanttShow]
+ standard_helpers: [I18N, Form, Partial, Date, idPagination]
compat_10: true
login_module: sfGuardAuth
View
2 apps/fe/config/view.yml
@@ -9,7 +9,7 @@ default:
#language: en
#robots: index, follow
- stylesheets: [blueprint/screen.css, custom.css]
+ stylesheets: [schematic/grid.css, schematic/reset.css, schematic/typography.css, custom.css, custom-update.css, custom-prod.css]
#javascripts: [jquery-1.3.1.min.js, jquery-ui-sortable-1.6rc6.min.js]
javascripts: [jquery-1.4.2.min.js, jquery-ui-1.8.custom.min.js]
View
49 apps/fe/modules/sfGuardAuth/actions/actions.class.php
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * This file is part of the phpCollab3 package.
- * (c) 2009 Ideato s.r.l. <phpcollab@ideato.it>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * sfGuardAuth/action.class.php
- *
- * @package phpCollab3
- * @subpackage idProjectManagementPlugin Modules
- */
-
-/**
- *
- */
-require_once(sfConfig::get('sf_plugins_dir').'/sfDoctrineGuardPlugin/modules/sfGuardAuth/lib/BasesfGuardAuthActions.class.php');
-
-/**
- * sfGuardAuth actions
- *
- * @package phpCollab3
- * @subpackage idProjectManagementPlugin Modules
- * @author Filippo (p16) de Santis <fd@ideato.it>
- */
-class sfGuardAuthActions extends BasesfGuardAuthActions
-{
- /**
- * Set the referer of the incoming user and show the signin page
- *
- * @param sfWebRequest $request
- */
- public function executeSignin($request)
- {
- $this->getUser()->setReferer($request->getUri());
-
- parent::executeSignin($request);
- }
-
- /**
- * Sets the status code of the page to 403
- */
- public function executeSecure($request)
- {
- $this->getResponse()->setStatusCode(403);
- }
-}
View
32 apps/fe/modules/sfGuardGroup/actions/components.class.php
@@ -1,32 +0,0 @@
-<?php
-/**
- * This file is part of the phpCollab3 package.
- * (c) 2009 Ideato s.r.l. <phpcollab@ideato.it>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * sfGuardGroup/components.class.php
- *
- * @package phpCollab3
- * @subpackage idProjectManagementPlugin Modules
- */
-
-/**
- * sfGuardGroup Components
- *
- * @package phpCollab3
- * @subpackage idProjectManagementPlugin Modules
- * @author Filippo (p16) de Santis <fd@ideato.it>
- */
-class sfGuardGroupComponents extends sfComponents
-{
- /**
- * Does nothing
- */
- public function executeSidebar()
- {
-
- }
-}
-?>
View
18 apps/fe/modules/sfGuardGroup/templates/_sidebar.php
@@ -1,18 +0,0 @@
-<div id="sidebar">
- <div class="block">
- <h3><?php echo __('Simple Block') ?></h3>
- <div class="content">
- <p><?php echo __('Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.') ?></p>
- </div>
- </div>
- <div class="block notice">
- <h4><?php echo __('Notice Title') ?></h4>
- <p><?php echo __('Morbi posuere urna vitae nunc. Curabitur ultrices, lorem ac aliquam blandit, lectus eros hendrerit eros, at eleifend libero ipsum hendrerit urna. Suspendisse viverra. Morbi ut magna. Praesent id ipsum. Sed feugiat ipsum ut felis. Fusce vitae nibh sed risus commodo pulvinar. Duis ut dolor. Cras ac erat pulvinar tortor porta sodales. Aenean tempor venenatis dolor.') ?></p>
- </div>
- <div class="block">
- <div class="sidebar-block">
- <h4><?php echo __('Sidebar Inner block Title') ?></h4>
- <p><?php echo __('Morbi posuere urna vitae nunc. Curabitur ultrices, lorem ac <a href="#">aliquam blandit</a>, lectus eros hendrerit eros, at eleifend libero ipsum hendrerit urna. Suspendisse viverra. Morbi ut magna. Praesent id ipsum. Sed feugiat ipsum ut felis. Fusce vitae nibh sed risus commodo pulvinar. Duis ut dolor. Cras ac erat pulvinar tortor porta sodales. Aenean tempor venenatis dolor.') ?></p>
- </div>
- </div>
-</div>
View
32 apps/fe/modules/sfGuardPermission/actions/components.class.php
@@ -1,32 +0,0 @@
-<?php
-/**
- * This file is part of the phpCollab3 package.
- * (c) 2009 Ideato s.r.l. <phpcollab@ideato.it>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * sfGuardPermission/components.class.php
- *
- * @package phpCollab3
- * @subpackage idProjectManagementPlugin Modules
- */
-
-/**
- * sfGuardPermission Components
- *
- * @package phpCollab3
- * @subpackage idProjectManagementPlugin Modules
- * @author Filippo (p16) de Santis <fd@ideato.it>
- */
-class sfGuardPermissionComponents extends sfComponents
-{
- /**
- * Does nothing
- */
- public function executeSidebar()
- {
-
- }
-}
-?>
View
18 apps/fe/modules/sfGuardPermission/templates/_sidebar.php
@@ -1,18 +0,0 @@
-<div id="sidebar">
- <div class="block">
- <h3><?php echo __('Simple Block') ?></h3>
- <div class="content">
- <p><?php echo __('Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.') ?></p>
- </div>
- </div>
- <div class="block notice">
- <h4><?php echo __('Notice Title') ?></h4>
- <p><?php echo __('Morbi posuere urna vitae nunc. Curabitur ultrices, lorem ac aliquam blandit, lectus eros hendrerit eros, at eleifend libero ipsum hendrerit urna. Suspendisse viverra. Morbi ut magna. Praesent id ipsum. Sed feugiat ipsum ut felis. Fusce vitae nibh sed risus commodo pulvinar. Duis ut dolor. Cras ac erat pulvinar tortor porta sodales. Aenean tempor venenatis dolor.') ?></p>
- </div>
- <div class="block">
- <div class="sidebar-block">
- <h4><?php echo __('Sidebar Inner block Title') ?></h4>
- <p><?php echo __('Morbi posuere urna vitae nunc. Curabitur ultrices, lorem ac <a href="#">aliquam blandit</a>, lectus eros hendrerit eros, at eleifend libero ipsum hendrerit urna. Suspendisse viverra. Morbi ut magna. Praesent id ipsum. Sed feugiat ipsum ut felis. Fusce vitae nibh sed risus commodo pulvinar. Duis ut dolor. Cras ac erat pulvinar tortor porta sodales. Aenean tempor venenatis dolor.') ?></p>
- </div>
- </div>
-</div>
View
32 apps/fe/modules/sfGuardUser/actions/components.class.php
@@ -1,32 +0,0 @@
-<?php
-/**
- * This file is part of the phpCollab3 package.
- * (c) 2009 Ideato s.r.l. <phpcollab@ideato.it>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * sfGuardUser/components.class.php
- *
- * @package phpCollab3
- * @subpackage idProjectManagementPlugin Modules
- */
-
-/**
- * sfGuardUser Components
- *
- * @package phpCollab3
- * @subpackage idProjectManagementPlugin Modules
- * @author Filippo (p16) de Santis <fd@ideato.it>
- */
-class sfGuardUserComponents extends sfComponents
-{
- /**
- * Does nothing
- */
- public function executeSidebar()
- {
-
- }
-}
-?>
View
18 apps/fe/modules/sfGuardUser/templates/_sidebar.php
@@ -1,18 +0,0 @@
-<div id="sidebar">
- <div class="block">
- <h3><?php echo __('Simple Block') ?></h3>
- <div class="content">
- <p><?php echo __('Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.') ?></p>
- </div>
- </div>
- <div class="block notice">
- <h4><?php echo __('Notice Title') ?></h4>
- <p><?php echo __('Morbi posuere urna vitae nunc. Curabitur ultrices, lorem ac aliquam blandit, lectus eros hendrerit eros, at eleifend libero ipsum hendrerit urna. Suspendisse viverra. Morbi ut magna. Praesent id ipsum. Sed feugiat ipsum ut felis. Fusce vitae nibh sed risus commodo pulvinar. Duis ut dolor. Cras ac erat pulvinar tortor porta sodales. Aenean tempor venenatis dolor.') ?></p>
- </div>
- <div class="block">
- <div class="sidebar-block">
- <h4><?php echo __('Sidebar Inner block Title') ?></h4>
- <p><?php echo __('Morbi posuere urna vitae nunc. Curabitur ultrices, lorem ac <a href="#">aliquam blandit</a>, lectus eros hendrerit eros, at eleifend libero ipsum hendrerit urna. Suspendisse viverra. Morbi ut magna. Praesent id ipsum. Sed feugiat ipsum ut felis. Fusce vitae nibh sed risus commodo pulvinar. Duis ut dolor. Cras ac erat pulvinar tortor porta sodales. Aenean tempor venenatis dolor.') ?></p>
- </div>
- </div>
-</div>
View
29 apps/fe/modules/sfGuardUser/templates/showSuccess.php
@@ -1,29 +0,0 @@
-<?php slot('title', __('User\'s Details')) ?>
-
-
-<div class="block" id="user-table">
- <div class="content">
- <h2 class="title"><?php echo $user ?></h2>
- <div class="inner">
- <table class="table">
- <tr>
- <th class="first"><?php echo __('Id') ?></th>
- <th><?php echo __('Username') ?></th>
- <th><?php echo __('First Name') ?></th>
- <th><?php echo __('Last Name') ?></th>
- <th><?php echo __('Email') ?></th>
- <th class="last">&nbsp;</th>
- </tr>
-
- <tr class="odd">
- <td><?php echo $sf_user->isAdmin() ? link_to($user->getid(),'@sf_guard_user_edit?id='.$user->getId()) : $user->getid(); ?></td>
- <td><?php echo $user->getUsername() ?></td>
- <td><?php echo $user->Profile->getFirstName() ?></td>
- <td><?php echo $user->Profile->getLastName() ?></td>
- <td><?php echo $user->Profile->getEmail() ?></td>
- <td>&nbsp;</td>
- </tr>
- </table>
- </div>
- </div>
-</div>
View
7 apps/fe/templates/_admin_navigation.php
@@ -1,7 +0,0 @@
-<li><?php echo link_to(__('Users'), '@sf_guard_user') ?></li>
-<li><?php echo link_to(__('Groups'), '@sf_guard_group') ?></li>
-<li><?php echo link_to(__('Permissions'), '@sf_guard_permission') ?></li>
-<li><?php echo link_to(__('Priorities'), '@index_priority') ?></li>
-<li><?php echo link_to(__('Statuses'), '@index_status') ?></li>
-<li><?php echo link_to(__('Trackers'), '@index_trackers') ?></li>
-<li><?php echo link_to(__('Logtime'), '@index_logtime') ?></li>
View
12 apps/fe/templates/_main_navigation.php
@@ -1,12 +0,0 @@
-<ul>
-<li class="first active"><?php echo link_to(__('Home'), '@homepage') ?></li>
-<?php if ($sf_guard_user->isAuthenticated()): ?>
- <li><?php echo link_to(__('Repository'), '@show_revisions') ?></li>
-
- <li><?php echo link_to(__($sf_guard_user->isAdmin() ? 'All Projects' : 'My Projects'), '@index_project') ?></li>
-
- <?php if ($sf_guard_user->isAdmin()): ?>
- <?php include_partial('global/admin_navigation') ?>
- <?php endif;?>
-<?php endif;?>
-</ul>
View
92 apps/fe/templates/layout.php
@@ -6,68 +6,62 @@
<?php include_title() ?>
<?php include_javascripts() ?>
<?php include_stylesheets() ?>
+ <link rel="stylesheet" href="blueprint/print.css" type="text/css" media="print" />
<link rel="shortcut icon" href="/favicon.ico" />
<title><?php include_slot('title') ?></title>
</head>
<body>
- <div class="container wrapper">
- <?php if ($sf_user->isAuthenticated()) : ?>
- <div class="span-24 container last utility-nav right">
- Hello, <?php echo link_to($sf_user->getUsername(), '@edit_profile') ?> <a href="<?php echo url_for('@sf_guard_signout') ?>" class="utilLogout">Logout</a> <a href="#" class="utilSettings">Settings</a> <a href="#" class="utilHelp">Help</a>
- <select>
- <option>One</option>
- </select>
- </div>
- <div class="span-24 container last header">
- <div class="span-15 title"><?php include_slot('title') ?></div>
- <div id="header-search" class="search-box span-7 utility-search last right">
- <form id="main-search-form" action="index.php?page=list" method="post">
- <div class="search-button">
- <input class="submit" value="" type="submit" />
- </div>
- <div class="center">
- <input class="search placeholder" name="search" title="Search for a Contact" value="" type="text" />
- </div>
- <div class="left"> </div>
- </form>
+ <div class="site-bg">
+ <div class="container">
+ <?php if ($sf_user->isAuthenticated()) : ?>
+ <div id="utility" class="showgrid-off">
+ Hello, <?php echo link_to($sf_user->getUsername(), '@edit_profile') ?> <a href="<?php echo url_for('@sf_guard_signout') ?>" class="login">Logout</a> <a href="#" class="settings">Settings</a> <a href="#" class="help">Help</a>
+ <select>
+ <?php foreach($sf_user->getMyProjects() as $project): ?>
+ <option><?php echo $project->name ?></option>
+ <?php endforeach;?>
+ </select>
</div>
- </div>
- <div class="span-24 main_menu last">
- <div class="span-18 navigation">
+
+ <div id="header">
+ <div id="application-title"><?php include_slot('title') ?></div>
+ <div id="header-search" class="search-box utility-search right">
+ <form id="main-search-form" action="#" method="post">
+ <div class="search-button">
+ <input class="submit" value="" type="submit" />
+ </div>
+ <div class="center">
+ <input class="search placeholder" name="search" title="Search" value="" type="text" />
+ </div>
+ <div class="left"> </div>
+ </form>
+ </div>
+ </div>
+ <div id="navigation">
<ul>
<li><a href="<?php echo url_for('@dashboard') ?>"><?php echo __('Dashboard') ?></a></li>
- <li><?php echo link_to(__('Projects'), '@index_project') ?></li>
- <li><?php echo link_to(__('Time'), '@index_logtime') ?></li>
- <li><a href="calendar.html">Calendar</a></li>
-
- <?php if ($sf_user->isAdmin()):?>
- <li><?php echo link_to(__('Users'), '@sf_guard_user') ?></li>
- <?php endif;?>
+ <li><?php echo link_to(__('Projects'), '@index_project') ?></li>
+ <li><?php echo link_to(__('Time'), '@index_logtime') ?></li>
- <li><a href="messages.html"><span>5</span>Messages</a></li>
+ <?php if ($sf_user->isAdmin()): ?>
+ <li><?php echo link_to(__('Users'), '@sf_guard_user') ?></li>
+ <?php endif; ?>
</ul>
</div>
- <div class="span-6 navigationRight last">
- <ul>
- <li><a id="addIcon" href="#" >Quick Add</a></li>
- </ul>
+ <?php else: ?>
+ <div id="utility" class="showgrid-off">
+ Hello! <a href="<?php echo url_for('@sf_guard_signin') ?>" class="login"><?php echo __('Signin') ?></a>
</div>
- </div>
- <?php else: ?>
- <div class="span-24 container last utility-nav right">
- Hello! <a href="<?php echo url_for('@sf_guard_signin') ?>" class="utilLogin"><?php echo __('Signin') ?></a>
- </div>
- <div class="span-24 container last header">
- <div class="span-15 title"><?php include_slot('title') ?></div>
- </div>
- <?php endif; ?>
+ <div id="header">
+ <div id="application-title"><?php include_slot('title') ?></div>
+ </div>
+ <?php endif; ?>
- <div class="span-24 append-1 prepend-1 last contentWrapper rounded">
- <?php echo $sf_content ?>
- <?php include_component_slot('sidebar') ?>
+ <div id="wrapper">
+ <?php echo $sf_content ?>
+ <?php include_component_slot('sidebar') ?>
+ </div>
</div>
-
- <div class="span-24 append-1 prepend-1 last footer">&nbsp;</div>
</div>
</body>
</html>
View
BIN data/phpcollab_unit_test.db
Binary file not shown.
View
3 doc/layout/index.php
@@ -0,0 +1,3 @@
+<?php
+ phpinfo();
+?>
View
164 doc/layout/wireframe/_dashboard-admin.html
@@ -0,0 +1,164 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>phpCollab 3.0a | Wireframe</title>
+<link href="schematic/grid.css" rel="stylesheet" type="text/css" />
+<link href="schematic/reset.css" rel="stylesheet" type="text/css" />
+<link href="schematic/typography.css" rel="stylesheet" type="text/css" />
+<link href="custom.css" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="blueprint/print.css" type="text/css" media="print" />
+</head>
+<body>
+<div class="container wrapper">
+ <div class="span-32 container last utility-nav right">Hello, Adam Patterson <a href="#" class="utilLogin">Login</a> <a href="settings.html" class="utilSettings">Settings</a> <a href="#" class="utilHelp">Help</a>
+ <select>
+ <option>One</option>
+ </select>
+ </div>
+ <div class="span-32 container last header">
+ <div class="span-15 title"> Application Title</div>
+ <div id="header-search" class="search-box utility-search last right">
+ <form id="main-search-form" action="index.php?page=list" method="post">
+ <div class="search-button">
+ <input class="submit" value="" type="submit" />
+ </div>
+ <div class="center">
+ <input class="search placeholder" name="search" title="Search for a Contact" value="" type="text" />
+ </div>
+ <div class="left"> </div>
+ </form>
+ </div>
+ </div>
+ <div class="span-32 container last">
+ <div class="span-32 navigation">
+ <ul>
+ <li><a href="dashboard-admin.html">Dashboard</a></li>
+ <li><a href="project-list.html">Projects</a></li>
+ <li><a href="time.html">Time</a></li>
+ <li><a href="calendar.html">Calendar</a></li>
+ <li><a href="users.html">Users</a></li>
+ <li><a href="messages.html"><span>5</span>Messages</a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="span-32 append-1 prepend-1 last contentWrapper rounded">
+ <div class="span-23 dashboard column">
+ <h3>Recent Activity</h3>
+ <hr />
+ <div class="span-23 last recent">
+ <div class="menu">
+ <div class="colum span-12 "><span class="padding-3"><strong>Today</strong></span></div>
+ <div class="right"><span class="padding-3"><strong>Project</strong></span></div>
+ </div>
+ <div class="activity">
+ <ul>
+ <li class="icon-updated"><a href="person.html" class="name">Adam P</a><strong>Updated </strong><a href="#">#567 Ticket Title</a><a href="project-dashboard-admin.html" class="project-name">ACME Project</a></li>
+ <li class="icon-comment"><a href="person.html" class="name">James M.</a><strong>Commented on </strong><a href="#">Lets talk about the future</a><a href="project-dashboard-admin.html"class="project-name">ACME Project</a></li>
+ <li class="icon-discussion"><a href="person.html" class="name">Samantha T.</a><strong>Started the Discussion: </strong><a href="#">Set up production database</a><a href="project-dashboard-admin.html"class="project-name">ACME Project</a></li>
+ <li class="icon-completed no-border"><a href="person.html" class="name">Ronald J.</a><strong>Completed Task: </strong><del>Edit login code</del><a href="project-dashboard-admin.html" class="project-name">ABC Project</a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="span-23 last recent">
+ <div class="menu">
+ <div class="colum span-12 "><span class="padding-3"><strong>Yesterday</strong></span></div>
+ <div class="right"><span class="padding-3"><strong>Project</strong></span></div>
+ </div>
+ <div class="activity">
+ <ul>
+ <li class="icon-add"><a href="person.html" class="name">Adam P</a><strong>Created Ticket </strong><a href="#">#567 Ticket Title</a><a href="#" class="project-name">ACME Project</a></li>
+ <li class="icon-closed"><a href="person.html" class="name">James M.</a><strong>Closed Ticket </strong><a href="#">#879 Ticket Title</a><a href="#"class="project-name">ACME Project</a></li>
+ <li class="icon-deleted"><a href="person.html" class="name">Smith J.</a><strong>Deleted Task: </strong>Update the login info<a href="#"class="project-name">ACME Project</a></li>
+ <li class="icon-started"><a href="person.html" class="name">Samantha T.</a><strong>Started Task: </strong>Set up production database<a href="#"class="project-name">ACME Project</a></li>
+
+ <li class="icon-completed no-border"><a href="person.html" class="name">Ronald J.</a><strong>Completed Task: </strong><del>Edit login code</del><a href="#" class="project-name">ABC Project</a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="span-23 recent last">
+ <div class="menu">
+ <div class="colum span-12 "><span class="padding-3"><strong>September 27th</strong></span></div>
+ <div class="right"><span class="padding-3"><strong>Project</strong></span></div>
+ </div>
+ <div class="activity">
+ <ul>
+ <li class="icon-file"><a href="person.html" class="name">Adam P</a><strong>Uploaded: <a href="#">Reports.zip</a></strong><a href="#" class="project-name">ACME Project</a></li>
+ <li class="icon-invoice"><a href="person.html" class="name">Adam P</a><strong>Invoiced Client</strong><a href="#" class="project-name">ACME Project</a></li>
+
+ <li class="icon-repo"><a href="person.html" class="name">Adam P</a><strong>Repository has been updated: <a href="#">Repo-Name</a></strong><a href="#" class="project-name">ACME Project</a></li>
+
+ <li class="icon-project no-border"><a href="person.html" class="name">Ronald J.</a><strong>Added the Project: Lets Get To Work!</strong><a href="#" class="project-name">ABC Project</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div id="sidebar-right" class="span-8 prepend-1 last">
+ <h3>Open Projects</h3>
+ <hr />
+ <div class="span-8 menuStatus last">
+ <div class="statusTitle greenBall padding-3"><a href="project-dashboard-admin.html">ACME</a></div>
+ </div>
+ <div class="span-8 grey-box last">
+ <div class="span-8 last">
+ <div class="span-1 percent">50<small>%</small></div>
+ <div class="span-5 last progress">
+ <div class="progress-green" style="width: 50%;"></div>
+ </div>
+ </div>
+ <div class="report span-full">
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Tickets Remain</small></span></div>
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Tickets Closed</small></span></div>
+ </div>
+ <div class="report span-full">
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Discussions</small></span></div>
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Commits</small></span></div>
+ </div>
+ </div>
+ <div class="span-8 menuStatus last">
+ <div class="statusTitle redBall padding-3"><a href="project-dashboard-admin.html">ABC Project</a></div>
+ </div>
+ <div class="span-8 grey-box last">
+ <div class="span-8 last">
+ <div class="span-1 percent">75%</div>
+ <div class="span-5 last progress">
+ <div class="progress-red" style="width: 75%;"></div>
+ <div class="progress-grey" style="width: 25%;"></div>
+ </div>
+ </div>
+ <div class="report span-full">
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Tickets Remain</small></span></div>
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Tickets Closed</small></span></div>
+ </div>
+ <div class="report span-full">
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Discussions</small></span></div>
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Commits</small></span></div>
+ </div>
+ </div>
+ <div class="span-8 menuStatus last">
+ <div class="statusTitle yellowBall padding-3"><a href="#">Sample Project</a></div>
+ </div>
+ <div class="span-8 grey-box last">
+ <div class="span-8 last">
+ <div class="span-1 percent">65%</div>
+ <div class="span-5 last progress">
+ <div class="progress-yellow" style="width: 65%;"></div>
+ <div class="progress-grey" style="width: 15%;"></div>
+ </div>
+ </div>
+ <div class="report span-full">
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Tickets Remain</small></span></div>
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Tickets Closed</small></span></div>
+ </div>
+ <div class="report span-full">
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Discussions</small></span></div>
+ <div class="span-half"><span class="padding-3"><a href="#">999</a> <small>Commits</small></span></div>
+ </div>
+ </div>
+ </div>
+ <!-- -->
+ </div>
+ <div class="span-32 append-1 prepend-1 last footer">&nbsp;</div>
+</div>
+</body>
+</html>
View
68 doc/layout/wireframe/blueprint/ie.css
@@ -1,35 +1,35 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 0.9
- http://blueprintcss.org
-
- * Copyright (c) 2007-Present. See LICENSE for more info.
- * See README for instructions on how to use Blueprint.
- * For credits and origins, see AUTHORS.
- * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* ie.css */
-body {text-align:center;}
-.container {text-align:left;}
-* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {overflow-x:hidden;}
-* html legend {margin:0px -8px 16px 0;padding:0;}
-ol {margin-left:2em;}
-sup {vertical-align:text-top;}
-sub {vertical-align:text-bottom;}
-html>body p code {*white-space:normal;}
-hr {margin:-8px auto 11px;}
-img {-ms-interpolation-mode:bicubic;}
-.clearfix, .container {display:inline-block;}
-* html .clearfix, * html .container {height:1%;}
-fieldset {padding-top:0;}
-input.text, input.title {background-color:#fff;border:1px solid #bbb;}
-input.text:focus, input.title:focus {border-color:#666;}
-input.text, input.title, textarea, select {margin:0.5em 0;}
-input.checkbox, input.radio {position:relative;top:.25em;}
-form.inline div, form.inline p {vertical-align:middle;}
-form.inline label {position:relative;top:-0.25em;}
-form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+ * Copyright (c) 2007-Present. See LICENSE for more info.
+ * See README for instructions on how to use Blueprint.
+ * For credits and origins, see AUTHORS.
+ * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-24, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-32 {display:inline;overflow-x:hidden;}
+* html legend {margin:0px -8px 16px 0;padding:0;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+img {-ms-interpolation-mode:bicubic;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}
+textarea {overflow:auto;}
+input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input.text:focus, input.title:focus {border-color:#666;}
+input.text, input.title, textarea, select {margin:0.5em 0;}
+input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline div, form.inline p {vertical-align:middle;}
+form.inline label {position:relative;top:-0.25em;}
+form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
button, input.button {position:relative;top:0.25em;}
View
588 doc/layout/wireframe/blueprint/liquid.css
@@ -1,197 +1,391 @@
-/* --------------------------------------------------------------
-
- liquid.css
- * Sets up an easy-to-use grid of 24 columns that stretch
- to the window width or can also be fixed width.
-
- Liquid grid work by:
- * Ben Listwon
- * David Bedingfield
- * Andrei Michael Herasimchuk
- Involution Studios, http://www.involutionstudios.com
-
- -----
-
- grid.css
- * Sets up an easy-to-use grid of 24 columns.
-
- Based on work by:
- * Nathan Borror [playgroundblues.com]
- * Jeff Croft [jeffcroft.com]
- * Christian Metts [mintchaos.com]
- * Khoi Vinh [subtraction.com]
-
- -----
-
- By default, the grid is 80% of window width, with 24 columns.
-
- To make the grid fixed, simply change the .container width
- property to a pixel value. e.g., 960px.
-
--------------------------------------------------------------- */
-
-/* A container should group your entire grid. */
-.container {
- min-width: 950px;
- width: 80%;
- margin: 0 auto;
- overflow: hidden;
-}
-
-/* A block should group all your columns per row stack. */
-.block {overflow: hidden;}
-
-
-/* Columns
--------------------------------------------------------------- */
-
-/* Use this class together with the .span-x classes
- to create any composition of columns in a layout. */
-.column {float: left;}
-
-/* The last column in a row needs this class. */
-.last { margin-right: 0; }
-
-/* Use these classes to set the width of a column. */
-.span-1 { width: 4%; }
-.span-2 { width: 8%; }
-.span-3 { width: 12%; }
-.span-4 { width: 16%; }
-.span-5 { width: 20%; }
-.span-6 { width: 25%; }
-.span-7 { width: 29%; }
-.span-8 { width: 33%; }
-.span-9 { width: 37%; }
-.span-10 { width: 41%; }
-.span-11 { width: 45%; }
-.span-12 { width: 50%; }
-.span-13 { width: 54%; }
-.span-14 { width: 58%; }
-.span-15 { width: 62%; }
-.span-16 { width: 66%; }
-.span-17 { width: 70%; }
-.span-18 { width: 75%; }
-.span-19 { width: 79%; }
-.span-20 { width: 83%; }
-.span-21 { width: 87%; }
-.span-22 { width: 91%; }
-.span-23 { width: 95%; }
-.span-24 { width: 100%; margin-right: 0; }
-
-.span-1>div, .span-2>div, .span-3>div, .span-4>div,
-.span-5>div, .span-6>div, .span-7>div, .span-8>div,
-.span-9>div, .span-10>div, .span-11>div, .span-12>div,
-.span-13>div, .span-14>div, .span-15>div, .span-16>div,
-.span-17>div, .span-18>div, .span-19>div, .span-20>div,
-.span-21>div, .span-22>div, .span-23>div, .span-24>div {
- margin: 0 0.833em 0 0;
- overflow: hidden;
-}
-
-/* Add these to a column to append empty cols. */
-.append-1 { padding-right: 4%; }
-.append-2 { padding-right: 8%; }
-.append-3 { padding-right: 12%; }
-.append-4 { padding-right: 16%; }
-.append-5 { padding-right: 20%; }
-.append-6 { padding-right: 25%; }
-.append-7 { padding-right: 29%; }
-.append-8 { padding-right: 33%; }
-.append-9 { padding-right: 37%; }
-.append-10 { padding-right: 41%; }
-.append-11 { padding-right: 45%; }
-.append-12 { padding-right: 50%; }
-.append-13 { padding-right: 54%; }
-.append-14 { padding-right: 58%; }
-.append-15 { padding-right: 62%; }
-.append-16 { padding-right: 66%; }
-.append-17 { padding-right: 70%; }
-.append-18 { padding-right: 75%; }
-.append-19 { padding-right: 79%; }
-.append-20 { padding-right: 83%; }
-.append-21 { padding-right: 87%; }
-.append-22 { padding-right: 91%; }
-.append-23 { padding-right: 95%; }
-
-/* Add these to a column to prepend empty cols. */
-.prepend-1 { padding-left: 4%; }
-.prepend-2 { padding-left: 8%; }
-.prepend-3 { padding-left: 12%; }
-.prepend-4 { padding-left: 16%; }
-.prepend-5 { padding-left: 20%; }
-.prepend-6 { padding-left: 25%; }
-.prepend-7 { padding-left: 29%; }
-.prepend-8 { padding-left: 33%; }
-.prepend-9 { padding-left: 37%; }
-.prepend-10 { padding-left: 41%; }
-.prepend-11 { padding-left: 45%; }
-.prepend-12 { padding-left: 50%; }
-.prepend-13 { padding-left: 54%; }
-.prepend-14 { padding-left: 58%; }
-.prepend-15 { padding-left: 62%; }
-.prepend-16 { padding-left: 66%; }
-.prepend-17 { padding-left: 70%; }
-.prepend-18 { padding-left: 75%; }
-.prepend-19 { padding-left: 79%; }
-.prepend-20 { padding-left: 83%; }
-.prepend-21 { padding-left: 87%; }
-.prepend-22 { padding-left: 91%; }
-.prepend-23 { padding-left: 95%; }
-
-
-/* Border on right hand side of a column. */
-.border {
- border-right: 1px solid #eee;
-}
-
-/* Border with more whitespace, spans one column. */
-.colborder {
- padding-right: 2%;
- margin-right: 2%;
- border-right: 1px solid #eee;
-}
-
-.colborder>div {
- margin: 0;
-}
-
-
-/* Use these classes on an element to push it into the
- next column, or to pull it into the previous column. */
-
-.pull-1 { margin-left: -3.333em; }
-.pull-2 { margin-left: -6.666em; }
-.pull-3 { margin-left: -10em; }
-.pull-4 { margin-left: -13.333em; }
-
-.push-0 { margin: 0 0 0 1.5em; }
-.push-1 { margin: 0 -3.333em 0 1.5em; }
-.push-2 { margin: 0 -6.666em 0 1.5em; }
-.push-3 { margin: 0 -10em 0 1.5em; }
-.push-4 { margin: 0 -13.333em 0 1.5em; }
-.push-0, .push-1, .push-2, .push-3, .push-4 { float: right; }
-
-
-/* Misc classes and elements
--------------------------------------------------------------- */
-
-/* Use a .box to create a padded box inside a column. */
-.box {
- padding: 1.5em;
- margin-bottom: 1.5em;
- background: #eee;
-}
-
-/* Use this to create a horizontal ruler across a column. */
-hr {
- background: #ddd;
- color: #ddd;
- width: 100%;
- height: 0.083em;
- margin: 0 0 1.583em;
- border: none;
-}
-hr.space {
- background: #fff;
- color: #fff;
-}
+<<<<<<< .mine
+/* --------------------------------------------------------------
+
+ liquid.css
+ * Sets up an easy-to-use grid of 24 columns that stretch
+ to the window width or can also be fixed width.
+
+ Liquid grid work by:
+ * Ben Listwon
+ * David Bedingfield
+ * Andrei Michael Herasimchuk
+ Involution Studios, http://www.involutionstudios.com
+
+ -----
+
+ grid.css
+ * Sets up an easy-to-use grid of 24 columns.
+
+ Based on work by:
+ * Nathan Borror [playgroundblues.com]
+ * Jeff Croft [jeffcroft.com]
+ * Christian Metts [mintchaos.com]
+ * Khoi Vinh [subtraction.com]
+
+ -----
+
+ By default, the grid is 80% of window width, with 24 columns.
+
+ To make the grid fixed, simply change the .container width
+ property to a pixel value. e.g., 960px.
+
+-------------------------------------------------------------- */
+
+/* A container should group your entire grid. */
+.container {
+ min-width: 950px;
+ width: 80%;
+ margin: 0 auto;
+ overflow: hidden;
+}
+
+/* A block should group all your columns per row stack. */
+.block {overflow: hidden;}
+
+
+/* Columns
+-------------------------------------------------------------- */
+
+/* Use this class together with the .span-x classes
+ to create any composition of columns in a layout. */
+.column {float: left;}
+
+/* The last column in a row needs this class. */
+.last { margin-right: 0; }
+
+/* Use these classes to set the width of a column. */
+.span-1 { width: 4%; }
+.span-2 { width: 8%; }
+.span-3 { width: 12%; }
+.span-4 { width: 16%; }
+.span-5 { width: 20%; }
+.span-6 { width: 25%; }
+.span-7 { width: 29%; }
+.span-8 { width: 33%; }
+.span-9 { width: 37%; }
+.span-10 { width: 41%; }
+.span-11 { width: 45%; }
+.span-12 { width: 50%; }
+.span-13 { width: 54%; }
+.span-14 { width: 58%; }
+.span-15 { width: 62%; }
+.span-16 { width: 66%; }
+.span-24 { width: 70%; }
+.span-18 { width: 75%; }
+.span-19 { width: 79%; }
+.span-20 { width: 83%; }
+.span-21 { width: 87%; }
+.span-22 { width: 91%; }
+.span-23 { width: 95%; }
+.span-32 { width: 100%; margin-right: 0; }
+
+.span-1>div, .span-2>div, .span-3>div, .span-4>div,
+.span-5>div, .span-6>div, .span-7>div, .span-8>div,
+.span-9>div, .span-10>div, .span-11>div, .span-12>div,
+.span-13>div, .span-14>div, .span-15>div, .span-16>div,
+.span-24>div, .span-18>div, .span-19>div, .span-20>div,
+.span-21>div, .span-22>div, .span-23>div, .span-32>div { margin: 0 0.833em 0 0; }
+
+/* Add these to a column to append empty cols. */
+.append-1 { padding-right: 4%; }
+.append-2 { padding-right: 8%; }
+.append-3 { padding-right: 12%; }
+.append-4 { padding-right: 16%; }
+.append-5 { padding-right: 20%; }
+.append-6 { padding-right: 25%; }
+.append-7 { padding-right: 29%; }
+.append-8 { padding-right: 33%; }
+.append-9 { padding-right: 37%; }
+.append-10 { padding-right: 41%; }
+.append-11 { padding-right: 45%; }
+.append-12 { padding-right: 50%; }
+.append-13 { padding-right: 54%; }
+.append-14 { padding-right: 58%; }
+.append-15 { padding-right: 62%; }
+.append-16 { padding-right: 66%; }
+.append-17 { padding-right: 70%; }
+.append-18 { padding-right: 75%; }
+.append-19 { padding-right: 79%; }
+.append-20 { padding-right: 83%; }
+.append-21 { padding-right: 87%; }
+.append-22 { padding-right: 91%; }
+.append-23 { padding-right: 95%; }
+
+/* Add these to a column to prepend empty cols. */
+.prepend-1 { padding-left: 4%; }
+.prepend-2 { padding-left: 8%; }
+.prepend-3 { padding-left: 12%; }
+.prepend-4 { padding-left: 16%; }
+.prepend-5 { padding-left: 20%; }
+.prepend-6 { padding-left: 25%; }
+.prepend-7 { padding-left: 29%; }
+.prepend-8 { padding-left: 33%; }
+.prepend-9 { padding-left: 37%; }
+.prepend-10 { padding-left: 41%; }
+.prepend-11 { padding-left: 45%; }
+.prepend-12 { padding-left: 50%; }
+.prepend-13 { padding-left: 54%; }
+.prepend-14 { padding-left: 58%; }
+.prepend-15 { padding-left: 62%; }
+.prepend-16 { padding-left: 66%; }
+.prepend-17 { padding-left: 70%; }
+.prepend-18 { padding-left: 75%; }
+.prepend-19 { padding-left: 79%; }
+.prepend-20 { padding-left: 83%; }
+.prepend-21 { padding-left: 87%; }
+.prepend-22 { padding-left: 91%; }
+.prepend-23 { padding-left: 95%; }
+
+
+/* Border on right hand side of a column. */
+.border {
+ border-right: 1px solid #eee;
+}
+
+/* Border with more whitespace, spans one column. */
+.colborder {
+ padding-right: 2%;
+ margin-right: 2%;
+ border-right: 1px solid #eee;
+}
+
+.colborder>div {
+ margin: 0;
+}
+
+
+/* Use these classes on an element to push it into the
+ next column, or to pull it into the previous column. */
+
+.pull-1 { margin-left: -3.333em; }
+.pull-2 { margin-left: -6.666em; }
+.pull-3 { margin-left: -10em; }
+.pull-4 { margin-left: -13.333em; }
+
+.push-0 { margin: 0 0 0 1.5em; }
+.push-1 { margin: 0 -3.333em 0 1.5em; }
+.push-2 { margin: 0 -6.666em 0 1.5em; }
+.push-3 { margin: 0 -10em 0 1.5em; }
+.push-4 { margin: 0 -13.333em 0 1.5em; }
+.push-0, .push-1, .push-2, .push-3, .push-4 { float: right; }
+
+
+/* Misc classes and elements
+-------------------------------------------------------------- */
+
+/* Use a .box to create a padded box inside a column. */
+.box {
+ padding: 1.5em;
+ margin-bottom: 1.5em;
+ background: #eee;
+}
+
+/* Use this to create a horizontal ruler across a column. */
+hr {
+ background: #ddd;
+ color: #ddd;
+ width: 100%;
+ height: 0.083em;
+ margin: 0 0 1.583em;
+ border: none;
+}
+hr.space {
+ background: #fff;
+ color: #fff;
+}
+=======
+/* --------------------------------------------------------------
+
+ liquid.css
+ * Sets up an easy-to-use grid of 24 columns that stretch
+ to the window width or can also be fixed width.
+
+ Liquid grid work by:
+ * Ben Listwon
+ * David Bedingfield
+ * Andrei Michael Herasimchuk
+ Involution Studios, http://www.involutionstudios.com
+
+ -----
+
+ grid.css
+ * Sets up an easy-to-use grid of 24 columns.
+
+ Based on work by:
+ * Nathan Borror [playgroundblues.com]
+ * Jeff Croft [jeffcroft.com]
+ * Christian Metts [mintchaos.com]
+ * Khoi Vinh [subtraction.com]
+
+ -----
+
+ By default, the grid is 80% of window width, with 24 columns.
+
+ To make the grid fixed, simply change the .container width
+ property to a pixel value. e.g., 960px.
+
+-------------------------------------------------------------- */
+
+/* A container should group your entire grid. */
+.container {
+ min-width: 950px;
+ width: 80%;
+ margin: 0 auto;
+ overflow: hidden;
+}
+
+/* A block should group all your columns per row stack. */
+.block {overflow: hidden;}
+
+
+/* Columns
+-------------------------------------------------------------- */
+
+/* Use this class together with the .span-x classes
+ to create any composition of columns in a layout. */
+.column {float: left;}
+
+/* The last column in a row needs this class. */
+.last { margin-right: 0; }
+
+/* Use these classes to set the width of a column. */
+.span-1 { width: 4%; }
+.span-2 { width: 8%; }
+.span-3 { width: 12%; }
+.span-4 { width: 16%; }
+.span-5 { width: 20%; }
+.span-6 { width: 25%; }
+.span-7 { width: 29%; }
+.span-8 { width: 33%; }
+.span-9 { width: 37%; }
+.span-10 { width: 41%; }
+.span-11 { width: 45%; }
+.span-12 { width: 50%; }
+.span-13 { width: 54%; }
+.span-14 { width: 58%; }
+.span-15 { width: 62%; }
+.span-16 { width: 66%; }
+.span-24 { width: 70%; }
+.span-18 { width: 75%; }
+.span-19 { width: 79%; }
+.span-20 { width: 83%; }
+.span-21 { width: 87%; }
+.span-22 { width: 91%; }
+.span-23 { width: 95%; }
+.span-32 { width: 100%; margin-right: 0; }
+
+.span-1>div, .span-2>div, .span-3>div, .span-4>div,
+.span-5>div, .span-6>div, .span-7>div, .span-8>div,
+.span-9>div, .span-10>div, .span-11>div, .span-12>div,
+.span-13>div, .span-14>div, .span-15>div, .span-16>div,
+.span-24>div, .span-18>div, .span-19>div, .span-20>div,
+.span-21>div, .span-22>div, .span-23>div, .span-32>div { margin: 0 0.833em 0 0; }
+
+/* Add these to a column to append empty cols. */
+.append-1 { padding-right: 4%; }
+.append-2 { padding-right: 8%; }
+.append-3 { padding-right: 12%; }
+.append-4 { padding-right: 16%; }
+.append-5 { padding-right: 20%; }
+.append-6 { padding-right: 25%; }
+.append-7 { padding-right: 29%; }
+.append-8 { padding-right: 33%; }
+.append-9 { padding-right: 37%; }
+.append-10 { padding-right: 41%; }
+.append-11 { padding-right: 45%; }
+.append-12 { padding-right: 50%; }
+.append-13 { padding-right: 54%; }
+.append-14 { padding-right: 58%; }
+.append-15 { padding-right: 62%; }
+.append-16 { padding-right: 66%; }
+.append-17 { padding-right: 70%; }
+.append-18 { padding-right: 75%; }
+.append-19 { padding-right: 79%; }
+.append-20 { padding-right: 83%; }
+.append-21 { padding-right: 87%; }
+.append-22 { padding-right: 91%; }
+.append-23 { padding-right: 95%; }
+
+/* Add these to a column to prepend empty cols. */
+.prepend-1 { padding-left: 4%; }
+.prepend-2 { padding-left: 8%; }
+.prepend-3 { padding-left: 12%; }
+.prepend-4 { padding-left: 16%; }
+.prepend-5 { padding-left: 20%; }
+.prepend-6 { padding-left: 25%; }
+.prepend-7 { padding-left: 29%; }
+.prepend-8 { padding-left: 33%; }
+.prepend-9 { padding-left: 37%; }
+.prepend-10 { padding-left: 41%; }
+.prepend-11 { padding-left: 45%; }
+.prepend-12 { padding-left: 50%; }
+.prepend-13 { padding-left: 54%; }
+.prepend-14 { padding-left: 58%; }
+.prepend-15 { padding-left: 62%; }
+.prepend-16 { padding-left: 66%; }
+.prepend-17 { padding-left: 70%; }
+.prepend-18 { padding-left: 75%; }
+.prepend-19 { padding-left: 79%; }
+.prepend-20 { padding-left: 83%; }
+.prepend-21 { padding-left: 87%; }
+.prepend-22 { padding-left: 91%; }
+.prepend-23 { padding-left: 95%; }
+
+
+/* Border on right hand side of a column. */
+.border {
+ border-right: 1px solid #eee;
+}
+
+/* Border with more whitespace, spans one column. */
+.colborder {
+ padding-right: 2%;
+ margin-right: 2%;
+ border-right: 1px solid #eee;
+}
+
+.colborder>div {
+ margin: 0;
+}
+
+
+/* Use these classes on an element to push it into the
+ next column, or to pull it into the previous column. */
+
+.pull-1 { margin-left: -3.333em; }
+.pull-2 { margin-left: -6.666em; }
+.pull-3 { margin-left: -10em; }
+.pull-4 { margin-left: -13.333em; }
+
+.push-0 { margin: 0 0 0 1.5em; }
+.push-1 { margin: 0 -3.333em 0 1.5em; }
+.push-2 { margin: 0 -6.666em 0 1.5em; }
+.push-3 { margin: 0 -10em 0 1.5em; }
+.push-4 { margin: 0 -13.333em 0 1.5em; }
+.push-0, .push-1, .push-2, .push-3, .push-4 { float: right; }
+
+
+/* Misc classes and elements
+-------------------------------------------------------------- */
+
+/* Use a .box to create a padded box inside a column. */
+.box {
+ padding: 1.5em;
+ margin-bottom: 1.5em;
+ background: #eee;
+}
+
+/* Use this to create a horizontal ruler across a column. */
+hr {
+ background: #ddd;
+ color: #ddd;
+ width: 100%;
+ height: 0.083em;
+ margin: 0 0 1.583em;
+ border: none;
+}
+hr.space {
+ background: #fff;
+ color: #fff;
+}
+>>>>>>> .r64
View
3 doc/layout/wireframe/blueprint/print.css
@@ -15,10 +15,9 @@
body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;}
.container {background:none;}
hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;}
-hr.space {background:#fff;color:#fff;}
+hr.space {background:#fff;color:#fff;visibility:hidden;}
h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;}
code {font:.9em "Courier New", Monaco, Courier, monospace;}
-img {float:left;margin:1.5em 1.5em 1.5em 0;}
a img {border:none;}
p img.top {margin-top:0;}
blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;}
View
271 doc/layout/wireframe/blueprint/screen.css
@@ -1,13 +1,258 @@
-@import url("src/reset.css");
-@import url("src/typography.css");
-@import url("src/grid.css");
-@import url("src/forms.css");
-@import url("plugins/buttons/buttons.css");
-/*
-@import url("plugins/fancy-type/screen.css");
-*/
-
-/* See the grid:
- Uncomment the line below to see the grid and baseline.
- .container { background: url(scr/grid.png); }
-*/
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+ * Copyright (c) 2007-Present. See LICENSE for more info.
+ * See README for instructions on how to use Blueprint.
+ * For credits and origins, see AUTHORS.
+ * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* reset.css */
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
+article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
+body {line-height:1.5;}
+table {border-collapse:separate;border-spacing:0;}
+caption, th, td {text-align:left;font-weight:normal;}
+table, td, th {vertical-align:middle;}
+blockquote:before, blockquote:after, q:before, q:after {content:"";}
+blockquote, q {quotes:"" "";}
+a img {border:none;}
+
+/* typography.css */
+html {font-size:100.01%;}
+body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
+h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
+h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
+h2 {font-size:2em;margin-bottom:0.75em;}
+h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
+h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
+h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
+h6 {font-size:1em;font-weight:bold;}
+h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
+p {margin:0 0 1.5em;}
+p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
+p img.right {float:right;margin:1.5em 0 1.5em 1.5em;}
+a:focus, a:hover {color:#000;}
+a {color:#009;text-decoration:underline;}
+blockquote {margin:1.5em;color:#666;font-style:italic;}
+strong {font-weight:bold;}
+em, dfn {font-style:italic;}
+dfn {font-weight:bold;}
+sup, sub {line-height:0;}
+abbr, acronym {border-bottom:1px dotted #666;}
+address {margin:0 0 1.5em;font-style:italic;}
+del {color:#666;}
+pre {margin:1.5em 0;white-space:pre;}
+pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
+li ul, li ol {margin:0;}
+ul, ol {margin:0 1.5em 1.5em 0;padding-left:3.333em;}
+ul {list-style-type:disc;}
+ol {list-style-type:decimal;}
+dl {margin:0 0 1.5em 0;}
+dl dt {font-weight:bold;}
+dd {margin-left:1.5em;}
+table {margin-bottom:1.4em;width:100%;}
+th {font-weight:bold;}
+thead th {background:#c3d9ff;}
+th, td, caption {padding:4px 10px 4px 5px;}
+tr.even td {background:#e5ecf9;}
+tfoot {font-style:italic;}
+caption {background:#eee;}
+.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
+.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
+.hide {display:none;}
+.quiet {color:#666;}
+.loud {color:#000;}
+.highlight {background:#ff0;}
+.added {background:#060;color:#fff;}
+.removed {background:#900;color:#fff;}
+.first {margin-left:0;padding-left:0;}
+.last {margin-right:0;padding-right:0;}
+.top {margin-top:0;padding-top:0;}
+.bottom {margin-bottom:0;padding-bottom:0;}
+
+/* forms.css */
+label {font-weight:bold;}
+fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
+legend {font-weight:bold;font-size:1.2em;}
+input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;}
+input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;}
+input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
+input.text, input.title {width:300px;padding:5px;}
+input.title {font-size:1.5em;}
+textarea {width:390px;height:250px;padding:5px;}
+input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline {line-height:3;}
+form.inline p {margin-bottom:0;}
+.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;}
+.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;}
+.success {background:#E6EFC2;color:#264409;border-color:#C6D880;}
+.error a {color:#8a1f11;}
+.notice a {color:#514721;}
+.success a {color:#264409;}
+
+/* grid.css */
+.container {width:950px;margin:0 auto;}
+.showgrid {background:url(src/grid.png);}
+.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-24, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-32 {float:left;margin-right:10px;}
+.last {margin-right:0;}
+.span-1 {width:30px;}
+.span-2 {width:70px;}
+.span-3 {width:110px;}
+.span-4 {width:150px;}
+.span-5 {width:190px;}
+.span-6 {width:230px;}
+.span-7 {width:270px;}
+.span-8 {width:310px;}
+.span-9 {width:350px;}
+.span-10 {width:390px;}
+.span-11 {width:430px;}
+.span-12 {width:470px;}
+.span-13 {width:510px;}
+.span-14 {width:550px;}
+.span-15 {width:590px;}
+.span-16 {width:630px;}
+.span-24 {width:670px;}
+.span-18 {width:710px;}
+.span-19 {width:750px;}
+.span-20 {width:790px;}
+.span-21 {width:830px;}
+.span-22 {width:870px;}
+.span-23 {width:910px;}
+.span-32 {width:950px;margin-right:0;}
+input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-24, textarea.span-24, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-32, textarea.span-32 {border-left-width:1px!important;border-right-width:1px!important;padding-left:5px!important;padding-right:5px!important;}
+input.span-1, textarea.span-1 {width:18px!important;}
+input.span-2, textarea.span-2 {width:58px!important;}
+input.span-3, textarea.span-3 {width:98px!important;}
+input.span-4, textarea.span-4 {width:138px!important;}
+input.span-5, textarea.span-5 {width:178px!important;}
+input.span-6, textarea.span-6 {width:218px!important;}
+input.span-7, textarea.span-7 {width:258px!important;}
+input.span-8, textarea.span-8 {width:298px!important;}
+input.span-9, textarea.span-9 {width:338px!important;}
+input.span-10, textarea.span-10 {width:378px!important;}
+input.span-11, textarea.span-11 {width:418px!important;}
+input.span-12, textarea.span-12 {width:458px!important;}
+input.span-13, textarea.span-13 {width:498px!important;}
+input.span-14, textarea.span-14 {width:538px!important;}
+input.span-15, textarea.span-15 {width:578px!important;}
+input.span-16, textarea.span-16 {width:618px!important;}
+input.span-24, textarea.span-24 {width:658px!important;}
+input.span-18, textarea.span-18 {width:698px!important;}
+input.span-19, textarea.span-19 {width:738px!important;}
+input.span-20, textarea.span-20 {width:778px!important;}
+input.span-21, textarea.span-21 {width:818px!important;}
+input.span-22, textarea.span-22 {width:858px!important;}
+input.span-23, textarea.span-23 {width:898px!important;}
+input.span-32, textarea.span-32 {width:938px!important;}
+.append-1 {padding-right:40px;}
+.append-2 {padding-right:80px;}
+.append-3 {padding-right:120px;}
+.append-4 {padding-right:160px;}
+.append-5 {padding-right:200px;}
+.append-6 {padding-right:240px;}
+.append-7 {padding-right:280px;}
+.append-8 {padding-right:320px;}
+.append-9 {padding-right:360px;}
+.append-10 {padding-right:400px;}
+.append-11 {padding-right:440px;}
+.append-12 {padding-right:480px;}
+.append-13 {padding-right:520px;}
+.append-14 {padding-right:560px;}
+.append-15 {padding-right:600px;}
+.append-16 {padding-right:640px;}
+.append-17 {padding-right:680px;}
+.append-18 {padding-right:720px;}
+.append-19 {padding-right:760px;}
+.append-20 {padding-right:800px;}
+.append-21 {padding-right:840px;}
+.append-22 {padding-right:880px;}
+.append-23 {padding-right:920px;}
+.prepend-1 {padding-left:40px;}
+.prepend-2 {padding-left:80px;}
+.prepend-3 {padding-left:120px;}
+.prepend-4 {padding-left:160px;}
+.prepend-5 {padding-left:200px;}
+.prepend-6 {padding-left:240px;}
+.prepend-7 {padding-left:280px;}
+.prepend-8 {padding-left:320px;}
+.prepend-9 {padding-left:360px;}
+.prepend-10 {padding-left:400px;}
+.prepend-11 {padding-left:440px;}
+.prepend-12 {padding-left:480px;}
+.prepend-13 {padding-left:520px;}
+.prepend-14 {padding-left:560px;}
+.prepend-15 {padding-left:600px;}
+.prepend-16 {padding-left:640px;}
+.prepend-17 {padding-left:680px;}
+.prepend-18 {padding-left:720px;}
+.prepend-19 {padding-left:760px;}
+.prepend-20 {padding-left:800px;}
+.prepend-21 {padding-left:840px;}
+.prepend-22 {padding-left:880px;}
+.prepend-23 {padding-left:920px;}
+.border {padding-right:4px;margin-right:5px;border-right:1px solid #eee;}
+.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;}
+.pull-1 {margin-left:-40px;}
+.pull-2 {margin-left:-80px;}
+.pull-3 {margin-left:-120px;}
+.pull-4 {margin-left:-160px;}
+.pull-5 {margin-left:-200px;}
+.pull-6 {margin-left:-240px;}
+.pull-7 {margin-left:-280px;}
+.pull-8 {margin-left:-320px;}
+.pull-9 {margin-left:-360px;}
+.pull-10 {margin-left:-400px;}
+.pull-11 {margin-left:-440px;}
+.pull-12 {margin-left:-480px;}
+.pull-13 {margin-left:-520px;}
+.pull-14 {margin-left:-560px;}
+.pull-15 {margin-left:-600px;}
+.pull-16 {margin-left:-640px;}
+.pull-17 {margin-left:-680px;}
+.pull-18 {margin-left:-720px;}
+.pull-19 {margin-left:-760px;}
+.pull-20 {margin-left:-800px;}
+.pull-21 {margin-left:-840px;}
+.pull-22 {margin-left:-880px;}
+.pull-23 {margin-left:-920px;}
+.pull-24 {margin-left:-960px;}
+.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;}
+.push-1 {margin:0 -40px 1.5em 40px;}
+.push-2 {margin:0 -80px 1.5em 80px;}
+.push-3 {margin:0 -120px 1.5em 120px;}
+.push-4 {margin:0 -160px 1.5em 160px;}
+.push-5 {margin:0 -200px 1.5em 200px;}
+.push-6 {margin:0 -240px 1.5em 240px;}
+.push-7 {margin:0 -280px 1.5em 280px;}
+.push-8 {margin:0 -320px 1.5em 320px;}
+.push-9 {margin:0 -360px 1.5em 360px;}
+.push-10 {margin:0 -400px 1.5em 400px;}
+.push-11 {margin:0 -440px 1.5em 440px;}
+.push-12 {margin:0 -480px 1.5em 480px;}
+.push-13 {margin:0 -520px 1.5em 520px;}
+.push-14 {margin:0 -560px 1.5em 560px;}
+.push-15 {margin:0 -600px 1.5em 600px;}
+.push-16 {margin:0 -640px 1.5em 640px;}
+.push-17 {margin:0 -680px 1.5em 680px;}
+.push-18 {margin:0 -720px 1.5em 720px;}
+.push-19 {margin:0 -760px 1.5em 760px;}
+.push-20 {margin:0 -800px 1.5em 800px;}
+.push-21 {margin:0 -840px 1.5em 840px;}
+.push-22 {margin:0 -880px 1.5em 880px;}
+.push-23 {margin:0 -920px 1.5em 920px;}
+.push-24 {margin:0 -960px 1.5em 960px;}
+.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:right;position:relative;}
+.prepend-top {margin-top:1.5em;}
+.append-bottom {margin-bottom:1.5em;}
+.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;}
+hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;}
+hr.space {background:#fff;color:#fff;visibility:hidden;}
+.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
+.clearfix, .container {display:block;}
+.clear {clear:both;}
View
32 doc/layout/wireframe/blueprint/src/forms.css
@@ -1,13 +1,13 @@
-/* --------------------------------------------------------------
+/* --------------------------------------------------------------
forms.css
* Sets up some default styling for forms
* Gives you classes to enhance your forms
-
+
Usage:
* For text fields, use class .title or .text
* For inline forms, use .inline (even when using columns)
-
+
-------------------------------------------------------------- */
label { font-weight: bold; }
@@ -19,15 +19,15 @@ legend { font-weight: bold; font-size:1.2em; }
-------------------------------------------------------------- */
input[type=text], input[type=password],
-input.text, input.title,
-textarea, select {
- background-color:#fff;
- border:1px solid #bbb;
+input.text, input.title,
+textarea, select {
+ background-color:#fff;
+ border:1px solid #bbb;
}
-input[type=text]:focus, input[type=password]:focus,
-input.text:focus, input.title:focus,
-textarea:focus, select:focus {
- border-color:#666;
+input[type=text]:focus, input[type=password]:focus,
+input.text:focus, input.title:focus,
+textarea:focus, select:focus {
+ border-color:#666;
}
input[type=text], input[type=password],
@@ -36,14 +36,14 @@ textarea, select {
margin:0.5em 0;
}
-input.text,
+input.text,
input.title { width: 300px; padding:5px; }
input.title { font-size:1.5em; }
textarea { width: 390px; height: 250px; padding:5px; }
-input[type=checkbox], input[type=radio],
-input.checkbox, input.radio {
- position:relative; top:.25em;
+input[type=checkbox], input[type=radio],
+input.checkbox, input.radio {
+ position:relative; top:.25em;
}
form.inline { line-height:3; }
@@ -54,7 +54,7 @@ form.inline p { margin-bottom:0; }
-------------------------------------------------------------- */
.error,
-.notice,
+.notice,