Skip to content
This repository has been archived by the owner on Jan 10, 2022. It is now read-only.

Commit

Permalink
this is the form refactor. this also has the start of the move of som…
Browse files Browse the repository at this point in the history 
…e user-specific functionality to the front-end
  • Loading branch information
@dennishall
dennishall committed Sep 9, 2011
1 parent 9f58dc0 commit e0e5a9e
Show file tree
Hide file tree
Showing 8 changed files with 1,743 additions and 1,517 deletions.
1,161 changes: 651 additions & 510 deletions lib/Form.js
View file

Large diffs are not rendered by default.

567 changes: 281 additions & 286 deletions modules/core/admin/admin.js
View file

Large diffs are not rendered by default.

404 changes: 215 additions & 189 deletions modules/core/user/user.js
View file

Large diffs are not rendered by default.

304 changes: 141 additions & 163 deletions themes/core/cleanslate/public/css/admin-menu.css
View file
Original file line number Diff line number Diff line change
@@ -1,202 +1,180 @@
/* Main menu */
/* Excellent CSS from http://www.red-team-design.com/css3-dropdown-menu */

#admin-menu
{
width: 100%;
margin: 0;
padding: 2px 0 0 0;
list-style: none;
background: #111;
background: -moz-linear-gradient(#444, #111);
background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));
background: -webkit-linear-gradient(#444, #111);
background: -o-linear-gradient(#444, #111);
background: -ms-linear-gradient(#444, #111);
background: linear-gradient(#444, #111);

#admin-menu {
width: 100%;
margin: 0;
padding: 2px 0 0 0;
list-style: none;
background: #111;
background: -moz-linear-gradient(#444, #111);
background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));
background: -webkit-linear-gradient(#444, #111);
background: -o-linear-gradient(#444, #111);
background: -ms-linear-gradient(#444, #111);
background: linear-gradient(#444, #111);

}

#admin-menu li
{
float: left;
padding: 0 0 10px 0;
position: relative;
line-height: 0;

#admin-menu li {
float: left;
padding: 0;
position: relative;
}

#admin-menu a
{
float: left;
height: 20px;
padding: 0 22px;
color: #CFCFCF;
text-transform: uppercase;
font: bold 12px/25px Arial, Helvetica;
text-decoration: none;
text-shadow: 0 1px 0 #000;
#admin-menu a {
float: left;
height: 20px;
padding: 0 22px 10px;
color: #CFCFCF;
text-transform: uppercase;
font: bold 12px/29px Arial, Helvetica;
text-decoration: none;
text-shadow: 0 1px 0 #000;
}

#admin-menu li:hover > a
{
color: #fafafa;
#admin-menu li:hover > a {
color: #fafafa;
}

*html #admin-menu li a:hover /* IE6 */
{
color: #fafafa;
*html #admin-menu li a:hover /* IE6 */ {
color: #fafafa;
}

#admin-menu li:hover > ul
{
display: block;
#admin-menu li:hover > ul {
display: block;
}

/* Sub-menu */

#admin-menu ul
{
list-style: none;
margin: 0;
padding: 0;
margin-left: 10px;
display: none;
position: absolute;
top: 30px;
left: 0;
z-index: 99999;
background: #444;
background: -moz-linear-gradient(#444, #111);
background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));
background: -webkit-linear-gradient(#444, #111);
background: -o-linear-gradient(#444, #111);
background: -ms-linear-gradient(#444, #111);
background: linear-gradient(#444, #111);
-moz-box-shadow: 0 0 2px rgba(255,255,255,.5);
-webkit-box-shadow: 0 0 2px rgba(255,255,255,.5);
box-shadow: 0 0 2px rgba(255,255,255,.5);
-moz-border-radius: 5px;
border-radius: 5px;
}

#admin-menu ul ul
{
#admin-menu ul {
list-style: none;
margin: 0;
padding: 0;
margin-left: 10px;
display: none;
position: absolute;
top: 30px;
left: 0;
z-index: 99999;
background: #444;
background: -moz-linear-gradient(#444, #111);
background: -webkit-gradient(linear,left bottom,left top,color-stop(0, #111),color-stop(1, #444));
background: -webkit-linear-gradient(#444, #111);
background: -o-linear-gradient(#444, #111);
background: -ms-linear-gradient(#444, #111);
background: linear-gradient(#444, #111);
-moz-box-shadow: 0 0 2px rgba(255,255,255,.5);
-webkit-box-shadow: 0 0 2px rgba(255,255,255,.5);
box-shadow: 0 0 2px rgba(255,255,255,.5);
-moz-border-radius: 5px;
border-radius: 5px;
}

#admin-menu ul ul {
top: 0;
left: 140px;
}

#admin-menu ul li
{
float: none;
margin: 0;
padding: 0;
display: block;
-moz-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
-webkit-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
#admin-menu ul li {
float: none;
margin: 0;
padding: 0;
display: block;
-moz-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
-webkit-box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
box-shadow: 0 1px 0 #111111, 0 2px 0 #777777;
}

#admin-menu ul li:last-child
{
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}

#admin-menu ul a
{
padding: 10px;
height: 10px;
width: 130px;
height: auto;
line-height: 1;
display: block;
white-space: nowrap;
float: none;
text-transform: none;

#admin-menu ul li:last-child {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}

#admin-menu ul a {
padding: 10px;
height: 10px;
width: 130px;
height: auto;
line-height: 1;
display: block;
white-space: nowrap;
float: none;
text-transform: none;
}

*html #admin-menu ul a /* IE6 */
{
height: 10px;

*html #admin-menu ul a /* IE6 */ {
height: 10px;
}

*:first-child+html #admin-menu ul a /* IE7 */
{
height: 10px;

*:first-child+html #admin-menu ul a /* IE7 */ {
height: 10px;
}

#admin-menu ul a:hover
{
background: #0186ba;
background: -moz-linear-gradient(#04acec, #0186ba);
background: -webkit-gradient(linear, left top, left bottom, from(#04acec), to(#0186ba));
background: -webkit-linear-gradient(#04acec, #0186ba);
background: -o-linear-gradient(#04acec, #0186ba);
background: -ms-linear-gradient(#04acec, #0186ba);
background: linear-gradient(#04acec, #0186ba);

#admin-menu a:hover {
background: #0186ba;
background: -moz-linear-gradient(#04acec, #0186ba);
background: -webkit-gradient(linear, left top, left bottom, from(#04acec), to(#0186ba));
background: -webkit-linear-gradient(#04acec, #0186ba);
background: -o-linear-gradient(#04acec, #0186ba);
background: -ms-linear-gradient(#04acec, #0186ba);
background: linear-gradient(#04acec, #0186ba);
}

#admin-menu ul li:first-child > a
{
-moz-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
#admin-menu ul li:first-child > a {
-moz-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
}

#admin-menu ul li:first-child > a:after
{
content: '';
position: absolute;
left: 30px;
top: -8px;
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 8px solid #444;

#admin-menu ul li:first-child > a:after {
content: '';
position: absolute;
left: 30px;
top: -8px;
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 8px solid #444;
}

#admin-menu ul ul li:first-child a:after
{
left: -8px;
top: 12px;
width: 0;
height: 0;
border-left: 0;
border-bottom: 5px solid transparent;
border-top: 5px solid transparent;
border-right: 8px solid #444;

#admin-menu ul ul li:first-child a:after {
left: -8px;
top: 12px;
width: 0;
height: 0;
border-left: 0;
border-bottom: 5px solid transparent;
border-top: 5px solid transparent;
border-right: 8px solid #444;
}

#admin-menu ul li:first-child a:hover:after
{
border-bottom-color: #04acec;
#admin-menu ul li:first-child a:hover:after {
border-bottom-color: #04acec;
}

#admin-menu ul ul li:first-child a:hover:after
{
border-right-color: #04acec;
border-bottom-color: transparent;
#admin-menu ul ul li:first-child a:hover:after {
border-right-color: #04acec;
border-bottom-color: transparent;
}


#admin-menu ul li:last-child > a
{
-moz-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;


#admin-menu ul li:last-child > a {
-moz-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
}

/* Clear floated elements */
#admin-menu:after
{
visibility: hidden;
display: block;
font-size: 0;
content: " ";
clear: both;
height: 0;
#admin-menu:after {
visibility: hidden;
display: block;
font-size: 0;
content: " ";
clear: both;
height: 0;
}

* html #admin-menu { zoom: 1; } /* IE6 */
*:first-child+html #admin-menu { zoom: 1; } /* IE7 */

Expand Down
28 changes: 13 additions & 15 deletions themes/core/cleanslate/public/css/admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@
-webkit-column-gap: 20px;
column-count: 2;
column-gap: 20px;
}

#form-section-modules .description {
padding-left: 20px;
color: grey;
padding: 5px 0 20px;
}


#form-section-modules legend {
font-size: 1.2em;
margin-bottom: 10px;
}
#form-section-modules .checkable {
margin-left:0;
#form-section-modules .checkbox {
margin-left: 0;
}
#form-section-modules .description {
padding-left: 22px;
}

.admin-dashboard-col1 {
Expand All @@ -31,7 +30,7 @@
.admin-dashboard-col2 {
display: inline;
float: right;
width:45%;
width: 45%;
border: solid 1px silver;
}

Expand All @@ -40,13 +39,12 @@
height: 15px;
}

table {margin:10px 0pt 15px;font-size:8pt;width:100%;text-align:left;}
table thead tr th,table tfoot tr th {background-color:silver;border:1px solid silver;font-size:8pt;padding:4px;}
table thead tr .sortable {background-image:url(../images/sort.gif); background-repeat:no-repeat;background-position:center right;cursor:pointer;}
table tbody td {padding:4px;vertical-align:top;}
table thead tr .sorted-asc {background-image:url(../images/asc.gif);background-repeat:no-repeat;background-position:center right;cursor:pointer;}
table thead tr .sorted-desc {background-image:url(../images/desc.gif);background-repeat:no-repeat;background-position:center right;cursor:pointer;}
table thead tr .sorted-asc, table thead tr .sorted-desc {background-color:#8dbdd8;}
table {margin:0 0 20px;width:100%;text-align:left;}
th {background:silver;border:1px solid silver;padding:4px;}
td {padding:4px;vertical-align:top;}
.sortable {background:silver url(../images/sort.gif) center right no-repeat; padding-right:16px; cursor:pointer;}
.sorted-asc {background:#8dbdd8 url(../images/asc.gif) center right no-repeat;}
.sorted-desc {background:#8dbdd8 url(../images/desc.gif) center right no-repeat;}

a.pager-page {
padding: 3px;
Expand Down
Loading

0 comments on commit e0e5a9e

Please sign in to comment.