Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/sferik/rails_admin
Browse files Browse the repository at this point in the history
  • Loading branch information
@frankel
frankel committed Sep 4, 2011
2 parents 2bdc756 + 71d659c commit caf3b08
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 90 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# RailsAdmin

RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.

[![Build Status](https://travis-ci.org/sferik/rails_admin.png)](http://travis-ci.org/sferik/rails_admin)

[![Click here to lend your support to: RailsAdmin and make a donation at www.pledgie.com !](https://www.pledgie.com/campaigns/15917.png?skin_name=chrome)](http://www.pledgie.com/campaigns/15917)

RailsAdmin started as a port of [MerbAdmin](https://github.com/sferik/merb-admin) to Rails 3
and was implemented as a [Ruby Summer of Code project](http://www.rubysoc.org/projects)
by [Bogdan Gaza](https://github.com/hurrycane) with mentors [Erik Michaels-Ober](https://github.com/sferik),
Expand Down
30 changes: 15 additions & 15 deletions app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.css.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,14 @@
----------------------------------*/

/* states and images */
.ui-icon { width: 16px; height: 16px; background-image: url("<%= image_path('rails_admin/aristo/images/ui-icons_222222_256x240.png') %>"); }
.ui-widget-content .ui-icon {background-image: url("<%= image_path('rails_admin/aristo/images/ui-icons_222222_256x240.png') %>"); }
.ui-widget-header .ui-icon {background-image: url("<%= image_path('rails_admin/aristo/images/ui-icons_222222_256x240.png') %>"); }
.ui-state-default .ui-icon { background-image: url("<%= image_path('rails_admin/aristo/images/ui-icons_454545_256x240.png') %>"); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url("<%= image_path('rails_admin/aristo/images/ui-icons_454545_256x240.png') %>"); }
.ui-state-active .ui-icon {background-image: url("<%= image_path('rails_admin/aristo/images/ui-icons_454545_256x240.png') %>"); }
.ui-state-highlight .ui-icon {background-image: url("<%= image_path('rails_admin/aristo/images/ui-icons_454545_256x240.png') %>"); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon { background: url("<%= image_path('rails_admin/aristo/images/icon_sprite.png') %>") -16px 0 no-repeat !important; }
.ui-icon { width: 16px; height: 16px; background-image: url(<%= asset_path('rails_admin/aristo/images/ui-icons_222222_256x240.png') %>); }
.ui-widget-content .ui-icon {background-image: url(<%= asset_path('rails_admin/aristo/images/ui-icons_222222_256x240.png') %>); }
.ui-widget-header .ui-icon {background-image: url(<%= asset_path('rails_admin/aristo/images/ui-icons_222222_256x240.png') %>); }
.ui-state-default .ui-icon { background-image: url(<%= asset_path('rails_admin/aristo/images/ui-icons_454545_256x240.png') %>); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(<%= asset_path('rails_admin/aristo/images/ui-icons_454545_256x240.png') %>); }
.ui-state-active .ui-icon {background-image: url(<%= asset_path('rails_admin/aristo/images/ui-icons_454545_256x240.png') %>); }
.ui-state-highlight .ui-icon {background-image: url(<%= asset_path('rails_admin/aristo/images/ui-icons_454545_256x240.png') %>); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon { background: url(<%= asset_path('rails_admin/aristo/images/icon_sprite.png') %>) -16px 0 no-repeat !important; }
.ui-state-highlight .ui-icon, .ui-state-error .ui-icon { margin-top: -1px; }

/* positioning */
Expand Down Expand Up @@ -273,7 +273,7 @@
.ui-icon-video { background-position: -224px -128px; }
.ui-icon-script { background-position: -240px -128px; }
.ui-icon-alert { background-position: 0 -144px; }
.ui-icon-info { background: url("<%= image_path('rails_admin/aristo/images/icon_sprite.png') %>") 0 0 no-repeat !important; }
.ui-icon-info { background: url(<%= asset_path('rails_admin/aristo/images/icon_sprite.png') %>) 0 0 no-repeat !important; }
.ui-icon-notice { background-position: -32px -144px; }
.ui-icon-help { background-position: -48px -144px; }
.ui-icon-check { background-position: -64px -144px; }
Expand Down Expand Up @@ -487,7 +487,7 @@ button.ui-button-icons-only { width: 3.7em; }
.ui-button.ui-state-focus {
outline: none;
color: #1c4257; border-color: #7096ab;
background: url("<%= 'rails_admin/aristo/images/bg_fallback.png' %>") 0 -50px repeat-x;
background: url(<%= asset_path 'rails_admin/aristo/images/bg_fallback.png' %>) 0 -50px repeat-x;
background: -webkit-gradient(
linear,
left bottom,
Expand Down Expand Up @@ -575,7 +575,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-dialog .ui-dialog-titlebar { padding: 0.7em 1em 0.6em 1em; position: relative; border: none; border-bottom: 1px solid #979797; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; }
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; font-size: 14px; text-shadow: 0 1px 0 rgba(255,255,255,0.5); }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .8em; top: 55%; width: 16px; margin: -10px 0 0 0; padding: 0; height: 16px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; background: url("<%= image_path('rails_admin/aristo/images/icon_sprite.png') %>") 0 -16px no-repeat; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; background: url(<%= asset_path('rails_admin/aristo/images/icon_sprite.png') %>) 0 -16px no-repeat; }
.ui-dialog .ui-dialog-titlebar-close:hover span { background-position: -16px -16px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; border: 0; }
.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
Expand All @@ -595,7 +595,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
*/
.ui-slider { position: relative; text-align: left; background: #d7d7d7; z-index: 1; }
.ui-slider { -moz-box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; }
.ui-slider .ui-slider-handle { background: url("<%= image_path('rails_admin/aristo/images/slider_handles.png') %>") 0px -23px no-repeat; position: absolute; z-index: 2; width: 23px; height: 23px; cursor: default; border: none; outline: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
.ui-slider .ui-slider-handle { background: url(<%= asset_path('rails_admin/aristo/images/slider_handles.png') %>) 0px -23px no-repeat; position: absolute; z-index: 2; width: 23px; height: 23px; cursor: default; border: none; outline: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
.ui-slider .ui-state-hover, .ui-slider .ui-state-active { background-position: 0 0; }
.ui-slider .ui-slider-range { background: #a3cae0; position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
.ui-slider .ui-slider-range { -moz-box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; -webkit-box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; }
Expand Down Expand Up @@ -663,7 +663,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-datepicker .ui-datepicker-next span { background-position: -16px -32px !important; }
.ui-datepicker .ui-datepicker-prev-hover span { background-position: 0px -48px !important; }
.ui-datepicker .ui-datepicker-next-hover span { background-position: -16px -48px !important; }
.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; background: url("<%= 'rails_admin/aristo/images/icon_sprite.png' %>") no-repeat; }
.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; background: url(<%= asset_path 'rails_admin/aristo/images/icon_sprite.png' %>) no-repeat; }
.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; font-size: 12px; text-shadow: 0 1px 0 rgba(255,255,255,0.6); }
.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
Expand Down Expand Up @@ -754,8 +754,8 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
*
* http://docs.jquery.com/UI/Progressbar#theming
*/
.ui-progressbar { height: 12px; text-align: left; background: #FFF url("<%= 'rails_admin/aristo/images/progress_bar.gif' %>") 0 -14px repeat-x; }
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; background: url("<%= 'rails_admin/aristo/images/progress_bar.gif' %>") 0 0 repeat-x; }
.ui-progressbar { height: 12px; text-align: left; background: #FFF url(<%= asset_path 'rails_admin/aristo/images/progress_bar.gif' %>) 0 -14px repeat-x; }
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; background: url(<%= asset_path 'rails_admin/aristo/images/progress_bar.gif' %>) 0 0 repeat-x; }

/* Extra Input Field Styling */
.ui-form textarea, .ui-form input:not([type="submit"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="range"]) {
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/rails_admin/form.css.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ form .field>label, form .field>.field_with_errors>label {
}

.field .date, .field .datetime, .field .hasDatepicker {
background: url("<%= image_path('rails_admin/calendar.png') %>") no-repeat right;
background: url(<%= asset_path('rails_admin/calendar.png') %>) no-repeat right;
}

.field .time, .field .timestamp, .field .hasTimepicker {
background: url("<%= image_path('rails_admin/clock.png') %>") no-repeat right;
background: url(<%= asset_path('rails_admin/clock.png') %>) no-repeat right;
}

.field .integer {
Expand Down
28 changes: 14 additions & 14 deletions app/assets/stylesheets/rails_admin/jquery.colorpicker.css.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
position: relative;
width: 36px;
height: 36px;
background: url("<%= image_path('rails_admin/colorpicker/select2.png') %>");
background: url(<%= asset_path('rails_admin/colorpicker/select2.png') %>);
}

.colorSelector div {
Expand All @@ -12,15 +12,15 @@
left: 3px;
width: 30px;
height: 30px;
background: url("<%= image_path('rails_admin/colorpicker/select2.png') %>") center;
background: url(<%= asset_path('rails_admin/colorpicker/select2.png') %>) center;
}

.colorpicker {
width: 356px;
height: 176px;
overflow: hidden;
position: absolute;
background: url("<%= image_path('rails_admin/colorpicker/custom_background.png') %>");
background: url(<%= asset_path('rails_admin/colorpicker/custom_background.png') %>);
font-family: Arial, Helvetica, sans-serif;
display: none;
}
Expand All @@ -40,7 +40,7 @@
left: 0;
width: 150px;
height: 150px;
background: url("<%= image_path('rails_admin/colorpicker/colorpicker_overlay.png') %>");
background: url(<%= asset_path('rails_admin/colorpicker/colorpicker_overlay.png') %>);
}
.colorpicker_color div div {
position: absolute;
Expand All @@ -49,7 +49,7 @@
width: 11px;
height: 11px;
overflow: hidden;
background: url("<%= image_path('rails_admin/colorpicker/colorpicker_select.png') %>");
background: url(<%= asset_path('rails_admin/colorpicker/colorpicker_select.png') %>);
margin: -5px 0 0 -5px;
}
.colorpicker_hue {
Expand All @@ -65,7 +65,7 @@
width: 35px;
height: 9px;
overflow: hidden;
background: url("<%= image_path('rails_admin/colorpicker/custom_indic.png') %>") left top;
background: url(<%= asset_path('rails_admin/colorpicker/custom_indic.png') %>) left top;
margin: -4px 0 0 0;
left: 0px;
}
Expand Down Expand Up @@ -103,7 +103,7 @@
position: absolute;
width: 72px;
height: 22px;
background: url("<%= image_path('rails_admin/colorpicker/custom_hex.png') %>") top;
background: url(<%= asset_path('rails_admin/colorpicker/custom_hex.png') %>) top;
left: 212px;
top: 142px;
}
Expand All @@ -126,32 +126,32 @@
cursor: n-resize;
}
.colorpicker_rgb_r {
background-image: url("<%= image_path('rails_admin/colorpicker/custom_rgb_r.png') %>");
background-image: url(<%= asset_path('rails_admin/colorpicker/custom_rgb_r.png') %>);
top: 52px;
left: 212px;
}
.colorpicker_rgb_g {
background-image: url("<%= image_path('rails_admin/colorpicker/custom_rgb_g.png') %>");
background-image: url(<%= asset_path('rails_admin/colorpicker/custom_rgb_g.png') %>);
top: 82px;
left: 212px;
}
.colorpicker_rgb_b {
background-image: url("<%= image_path('rails_admin/colorpicker/custom_rgb_b.png') %>");
background-image: url(<%= asset_path('rails_admin/colorpicker/custom_rgb_b.png') %>);
top: 112px;
left: 212px;
}
.colorpicker_hsb_h {
background-image: url("<%= image_path('rails_admin/colorpicker/custom_hsb_h.png') %>");
background-image: url(<%= asset_path('rails_admin/colorpicker/custom_hsb_h.png') %>);
top: 52px;
left: 282px;
}
.colorpicker_hsb_s {
background-image: url("<%= image_path('rails_admin/colorpicker/custom_hsb_s.png') %>");
background-image: url(<%= asset_path('rails_admin/colorpicker/custom_hsb_s.png') %>);
top: 82px;
left: 282px;
}
.colorpicker_hsb_b {
background-image: url("<%= image_path('rails_admin/colorpicker/custom_hsb_b.png') %>");
background-image: url(<%= asset_path('rails_admin/colorpicker/custom_hsb_b.png') %>);
top: 112px;
left: 282px;
}
Expand All @@ -160,7 +160,7 @@
position: absolute;
width: 22px;
height: 22px;
background: url("<%= image_path('rails_admin/colorpicker/custom_submit.png') %>") top;
background: url(<%= asset_path('rails_admin/colorpicker/custom_submit.png') %>) top;
left: 322px;
top: 142px;
overflow: hidden;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/rails_admin/list.css.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
}

.grid thead th a.ascending {
background-image: url("<%= image_path('rails_admin/bullet_arrow_up.png') %>");
background-image: url(<%= asset_path('rails_admin/bullet_arrow_up.png') %>);
}

.grid thead th a.descending {
background-image: url("<%= image_path('rails_admin/bullet_arrow_down.png') %>");
background-image: url(<%= asset_path('rails_admin/bullet_arrow_down.png') %>);
}

.grid tr.link:hover {
Expand Down
18 changes: 9 additions & 9 deletions app/assets/stylesheets/rails_admin/ra.filtering-multiselect.css.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}

.ra-multiselect-search {
background: transparent url("<%= image_path('rails_admin/magnifier.png') %>") no-repeat scroll 166px center;
background: transparent url(<%= asset_path('rails_admin/magnifier.png') %>) no-repeat scroll 166px center;
border: 1px solid #c1c1c1;
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.15);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.15);
Expand Down Expand Up @@ -73,46 +73,46 @@

.ra-multiselect .ui-icon-circle-triangle-e {
background-position: -16px -32px !important;
background-image: url("<%= image_path('rails_admin/multiselect/icon_sprite.png') %>");
background-image: url(<%= asset_path('rails_admin/multiselect/icon_sprite.png') %>);
}

.ra-multiselect .ui-icon-circle-triangle-e:hover {
background-position: -16px -48px !important;
background-image: url("<%= image_path('rails_admin/multiselect/icon_sprite.png') %>");
background-image: url(<%= asset_path('rails_admin/multiselect/icon_sprite.png') %>);
}

.ra-multiselect .ui-icon-circle-triangle-w {
background-position: 0px -32px !important;
background-image: url("<%= image_path('rails_admin/multiselect/icon_sprite.png') %>");
background-image: url(<%= asset_path('rails_admin/multiselect/icon_sprite.png') %>);
}

.ra-multiselect .ui-icon-circle-triangle-w:hover {
background-position: 0px -48px !important;
background-image: url("<%= image_path('rails_admin/multiselect/icon_sprite.png') %>");
background-image: url(<%= asset_path('rails_admin/multiselect/icon_sprite.png') %>);
}

.ra-multiselect .ui-icon-circle-triangle-n {
background-position: 0px 0px !important;
margin-left: 1px;
background-image: url("<%= image_path('rails_admin/multiselect/ui-icon-circle-triangle-n-light.png') %>");
background-image: url(<%= asset_path('rails_admin/multiselect/ui-icon-circle-triangle-n-light.png') %>);
}

.ra-multiselect .ui-icon-circle-triangle-n:hover {
background-position: 0px 0px !important;
margin-left: 1px;
background-image: url("<%= image_path('rails_admin/multiselect/ui-icon-circle-triangle-n-dark.png') %>");
background-image: url(<%= asset_path('rails_admin/multiselect/ui-icon-circle-triangle-n-dark.png') %>);
}

.ra-multiselect .ui-icon-circle-triangle-s {
background-position: 0px 0px !important;
margin-left: 1px;
background-image: url("<%= image_path('rails_admin/multiselect/ui-icon-circle-triangle-s-light.png') %>");
background-image: url(<%= asset_path('rails_admin/multiselect/ui-icon-circle-triangle-s-light.png') %>);
}

.ra-multiselect .ui-icon-circle-triangle-s:hover {
background-position: 0px 0px !important;
margin-left: 1px;
background-image: url("<%= image_path('rails_admin/multiselect/ui-icon-circle-triangle-s-dark.png') %>");
background-image: url(<%= asset_path('rails_admin/multiselect/ui-icon-circle-triangle-s-dark.png') %>);
}


Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/rails_admin/ra.timeline.css.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@

.ra-timeline .previous {
left: 0px;
background-image: url("<%= image_path('rails_admin/timeline/arrow_left.png') %>");
background-image: url(<%= asset_path('rails_admin/timeline/arrow_left.png') %>);
}

.ra-timeline .next {
right: 0px;
background-image: url("<%= image_path('rails_admin/timeline/arrow_right.png') %>");
background-image: url(<%= asset_path('rails_admin/timeline/arrow_right.png') %>);
}

.ra-timeline .handle {
width: 54px;
height: 99px;
position: absolute;
top: -13px;
background-image: url("<%= image_path('rails_admin/timeline/handler.png') %>");
background-image: url(<%= asset_path('rails_admin/timeline/handler.png') %>);
}

.ra-timeline ul {
Expand Down
Loading

0 comments on commit caf3b08

Please sign in to comment.