Permalink
Browse files

Added Bootstrap, ui and small improvements

ui still needs cleaning up
  • Loading branch information...
1 parent 172a842 commit dd2e12f65ec8d8ddbb792268b64fa623a161f64b @giovdk21 committed Oct 23, 2012
Showing with 13,460 additions and 249 deletions.
  1. +6 −3 .gitignore
  2. +19 −9 css/form.css
  3. +4 −3 css/ie.css
  4. +92 −38 css/main.css
  5. +1 −1 css/print.css
  6. +53 −50 css/screen.css
  7. +23 −5 css/style.css
  8. +16 −4 js/base.js
  9. +36 −44 protected/components/views/MoreInfoBox.php
  10. +3 −0 protected/config/development.php
  11. +9 −6 protected/config/main.php
  12. +24 −0 protected/extensions/bootstrap/LICENSE.txt
  13. +341 −0 protected/extensions/bootstrap/components/Bootstrap.php
  14. +32 −0 protected/extensions/bootstrap/gii/bootstrap/BootstrapCode.php
  15. +14 −0 protected/extensions/bootstrap/gii/bootstrap/BootstrapGenerator.php
  16. +35 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/_form.php
  17. +29 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/_search.php
  18. +26 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/_view.php
  19. +70 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/admin.php
  20. +183 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/controller.php
  21. +24 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/create.php
  22. +26 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/index.php
  23. +28 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/update.php
  24. +36 −0 protected/extensions/bootstrap/gii/bootstrap/templates/default/view.php
  25. +64 −0 protected/extensions/bootstrap/gii/bootstrap/views/index.php
  26. +176 −0 protected/extensions/bootstrap/lib/bootstrap/LICENSE
  27. +139 −0 protected/extensions/bootstrap/lib/bootstrap/README.md
  28. BIN protected/extensions/bootstrap/lib/bootstrap/img/glyphicons-halflings-white.png
  29. BIN protected/extensions/bootstrap/lib/bootstrap/img/glyphicons-halflings.png
  30. +104 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-affix.js
  31. +90 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-alert.js
  32. +96 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-button.js
  33. +176 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-carousel.js
  34. +158 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-collapse.js
  35. +150 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-dropdown.js
  36. +239 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-modal.js
  37. +103 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-popover.js
  38. +151 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-scrollspy.js
  39. +135 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-tab.js
  40. +275 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-tooltip.js
  41. +60 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-transition.js
  42. +300 −0 protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-typeahead.js
  43. +34 −0 protected/extensions/bootstrap/lib/bootstrap/less/accordion.less
  44. +65 −0 protected/extensions/bootstrap/lib/bootstrap/less/alerts.less
  45. +62 −0 protected/extensions/bootstrap/lib/bootstrap/less/bootstrap.less
  46. +24 −0 protected/extensions/bootstrap/lib/bootstrap/less/breadcrumbs.less
  47. +245 −0 protected/extensions/bootstrap/lib/bootstrap/less/button-groups.less
  48. +231 −0 protected/extensions/bootstrap/lib/bootstrap/less/buttons.less
  49. +131 −0 protected/extensions/bootstrap/lib/bootstrap/less/carousel.less
  50. +31 −0 protected/extensions/bootstrap/lib/bootstrap/less/close.less
  51. +58 −0 protected/extensions/bootstrap/lib/bootstrap/less/code.less
  52. +22 −0 protected/extensions/bootstrap/lib/bootstrap/less/component-animations.less
  53. +210 −0 protected/extensions/bootstrap/lib/bootstrap/less/dropdowns.less
  54. +650 −0 protected/extensions/bootstrap/lib/bootstrap/less/forms.less
  55. +21 −0 protected/extensions/bootstrap/lib/bootstrap/less/grid.less
  56. +24 −0 protected/extensions/bootstrap/lib/bootstrap/less/hero-unit.less
  57. +72 −0 protected/extensions/bootstrap/lib/bootstrap/less/labels-badges.less
  58. +16 −0 protected/extensions/bootstrap/lib/bootstrap/less/layouts.less
  59. +681 −0 protected/extensions/bootstrap/lib/bootstrap/less/mixins.less
  60. +98 −0 protected/extensions/bootstrap/lib/bootstrap/less/modals.less
  61. +475 −0 protected/extensions/bootstrap/lib/bootstrap/less/navbar.less
  62. +384 −0 protected/extensions/bootstrap/lib/bootstrap/less/navs.less
  63. +40 −0 protected/extensions/bootstrap/lib/bootstrap/less/pager.less
  64. +64 −0 protected/extensions/bootstrap/lib/bootstrap/less/pagination.less
  65. +117 −0 protected/extensions/bootstrap/lib/bootstrap/less/popovers.less
  66. +122 −0 protected/extensions/bootstrap/lib/bootstrap/less/progress-bars.less
  67. +137 −0 protected/extensions/bootstrap/lib/bootstrap/less/reset.less
  68. +28 −0 protected/extensions/bootstrap/lib/bootstrap/less/responsive-1200px-min.less
  69. +174 −0 protected/extensions/bootstrap/lib/bootstrap/less/responsive-767px-max.less
  70. +19 −0 protected/extensions/bootstrap/lib/bootstrap/less/responsive-768px-979px.less
  71. +177 −0 protected/extensions/bootstrap/lib/bootstrap/less/responsive-navbar.less
  72. +43 −0 protected/extensions/bootstrap/lib/bootstrap/less/responsive-utilities.less
  73. +48 −0 protected/extensions/bootstrap/lib/bootstrap/less/responsive.less
  74. +52 −0 protected/extensions/bootstrap/lib/bootstrap/less/scaffolding.less
  75. +193 −0 protected/extensions/bootstrap/lib/bootstrap/less/sprites.less
  76. +245 −0 protected/extensions/bootstrap/lib/bootstrap/less/tables.less
  77. +52 −0 protected/extensions/bootstrap/lib/bootstrap/less/thumbnails.less
  78. +70 −0 protected/extensions/bootstrap/lib/bootstrap/less/tooltip.less
  79. +221 −0 protected/extensions/bootstrap/lib/bootstrap/less/type.less
  80. +30 −0 protected/extensions/bootstrap/lib/bootstrap/less/utilities.less
  81. +279 −0 protected/extensions/bootstrap/lib/bootstrap/less/variables.less
  82. +29 −0 protected/extensions/bootstrap/lib/bootstrap/less/wells.less
  83. +532 −0 protected/extensions/bootstrap/widgets/TbActiveForm.php
  84. +142 −0 protected/extensions/bootstrap/widgets/TbAlert.php
  85. +73 −0 protected/extensions/bootstrap/widgets/TbBadge.php
  86. +195 −0 protected/extensions/bootstrap/widgets/TbBaseMenu.php
  87. +84 −0 protected/extensions/bootstrap/widgets/TbBreadcrumbs.php
  88. +249 −0 protected/extensions/bootstrap/widgets/TbButton.php
  89. +81 −0 protected/extensions/bootstrap/widgets/TbButtonColumn.php
  90. +120 −0 protected/extensions/bootstrap/widgets/TbButtonGroup.php
  91. +172 −0 protected/extensions/bootstrap/widgets/TbCarousel.php
  92. +92 −0 protected/extensions/bootstrap/widgets/TbCollapse.php
  93. +56 −0 protected/extensions/bootstrap/widgets/TbDataColumn.php
  94. +68 −0 protected/extensions/bootstrap/widgets/TbDetailView.php
  95. +90 −0 protected/extensions/bootstrap/widgets/TbDropdown.php
  96. +128 −0 protected/extensions/bootstrap/widgets/TbGridView.php
  97. +62 −0 protected/extensions/bootstrap/widgets/TbHeroUnit.php
  98. +73 −0 protected/extensions/bootstrap/widgets/TbLabel.php
  99. +54 −0 protected/extensions/bootstrap/widgets/TbListView.php
  100. +103 −0 protected/extensions/bootstrap/widgets/TbMenu.php
  101. +87 −0 protected/extensions/bootstrap/widgets/TbModal.php
  102. +166 −0 protected/extensions/bootstrap/widgets/TbNavbar.php
  103. +128 −0 protected/extensions/bootstrap/widgets/TbPager.php
  104. +86 −0 protected/extensions/bootstrap/widgets/TbProgress.php
  105. +58 −0 protected/extensions/bootstrap/widgets/TbScrollSpy.php
  106. +183 −0 protected/extensions/bootstrap/widgets/TbTabs.php
  107. +50 −0 protected/extensions/bootstrap/widgets/TbThumbnails.php
  108. +54 −0 protected/extensions/bootstrap/widgets/TbTypeahead.php
  109. +470 −0 protected/extensions/bootstrap/widgets/input/TbInput.php
  110. +213 −0 protected/extensions/bootstrap/widgets/input/TbInputHorizontal.php
  111. +61 −0 protected/extensions/bootstrap/widgets/input/TbInputInline.php
  112. +35 −0 protected/extensions/bootstrap/widgets/input/TbInputSearch.php
  113. +170 −0 protected/extensions/bootstrap/widgets/input/TbInputVertical.php
  114. +105 −86 protected/views/layouts/main.php
