Permalink
Browse files

Framework update

  • Loading branch information...
olvlvl committed Sep 18, 2012
1 parent 2a1914e commit e6aa3515344e40fbd8fa9f9b45a127d4275e405a
Showing with 2,831 additions and 1,648 deletions.
  1. +2 −0 admin.php
  2. +31 −69 assets/admin-more.css
  3. +47 −27 assets/admin-uncompressed.css
  4. +8 −19 assets/admin.css
  5. BIN assets/css/base/loader.gif
  6. BIN assets/css/base/navigation.png
  7. BIN assets/css/input/button-overlay-light.png
  8. BIN assets/css/input/button-overlay-shadow-big.png
  9. BIN assets/css/input/button-overlay-shadow.png
  10. BIN assets/css/input/textfield-resize.png
  11. +15 −2 assets/css/manage.css
  12. BIN assets/fontawesome-webfont.woff
  13. +298 −374 assets/icybee.css
  14. +11 −7 build/actionbar.less
  15. +77 −0 config/autoload.php
  16. +0 −60 config/core.php
  17. +5 −4 config/hooks.php
  18. +12 −6 config/routes.php
  19. +25 −0 engines/Patron/config/autoload.php
  20. +0 −28 engines/Patron/config/core.php
  21. +7 −0 engines/Patron/lib/patron/compiler.php
  22. +38 −7 engines/Patron/lib/patron/engine.php
  23. +1 −5 engines/Patron/lib/patron/nodes/control.php
  24. +0 −3 engines/Patron/markups/native.markups.php
  25. +7 −0 framework/BlueTihi/config/autoload.php
  26. +0 −10 framework/BlueTihi/config/core.php
  27. +1 −1 framework/Brickrouge
  28. +1 −1 framework/ICanBoogie
  29. +9 −9 framework/tests/arr.php
  30. +4 −7 includes/route.php
  31. +1 −2 lib/activerecord/model.constructor.php
  32. +2 −2 lib/blocks/delete.php
  33. +30 −0 lib/controllers/admin-index.php
  34. +75 −0 lib/controllers/block.php
  35. +29 −0 lib/controllers/config.php
  36. +17 −0 lib/controllers/delete.php
  37. +50 −0 lib/controllers/edit.php
  38. +8 −7 lib/core/accessors/modules.php
  39. +14 −6 lib/core/core.php
  40. +170 −0 lib/decorators/admin.php
  41. +58 −0 lib/decorators/document.php
  42. +192 −0 lib/decorators/stats.php
  43. +39 −17 lib/element/actionbar.php
  44. +6 −5 lib/element/document.php
  45. +1 −1 lib/element/navigation.php
  46. +106 −0 lib/element/site-menu.php
  47. +113 −0 lib/element/user-menu.php
  48. +89 −146 lib/hooks.php
  49. +99 −63 lib/icybee.php
  50. +1 −1 lib/operation/module/config.php
  51. +10 −2 lib/rendering.php
  52. +9 −2 lib/views.php
  53. +14 −1 lib/views/view.php
  54. +2 −2 lib/widget/manager.js
  55. +1 −22 lib/widget/manager.php
  56. +6 −0 modules/articles/config/autoload.php
  57. +0 −9 modules/articles/config/core.php
  58. +1 −1 modules/articles/views/vocabulary--category--vocabulary-home.html
  59. +1 −1 modules/comments
  60. +7 −0 modules/contents/config/autoload.php
  61. +0 −10 modules/contents/config/core.php
  62. +1 −1 modules/contents/lib/operations/home_exclude.php
  63. +1 −1 modules/contents/lib/operations/home_include.php
  64. +7 −1 modules/contents/lib/views/provider.php
  65. +18 −0 modules/dashboard/README.md
  66. +11 −0 modules/dashboard/config/hooks.php
  67. +4 −8 modules/dashboard/config/routes.php
  68. +41 −0 modules/dashboard/hooks.php
  69. 0 modules/dashboard/{ → lib}/operations/order.php
  70. +42 −0 modules/editor/config/autoload.php
  71. +0 −45 modules/editor/config/core.php
  72. +13 −3 modules/editor/lib/collection.php
  73. +1 −1 modules/editor/lib/editors/feed/editor.php
  74. +1 −1 modules/editor/lib/editors/rte/editor.php
  75. +5 −3 modules/editor/lib/editors/rte/mooeditable/Source/MooEditable/MooEditable.js
  76. +6 −0 modules/files/config/autoload.php
  77. +0 −9 modules/files/config/core.php
  78. +1 −1 modules/files/lib/blocks/edit.php
  79. +1 −1 modules/files/lib/operations/save.php
  80. +1 −1 modules/files/lib/operations/upload.php
  81. +2 −2 modules/files/primary.model.php
  82. +18 −0 modules/forms/config/autoload.php
  83. +0 −21 modules/forms/config/core.php
  84. +3 −3 modules/forms/config/routes.php
  85. +1 −1 modules/forms/hooks.php
  86. +1 −1 modules/forms/operations/post.php
  87. +9 −0 modules/i18n/config/autoload.php
  88. +0 −12 modules/i18n/config/core.php
  89. +1 −1 modules/i18n/config/routes.php
  90. +2 −2 modules/i18n/lib/elements/node-native.php
  91. +13 −0 modules/images/config/autoload.php
  92. +0 −16 modules/images/config/core.php
  93. +8 −8 modules/images/config/routes.php
  94. +3 −3 modules/journal/config/routes.php
  95. +2 −2 modules/journal/hooks.php
  96. +1 −1 modules/journal/module.php
  97. +6 −0 modules/nodes.attachments/config/autoload.php
  98. +0 −9 modules/nodes.attachments/config/core.php
  99. +1 −1 modules/nodes.attachments/config/routes.php
  100. +3 −3 modules/nodes.attachments/hooks.php
  101. +2 −1 modules/nodes.onlinr/hooks.php
  102. +19 −0 modules/nodes/config/autoload.php
  103. +0 −22 modules/nodes/config/core.php
  104. +1 −1 modules/nodes/hooks.php
  105. +1 −1 modules/nodes/lib/operations/delete.php
  106. +1 −1 modules/nodes/lib/operations/export.php
  107. +2 −2 modules/nodes/lib/operations/import.php
  108. +1 −1 modules/nodes/lib/operations/offline.php
  109. +1 −1 modules/nodes/lib/operations/online.php
  110. +2 −2 modules/nodes/lib/operations/save.php
  111. +9 −6 modules/nodes/module.php
  112. +1 −2 modules/nodes/primary.ar.php
  113. +3 −2 modules/nodes/primary.model.php
  114. +1 −1 modules/nodes/widgets/adjust-node.php
  115. +24 −0 modules/pages/config/autoload.php
  116. +0 −25 modules/pages/config/core.php
  117. +2 −2 modules/pages/config/hooks.php
  118. +9 −4 modules/pages/contents.ar.php
  119. +32 −12 modules/pages/hooks.php
  120. +0 −87 modules/pages/lib/cache-manager.php
  121. +1 −1 modules/pages/lib/elements/breadcrumb.php
  122. +221 −0 modules/pages/lib/elements/languages.php
  123. +1 −1 modules/pages/lib/operations/copy.php
  124. +2 −2 modules/pages/lib/operations/delete.php
  125. +1 −1 modules/pages/lib/operations/save.php
  126. +4 −111 modules/pages/markups.php
  127. +1 −1 modules/pages/module.php
  128. +1 −1 modules/pages/primary.ar.php
  129. +4 −5 modules/pages/primary.model.php
  130. +1 −1 modules/pages/view.hooks.php
  131. +3 −2 modules/search/config/routes.php
  132. +1 −2 modules/search/hooks.php
  133. +12 −5 modules/sites/config/hooks.php
  134. +4 −4 modules/sites/config/routes.php
  135. +80 −1 modules/sites/hooks.php
  136. +1 −1 modules/sites/lib/operations/save.php
  137. +1 −1 modules/sites/lib/operations/status.php
  138. +101 −1 modules/sites/primary.ar.php
  139. +4 −1 modules/sites/primary.model.php
  140. +4 −0 modules/sites/public/admin.css
  141. +14 −0 modules/system.cache/config/autoload.php
  142. +0 −17 modules/system.cache/config/core.php
  143. +1 −1 modules/system.cache/config/routes.php
  144. +5 −3 modules/system.cache/lib/blocks/manage.php
  145. +14 −3 modules/system.cache/lib/collection.php
  146. +8 −3 modules/system.cache/module.php
  147. +1 −1 modules/system.cache/operations/clear.php
  148. +1 −1 modules/system.cache/operations/config.php
  149. +1 −1 modules/system.cache/operations/disable.php
  150. +1 −1 modules/system.cache/operations/enable.php
  151. +3 −2 modules/system.cache/public/admin.css
  152. +16 −7 modules/system.modules/config/routes.php
  153. +6 −0 modules/system.registry/config/autoload.php
  154. +0 −9 modules/system.registry/config/core.php
  155. +1 −1 modules/system.registry/hooks.php
  156. +2 −2 modules/system.registry/lib/handler.php
  157. +6 −0 modules/taxonomy.support/config/autoload.php
  158. +0 −9 modules/taxonomy.support/config/core.php
  159. +3 −3 modules/taxonomy.terms/config/routes.php
  160. +1 −1 modules/taxonomy.terms/hooks.php
  161. +2 −2 modules/taxonomy.terms/primary.ar.php
  162. +6 −0 modules/taxonomy.vocabulary/config/autoload.php
  163. +0 −9 modules/taxonomy.vocabulary/config/core.php
  164. +6 −7 modules/taxonomy.vocabulary/config/routes.php
  165. +15 −5 modules/taxonomy.vocabulary/hooks.php
  166. +1 −1 modules/taxonomy.vocabulary/lib/blocks/edit.php
  167. +1 −1 modules/taxonomy.vocabulary/lib/blocks/manage.php
  168. +2 −2 modules/taxonomy.vocabulary/primary.ar.php
  169. +1 −1 modules/thumbnailer
  170. +4 −4 modules/users.members/config/routes.php
  171. +3 −3 modules/users.roles/config/routes.php
  172. +1 −1 modules/users.roles/lib/operations/permissions.php
  173. +6 −7 modules/users.roles/module.php
  174. +1 −1 modules/users.roles/primary.model.php
  175. +8 −0 modules/users/config/autoload.php
  176. +0 −7 modules/users/config/core.php
  177. +9 −5 modules/users/config/hooks.php
  178. +10 −20 modules/users/config/routes.php
  179. +34 −2 modules/users/hooks.php
  180. +2 −2 modules/users/lib/blocks/edit.php
  181. +1 −1 modules/users/lib/operations/activate.php
  182. +1 −1 modules/users/lib/operations/deactivate.php
  183. +2 −2 modules/users/lib/operations/login.php
  184. +1 −1 modules/users/lib/operations/nonce_login.php
  185. +2 −2 modules/users/lib/operations/nonce_login_request.php
  186. +2 −2 modules/users/lib/operations/save.php
  187. +1 −2 modules/users/lib/operations/unlock_login.php
  188. +2 −0 modules/users/module.php
  189. +30 −14 modules/users/primary.ar.php
  190. +2 −2 modules/users/primary.model.php
  191. +54 −60 startup.php