View
@@ -1,3 +1,6 @@
-assets/
-protected/runtime/
-themes/classic/views/
+assets/
+protected/runtime/*
+themes/classic/views/
+/index.php
+.idea/
+protected/data/user.db
View
@@ -36,7 +36,6 @@
div.form
{
- margin: 0;
}
div.form input,
@@ -83,12 +82,16 @@ div.form span.required
color: red;
}
+div.form div.error label:first-child,
div.form label.error,
div.form span.error
{
color: #C00;
}
+div.form div.error input,
+div.form div.error textarea,
+div.form div.error select,
div.form input.error,
div.form textarea.error,
div.form select.error
@@ -97,6 +100,18 @@ div.form select.error
border-color: #C00;
}
+div.form div.success input,
+div.form div.success textarea,
+div.form div.success select,
+div.form input.success,
+div.form textarea.success,
+div.form select.success
+{
+ background: #E6EFC2;
+ border-color: #C6D880;
+}
+
+
div.form .errorSummary
{
border: 2px solid #C00;
@@ -124,7 +139,7 @@ div.form .errorSummary ul
padding: 0 0 0 20px;
}
-div.wide form label
+div.wide.form label
{
float: left;
margin-right: 10px;
@@ -133,18 +148,13 @@ div.wide form label
width: 100px;
}
-div.wide form .row
+div.wide.form .row
{
clear: left;
}
-div.wide form .buttons
+div.wide.form .buttons, div.wide.form .hint, div.wide.form .errorMessage
{
clear: left;
padding-left: 110px;
}
-
-div.wide form .errorMessage
-{
- margin: 0 0 0 110px;
-}
View
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------
- Blueprint CSS Framework 0.9
+ Blueprint CSS Framework 1.0.1
http://blueprintcss.org
* Copyright (c) 2007-Present. See LICENSE for more info.
@@ -14,7 +14,7 @@
/* 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 {display:inline;overflow-x:hidden;}
+* 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-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
* html legend {margin:0px -8px 16px 0;padding:0;}
sup {vertical-align:text-top;}
sub {vertical-align:text-bottom;}
@@ -24,12 +24,13 @@ img {-ms-interpolation-mode:bicubic;}
.clearfix, .container {display:inline-block;}
* html .clearfix, * html .container {height:1%;}
fieldset {padding-top:0;}
+legend {margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em;}
textarea {overflow:auto;}
+label {vertical-align:middle;position:relative;top:-0.25em;}
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
@@ -27,6 +27,11 @@ body
padding: 20px;
}
+#sidebar
+{
+ padding: 20px 20px 20px 0;
+}
+
#footer
{
padding: 10px;
@@ -49,8 +54,7 @@ body
#mainmenu ul
{
- /* padding:6px 20px 5px 20px; */
- xpadding: 0px;
+ padding:6px 20px 5px 20px;
margin:0px;
}
@@ -66,56 +70,55 @@ body
font-size:12px;
font-weight:bold;
text-decoration:none;
- padding:0px 8px;
+ padding:5px 8px;
}
-#mainmenu ul li a:hover, #mainmenu ul li a.active
+#mainmenu ul li a:hover, #mainmenu ul li.active a
{
- /* color: #6399cd;
- background-color:#EFF4FA; */
- color: #FA0;
+ color: #6399cd;
+ background-color:#EFF4FA;
text-decoration:none;
}
-div.error, div.notice, .success
+div.flash-error, div.flash-notice, div.flash-success
{
padding:.8em;
margin-bottom:1em;
border:2px solid #ddd;
}
-div.error
+div.flash-error
{
background:#FBE3E4;
color:#8a1f11;
border-color:#FBC2C4;
}
-div.notice
+div.flash-notice
{
background:#FFF6BF;
color:#514721;
border-color:#FFD324;
}
-div.success
+div.flash-success
{
background:#E6EFC2;
color:#264409;
border-color:#C6D880;
}
-div.error a
+div.flash-error a
{
color:#8a1f11;
}
-div.notice a
+div.flash-notice a
{
color:#514721;
}
-div.success a
+div.flash-success a
{
color:#264409;
}
@@ -125,51 +128,102 @@ div.form .rememberMe label
display: inline;
}
-.actions
+div.view
+{
+ padding: 10px;
+ margin: 10px 0;
+ border: 1px solid #C9E0ED;
+}
+
+div.breadcrumbs
+{
+ font-size: 0.9em;
+ padding: 5px 20px;
+}
+
+div.breadcrumbs span
+{
+ font-weight: bold;
+}
+
+div.search-form
+{
+ padding: 10px;
+ margin: 10px 0;
+ background: #eee;
+}
+
+.portlet
+{
+
+}
+
+.portlet-decoration
+{
+ padding: 3px 8px;
+ background: #B7D6E7;
+ border-left: 5px solid #6FACCF;
+}
+
+.portlet-title
{
- margin: 0 0 10px 0;
+ font-size: 12px;
+ font-weight: bold;
padding: 0;
+ margin: 0;
+ color: #298dcd;
}
-.actions li
+.portlet-content
{
- display: inline;
+ font-size:0.9em;
+ margin: 0 0 15px 0;
+ padding: 5px 8px;
+ background:#EFFDFF;
+}
+
+.portlet-content ul
+{
+ list-style-image:none;
+ list-style-position:outside;
+ list-style-type:none;
margin: 0;
padding: 0;
}
-.actions li a
+.portlet-content li
{
- padding: 5px;
+ padding: 2px 0 4px 0px;
+}
+
+.operations
+{
+ list-style-type: none;
margin: 0;
- color: #298dcd;
- text-decoration: none;
- font-size: 0.8em;
- font-weight: bold;
- background: #DFF4FF;
- border-left: 5px solid #589FC8;
+ padding: 0;
}
-.actions li a:hover, .actions li a.active
+.operations li
{
- background: #589FC8;
- color: white;
+ padding-bottom: 2px;
}
-div.view
+.operations li a
{
- padding: 10px;
- margin: 10px 0;
- border: 1px solid #C9E0ED;
+ font: bold 12px Arial;
+ color: #0066A4;
+ display: block;
+ padding: 2px 0 2px 8px;
+ line-height: 15px;
+ text-decoration: none;
}
-div.breadcrumbs
+.operations li a:visited
{
- font-size: 0.9em;
- padding: 5px 20px;
+ color: #0066A4;
}
-div.breadcrumbs span
+.operations li a:hover
{
- font-weight: bold;
+ background: #80CFFF;
}
View
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------
- Blueprint CSS Framework 0.9
+ Blueprint CSS Framework 1.0.1
http://blueprintcss.org
* Copyright (c) 2007-Present. See LICENSE for more info.
Oops, something went wrong.

0 comments on commit dd2e12f

Please sign in to comment.