View
@@ -9,6 +9,8 @@
* file that was distributed with this source code.
*/
+\ICanBoogie\log_info('Using admin.php');
+
global $document;
$time = microtime(true);
View
@@ -1,38 +1,5 @@
@CHARSET "UTF-8";
-/*
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: bold;
- src: local('Roboto Medium'), local('Roboto-Medium'), url('http://themes.googleusercontent.com/static/fonts/roboto/v2/RxZJdnzeo3R5zSexge8UUbO3LdcAZYWl9Si6vvxL-qU.woff') format('woff');
-}
-@font-face {
- font-family: 'Roboto';
- font-style: italic;
- font-weight: bold;
- src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), url('http://themes.googleusercontent.com/static/fonts/roboto/v2/OLffGBTaF0XFOW1gnuHF0brIa-7acMAeDBVuclsi6Gc.woff') format('woff');
-}
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto Regular'), local('Roboto-Regular'), url('http://themes.googleusercontent.com/static/fonts/roboto/v2/CrYjSnGjrRCn0pd9VQsnFOvvDin1pK8aKteLpeZ5c0A.woff') format('woff');
-}
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 100;
- src: local('Roboto Thin'), local('Roboto-Thin'), url('http://themes.googleusercontent.com/static/fonts/roboto/v2/vzIUHo9z-oJ4WgkpPOtg13YhjbSpvc47ee6xR_80Hnw.woff') format('woff');
-}
-@font-face {
- font-family: 'Roboto';
- font-style: italic;
- font-weight: 400;
- src: local('Roboto Italic'), local('Roboto-Italic'), url('http://themes.googleusercontent.com/static/fonts/roboto/v2/1pO9eUAp8pSF8VnRTP3xnnYhjbSpvc47ee6xR_80Hnw.woff') format('woff');
-}
-*/
-
.light
{
color: #808080;
@@ -132,6 +99,7 @@ input, textarea, select, .uneditable-input, .like-input {
display: inline-block;
}
+/*
.input-prepend .add-on, .input-append .add-on {
display: inline-block;
float: none;
@@ -144,6 +112,7 @@ input, textarea, select, .uneditable-input, .like-input {
.input-prepend, .input-append {
margin-bottom: 0;
}
+*/
.input > label:last-child {
margin-bottom: 0
@@ -207,9 +176,10 @@ li:hover > .dropdown-menu {
}
.dropdown-menu {
- font-size: 12px;
+ font-size: 14px;
}
+/*
.dropdown-menu.bottom-up {
top: auto;
bottom: 100%;
@@ -230,12 +200,12 @@ li:hover > .dropdown-menu {
clear: both;
font-weight: normal;
line-height: 18px;
- color: #555 !important; /* we use important otherwise the property is overrode when in table.manage */
+ color: #555 !important; /* we use important otherwise the property is overrode when in table.manage * /
white-space: nowrap;
}
.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
- color: #fff !important; /* we use important otherwise the color is overrode when in table.manage */
- text-decoration: none !important; /* same here */
+ color: #fff !important; /* we use important otherwise the color is overrode when in table.manage * /
+ text-decoration: none !important; /* same here * /
background-color: #0088cc;
}
.dropdown.open {
@@ -249,8 +219,7 @@ li:hover > .dropdown-menu {
.dropdown.open .dropdown-menu {
display: block;
}
-
-
+*/
.navbar .dropdown-menu {
border-radius: 4px;
@@ -284,21 +253,19 @@ li:hover > .dropdown-menu {
#quick
{
- color: gray;
+ color: silver;
background-color: black;
font-size: 12px;
padding: 1em 16px;
height: 16px;
}
-#quick .language {
- color: gray;
-}
-
+/*
#quick .active .language,
#quick li:hover .language {
color: inherit;
}
+*/
#quick .separator
{
@@ -307,7 +274,11 @@ li:hover > .dropdown-menu {
#quick a
{
- color: silver;
+ color: inherit;
+}
+
+#quick .language {
+ color: #777;
}
#quick .sites
@@ -384,22 +355,6 @@ li:hover > .dropdown-menu {
border-right-color: #333;
}
-#loader
-{
- position: absolute;
- right: 1em;
- top: 50%;
- margin-top: -16px;
- background: url(base/loader.gif) center no-repeat;
- overflow: hidden;
- height: 0;
- padding-top: 32px;
- width: 32px;
- display: block;
- visibility: hidden;
-}
-
-
/*
**
@@ -412,7 +367,9 @@ NAVIGATION
{
font-size: 16px;
border-top: 1px solid #333;
- background: black url(css/base/navigation.png) repeat-x top left;
+ background-image: -moz-linear-gradient(top, #222, #000);
+ background-image: -webkit-linear-gradient(top, #222, #000);
+ background-image: linear-gradient(#222, #000);
padding: 0;
position: relative;
}
@@ -487,7 +444,17 @@ CONTENTS
* Bootstrap
*/
-#-BOOTSTRAP {}
+___BOOTSTRAP {}
+
+.input-append,
+.input-prepend {
+ vertical-align: middle;
+ display: inline-block;
+}
+
+.btn {
+ line-height: 1.428571em;
+}
.nav-tabs > .active > a,
.nav-tabs > .active > a:hover {
@@ -546,6 +513,7 @@ CONTENTS
#quick .caret {
border-top-color: white;
vertical-align: middle;
+ opacity: .6;
}
#quick .dropdown-menu a {
@@ -573,16 +541,10 @@ CONTENTS
border-color: #444;
}
-#quick .icon-white {
- opacity: .6;
-}
-
-#quick .btn-group:hover .icon-white,
#quick .btn-group:hover .caret {
opacity: .8;
}
-#quick .btn-group.open .icon-white,
#quick .btn-group.open .caret {
opacity: 1;
}
@@ -1,7 +1,8 @@
.clearfix {
*zoom: 1;
}
-.clearfix:before, .clearfix:after {
+.clearfix:before,
+.clearfix:after {
display: table;
content: "";
}
@@ -76,26 +77,25 @@
right: 0;
top: 0;
z-index: 1030;
- background-color: rgba(0, 0, 0, 0.88);
- background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.8), #000000);
- background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.8), #000000);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.8)), to(#000000));
- background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.8), #000000);
- background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.8), #000000);
- background-image: linear-gradient(top, rgba(0, 0, 0, 0.8), #000000);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='rgba(0, 0, 0, 0.8)', endColorstr='#000000', GradientType=0);
- border-bottom: 1px solid #cfcfcf;
+ background: black;
+ background: -moz-linear-gradient(center top, rgba(0, 0, 0, 0.8), #000000);
+ background: -webkit-linear-gradient(center top, rgba(0, 0, 0, 0.8), #000000);
+ background: -o-linear-gradient(center top, rgba(0, 0, 0, 0.8), #000000);
+ background: linear-gradient(center top, rgba(0, 0, 0, 0.8), #000000);
+ border-bottom: 1px solid black;
padding: 8px 16px 7px 16px;
box-shadow: 0 5px 20px rgba(0, 0, 0, 0.5);
}
.actionbar.fixed + #contents {
padding-top: 60px;
}
-.actionbar .pull-left > *, .actionbar .pull-right > * {
+.actionbar .pull-left > *,
+.actionbar .pull-right > * {
float: left;
}
-.actionbar .pull-left > * + *, .actionbar .pull-right > * + *, .actionbar .pull-left + .pull-left {
+.actionbar .pull-left > * + *,
+.actionbar .pull-right > * + *,
+.actionbar .pull-left + .pull-left {
margin-left: 16px;
}
.actionbar .btn-toolbar {
@@ -111,10 +111,14 @@
.actionbar button {
padding: 3px 10px;
}
+.actionbar .btn {
+ line-height: 18px;
+}
/*
* Links to the various parts of the module.
*/
-.actionbar-search, .actionbar-toolbar {
+.actionbar-search,
+.actionbar-toolbar {
float: left;
}
.actionbar-toolbar > * + * {
@@ -166,10 +170,12 @@
.actionbar-title .btn-group .caret {
vertical-align: middle;
}
-.actionbar-title .dropdown-toggle:hover, .actionbar-title .btn-group.open .dropdown-toggle {
+.actionbar-title .dropdown-toggle:hover,
+.actionbar-title .btn-group.open .dropdown-toggle {
border-color: #ccc;
}
-.actionbar.fixed .actionbar-title .dropdown-toggle:hover, .actionbar.fixed .actionbar-title .btn-group.open .dropdown-toggle {
+.actionbar.fixed .actionbar-title .dropdown-toggle:hover,
+.actionbar.fixed .actionbar-title .btn-group.open .dropdown-toggle {
border-color: #444;
}
.actionbar.fixed .actionbar-title .caret {
@@ -192,8 +198,8 @@
*/
form.navbar-search {
border: 1px solid #CFCFCF;
- font-size: 12px;
- /* we use a fixed value so that the height of the form is the same of the browse element*/
+ font-size: 14px;
+ /* we use a fixed value so that the height of the form is the same as the browse element*/
padding: 2px 0.5ex;
background-color: #F6F6F6;
@@ -225,16 +231,18 @@ form.navbar-search button {
font-weight: normal;
font-size: 12px;
text-shadow: none;
- line-height: 16px;
+ line-height: 16px !important;
padding: 0;
margin-left: 1ex;
box-shadow: none;
visibility: hidden;
text-indent: 14px;
opacity: .6;
overflow: hidden;
+ vertical-align: middle;
}
-form.navbar-search button:hover, form.navbar-search button:active {
+form.navbar-search button:hover,
+form.navbar-search button:active {
opacity: .8;
background-color: transparent;
background-position: -312px 0;
@@ -291,7 +299,7 @@ form.navbar-search.active:not(.focus) button {
border-color: #CCC #CCC #BBB;
border-radius: 3px;
height: auto;
- background: bottom right no-repeat white;
+ background: bottom right no-repeat #ffffff;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
padding: 6px;
display: inline-block;
@@ -315,12 +323,18 @@ form.navbar-search.active:not(.focus) button {
color: #808080 !important;
font-style: italic;
}
-.spinner:not(.placeholder) .spinner-placeholder, .spinner.placeholder .spinner-content {
+.spinner:not(.placeholder) .spinner-placeholder,
+.spinner.placeholder .spinner-content {
display: none;
}
form {
margin: 0;
}
+.form-horizontal .control-group.required > label:after {
+ width: 1ex;
+ margin-right: -1ex;
+ display: inline-block;
+}
.form-primary textarea {
width: 100%;
box-sizing: border-box;
@@ -366,7 +380,8 @@ form {
.form-primary > .group > .control-group:last-child {
margin-bottom: 15px;
}
-.form-primary > .group > .control-group > label, .form-primary > .group > .control-group > .controls > label {
+.form-primary > .group > .control-group > label,
+.form-primary > .group > .control-group > .controls > label {
font-weight: bold;
}
.form-primary .group-legend label {
@@ -425,10 +440,12 @@ form {
.checkbox-wrapper input {
display: none;
}
-.checkbox-wrapper.circle, .checkbox-wrapper.rectangle {
+.checkbox-wrapper.circle,
+.checkbox-wrapper.rectangle {
border: 1px solid #CFCFCF;
}
-.checkbox-wrapper.circle.checked, .checkbox-wrapper.rectangle.checked {
+.checkbox-wrapper.circle.checked,
+.checkbox-wrapper.rectangle.checked {
background-color: #FFC;
}
.checkbox-wrapper.circle {
@@ -440,10 +457,13 @@ form {
/*
* Reset buttons
*/
-button + .btn.reset-default-value, input + .btn.reset-default-value, div.input-append + .btn.reset-default-value {
+button + .btn.reset-default-value,
+input + .btn.reset-default-value,
+div.input-append + .btn.reset-default-value {
margin-left: 1ex;
}
-textarea + .btn.reset-default-value, div::not(.input-append) + .btn.reset-default-value {
+textarea + .btn.reset-default-value,
+div::not(.input-append) + .btn.reset-default-value {
margin-top: .5em;
}
.form-primary .combo {
Oops, something went wrong.

0 comments on commit e6aa351

Please sign in to comment.