Commits

sehmaschine  committed 480a264

[svn r77] edit inlines update

  • Participants
  • Parent commits 39db8f8
  • Branches trunk

Comments (0)

Files changed (10)

File media/css_grappelli/grappelli.css

     display: block; float: left;
     margin: -7px 0 0 5px !important; padding: 0 !important;
 }
-.object-tools li:hover {
-}
 .object-tools a {
     display: block; float: left;
     margin: 0; padding: 5px 10px !important;
 }
 
 /* Focused Buttons (also for filebrowser) ----------------------- */
-.object-tools a.addlink:link, .object-tools a.addlink:visited, 
-.object-tools .fb_multipleuploadlink:link, .object-tools .fb_multipleuploadlink:visited {
+.object-tools a.focus:link, .object-tools a.focus:visited {
     color: #fff !important;
     border: 1px solid #787878;
     background: url(../img_grappelli/bg_object-tools_focus.gif) 0 0 repeat-x !important;
 }
-.object-tools a.addlink:hover, .object-tools a.addlink:active, 
-.object-tools .fb_multipleuploadlink:hover, .object-tools .fb_multipleuploadlink:active {
+.object-tools a.focus:hover, .object-tools a.focus:active {
     border: 1px solid #5f94b8;
     background: url(../img_grappelli/bg_object-tools_hover.gif) 0 0 repeat-x !important;
 }
     border-color: #e09999 #eba9a9 #eba9a9 #e09999;
 }
 .description {
-    padding: 10px 0 10px 10px;
+    padding: 10px 0 10px 10px !important;
     border-bottom: 1px dotted #ddd;
     border-top: 1px solid #fff;
-    color: #999; font-size: 11px;
+    color: #999 !important; font-size: 11px !important;
     background: #f7f7f7;
 }
 
     -moz-border-radius-topright: 3px !important; -webkit-border-top-right-radius: 3px !important;
     background: #C9DBED url(../img_grappelli/bg_fieldset.gif) 0 100% repeat-x !important;
 }
+.calendar th {
+   padding: 2px 3px !important;
+}
 .calendar td {
+   padding: 0 !important;
    background: #fff !important;
 }
 .calendar td a:hover, .timelist a:hover { background: #e2ecf0 !important; }

File media/css_grappelli/grappelli_fieldsets.css

 /* Modules
 ----------------------------------------------------------------------- */
 .module {
-    margin-bottom: 5px;
+    margin-bottom: 5px !important;
     border: 1px solid #ddd !important;
     -moz-border-radius: 5px; -webkit-border-radius: 5px;
     background: #fff url(../img_grappelli/bg_module_reverse.gif) 0 0 repeat-x;
 #content-main .module {
     background: #fafafa url(../img_grappelli/bg_module_reverse.gif) 0 0 repeat-x;
 }
-.tabular.inline-related .module {
-    border: none !important;
-    background: #ddd !important;
-}
 #recent-actions-module p {
     color: #999; font-size: 11px; font-style: italic;
 }
 
 .inline-group {
     position: relative;
-    margin: 0 1px 7px !important; padding: 0 !important;
-    border: 3px solid #ddd !important;
+    margin: 6px 1px 7px !important; padding: 0 !important;
+    border: 3px solid #ebebeb !important;
     -moz-border-radius: 7px; -webkit-border-radius: 7px;
-    outline: 1px solid #bebebe;
+    outline: 1px solid #cccccc;
     -moz-outline-radius: 7px; -webkit-outline-radius: 7px;
-    background: #ddd url(../img_grappelli/bg_inline-group_reverse.gif) 0 0 repeat-x !important;
+    background: #ebebeb url(../img_grappelli/bg_inline-group_reverse.gif) 0 0 repeat-x !important;
 }
 .inline-group.collapsed {
     background: url(../img_grappelli/bg_inline-group.gif) 0 0 repeat-x !important;
 
 /* H2 in Inline-Groups ----------------------- */
 .inline-group h2 {
-    padding: 6px 5px 6px 10px !important;
+    padding: 6px 5px 5px 10px !important;
     font-size: 12px !important; line-height: 13px !important; font-weight: bold;
 }
 .inline-group h2.collapse-toggle {
-    margin: 0; padding: 6px 5px 6px 38px !important;
+    margin: 0; padding: 6px 5px 5px 38px !important;
     color: #fafafa; font-size: 12px; line-height: 13px !important; font-weight: bold;
     border: 1px solid #aaacad;
     -moz-border-radius: 5px; -webkit-border-radius: 5px;
 
 .inline-related {
     position: relative; display: block;
-    margin: 1px 0 !important; padding: 0;
+    margin: 3px 0 0 !important; padding: 0;
     border: none;
     -moz-border-radius: 5px; -webkit-border-radius: 5px;
     background: transparent url(../img_grappelli/bg_inline-related_reverse.gif) 0 0 repeat-x !important;
 }
+
 .inline-related.collapsed, .inline-related fieldset.collapsed {
     background: transparent url(../img_grappelli/bg_inline-related.gif) 0 0 repeat-x !important;
 }
     -moz-border-radius: 5px; -webkit-border-radius: 5px;
     cursor: pointer !important;
 }
-.inline-related fieldset.collapsed h2.collapse-toggle {
-    
-}
 
 .inline-related fieldset.collapse-closed h2.collapse-toggle {
     color: #a1a8ab !important;
 
 ul.inline-item-tools {
     display: block !important;
-    position:absolute; top: 0; right: 10px;
+    position: absolute; top: 1px; right: 1px;
     margin: 0; padding: 0;
+    border-left: 1px solid #a5a7a8;
+}
+.inline-related ul.inline-item-tools {
+    border-left: 1px solid #e0e0e0;
 }
 ul.inline-item-tools li {
-    float: left; margin: 0 0 0 15px; padding: 3px 0;
+    float: left;
+    margin: 0; padding: 0;
+    width: 25px; height: 24px;
     font-weight: bold !important;
+    border-left: 1px solid #b9bbbd;
+    border-right: 1px solid #a5a7a8;
     background: transparent !important;
     list-style-type: none !important;
     vertical-align: bottom !important;
 }
-ul.inline-item-tools > li:first-child {
-    border-left: none !important;
+.inline-related ul.inline-item-tools li {
+    border-left: 1px solid #f5f5f5;
+    border-right: 1px solid #e0e0e0;
+}
+ul.inline-item-tools li:last-child {
+    border-right: none;
 }
 ul.inline-item-tools li label {
     position: relative; top: 2px;
     margin-left: 5px;
     font-weight: bold !important;
 }
-ul.inline-item-tools li.delete label {
-    color: #CC3434 !important;
-}
-ul.inline-item-tools li input {
-    float:none !important;
-    margin: 0 !important; padding: 0 !important;
-}
-ul.inline-item-tools li:hover {
-    background: none !important;
-}
-ul.inline-item-tools a {
-    position: relative; top: 1px; float: none !important; display: block;
-    padding: 3px 0 2px !important;
-    width: 15px; height: 15px;
+
+.inline-group ul.inline-item-tools a {
+    position: relative; display: block;
+    padding: 0 !important;
+    width: 25px; height: 24px;
     font-size: 11px !important; line-height: 13px !important;
-    background-position: 100% 50% !important;
+    background-position: 50% 50% !important;
     background-repeat: no-repeat;
 }
 
+.inline-group ul.inline-item-tools a:link, .inline-group ul.inline-item-tools a:visited {
+    background-color: transparent;
+}
+.inline-group ul.inline-item-tools a:hover, .inline-group ul.inline-item-tools a:active {
+    background-color: #65a3c2;
+}
+
+.inline-related ul.inline-item-tools li:last-child a {
+    border-right: none;
+}
+.inline-related ul.inline-item-tools a:link, .inline-related ul.inline-item-tools a:visited {
+    background-color: transparent;
+}
+.inline-related.collapsed ul.inline-item-tools a:link, .inline-related.collapsed ul.inline-item-tools a:visited {
+    background-color: transparent;
+}
+.inline-related ul.inline-item-tools a:hover, .inline-related ul.inline-item-tools a:active, 
+.inline-related.collapsed ul.inline-item-tools a:hover, .inline-related.collapsed ul.inline-item-tools a:active {
+    background-color: #65a3c2;
+}
+.inline-related ul.inline-item-tools a.deletelink:hover, .inline-related ul.inline-item-tools a.deletelink:active {
+    background-color: #cc3d3d;
+}
+
+ul.inline-item-tools li:last-child a, 
+.inline-related.collapsed ul.inline-item-tools li:last-child a {
+    border-right: none;
+    -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px;
+    -moz-border-radius-bottomright: 3px; -webkit-border-bottom-right-radius: 3px;
+}
+.inline-related ul.inline-item-tools li:last-child a {
+    -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0;
+}
+
 h3.collapse-toggle + ul.inline-item-tools {
-    position: absolute; top: 0; right: 10px; display: block !important;
+    position: absolute; display: block !important;
     margin: 0; padding: 0;
 }
 
+.inline-related.tabular td.inline-item-tools ul.inline-item-tools {
+    position: relative; float: right; clear: both !important; top: 0; right: 0;
+    padding-right: 0 !important;
+}
+.inline-related.tabular td.inline-item-tools ul.inline-item-tools li:last-child a {
+    -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0;
+}
+
 /* Inline Item Tools - Actions ----------------------- */
 ul.inline-item-tools a.draghandler:link, ul.inline-item-tools a.draghandler:visited {
-    background-image: url(../img_grappelli/icon_inline-item-tools_draghandler.gif);
+    background-image: url(../img_grappelli/icon_inline-item-tools_draghandler.png);
 }
 ul.inline-item-tools a.draghandler:hover, ul.inline-item-tools a.draghandler:active {
-    background-image: url(../img_grappelli/icon_inline-item-tools_draghandler_hover.gif);
+    background-image: url(../img_grappelli/icon_inline-item-tools_draghandler_hover.png);
 }
 .predelete-items a.draghandler, .predelete-item a.draghandler {
-    cursor: default !important;
-    background-image: none !important;
+    display: none !important;
 }
 
 ul.inline-item-tools a.viewsitelink:link, ul.inline-item-tools a.viewsitelink:visited {
-    margin: 0 -1px; width: 17px;
-    background-image: url(../img_grappelli/icon_inline-item-tools_viewsitelink.gif);
+    background-image: url(../img_grappelli/icon_inline-item-tools_viewsitelink.png);
 }
 ul.inline-item-tools a.viewsitelink:hover, ul.inline-item-tools a.viewsitelink:active {
-    background-image: url(../img_grappelli/icon_inline-item-tools_viewsitelink_hover.gif);
+    background-image: url(../img_grappelli/icon_inline-item-tools_viewsitelink_hover.png);
 }
 
 ul.inline-item-tools a.deletelink:link, ul.inline-item-tools a.deletelink:visited {
-    padding-left: 0 !important;
-    background-image: url(../img_grappelli/icon_inline-item-tools_deletelink.gif) !important;
+    background-image: url(../img_grappelli/icon_inline-item-tools_deletelink.png) !important;
 }
 ul.inline-item-tools a.deletelink:hover, ul.inline-item-tools a.deletelink:active {
-    background-image: url(../img_grappelli/icon_inline-item-tools_deletelink_hover.gif) !important;
+    background-image: url(../img_grappelli/icon_inline-item-tools_deletelink_hover.png) !important;
 }
 
-ul.inline-item-tools a.addhandler:link, ul.inline-item-tools a.addhandler:visited {
+ul.inline-item-tools a.addhandler {
     background-image: url(../img_grappelli/icon_inline-item-tools_addhandler.gif);
 }
-ul.inline-item-tools a.addhandler:hover, ul.inline-item-tools a.addhandler:active {
-    background-image: url(../img_grappelli/icon_inline-item-tools_addhandler_hover.gif);
+
+ul.inline-item-tools a.openhandler {
+    background-image: url(../img_grappelli/icon_inline-item-tools_openhandler.gif);
 }
 
-ul.inline-item-tools a.openhandler:link, ul.inline-item-tools a.openhandler:visited {
-    background-image: url(../img_grappelli/icon_inline-item-tools_openhandler.gif);
-}
-ul.inline-item-tools a.openhandler:hover, ul.inline-item-tools a.openhandler:active {
-    background-image: url(../img_grappelli/icon_inline-item-tools_openhandler_hover.gif);
-}
-
-ul.inline-item-tools a.closehandler:link, ul.inline-item-tools a.closehandler:visited {
+ul.inline-item-tools a.closehandler {
     background-image: url(../img_grappelli/icon_inline-item-tools_closehandler.gif);
 }
-ul.inline-item-tools a.closehandler:hover, ul.inline-item-tools a.closehandler:active {
-    background-image: url(../img_grappelli/icon_inline-item-tools_closehandler_hover.gif);
-}
 
 
 
 /* Inline-Related Tabular
 ----------------------------------------------------------------------- */
 
-.inline-related.tabular table {
-    width: 100% !important;
-    border-right: 1px solid #ddd;
-    border-collapse: separate;
-    border-spacing: 0;
-}
-.inline-related.tabular table thead tr th {
-    color: #999 !important;
-    border-top: 1px solid #bbb !important;
-    border-bottom: 1px solid #bbb !important;
-    -moz-border-radius-topright: 0 !important; -webkit-border-top-right-radius: 0 !important;
-    -moz-border-radius-topleft: 0 !important; -webkit-border-top-left-radius: 0 !important;
-    background: #fafafa url(../img_grappelli/bg_module_reverse.gif) 0 0 repeat-x !important;
-}
-.inline-related.tabular table thead tr th:first-child {
-    -moz-border-radius-topleft: 5px !important; -webkit-border-top-left-radius: 5px !important;
-    -moz-border-radius-bottomleft: 5px !important; -webkit-border-bottom-left-radius: 5px !important;
-}
-.inline-related.tabular table thead tr th:last-child {
-    -moz-border-radius-topright: 5px !important; -webkit-border-top-right-radius: 5px !important;
-    -moz-border-radius-bottomright: 5px !important; -webkit-border-bottom-right-radius: 5px !important;
-}
-.inline-related.tabular td, 
-.inline-related.tabular td {
-    -moz-border-radius: 0 !important; -webkit-border-radius: 0 !important;
-    padding: 7px 0 6px 10px;
-    background: #f7f7f7;
-}
-.inline-related.tabular tbody tr:first-child td {
-    border-top: 1px solid #bbb !important;
-    border-bottom: 1px solid #eaeaea !important;
-}
-.inline-related.tabular tbody tr:last-child td {
-    border-top: 1px solid #fff !important;
-    border-bottom: 1px solid #bbb !important;
-}
-.inline-related.tabular tbody.placeholder tr:first-child td {
-    border-top: none !important;
-}
-.inline-related.tabular tbody.placeholder tr:last-child td {
-    border-bottom: none !important;
-}
-.inline-related.tabular th:first-child, 
-.inline-related.tabular td:first-child {
-    -moz-border-radius-bottomleft: 0 !important; -webkit-border-bottom-left-radius: 0 !important;
-    border-left: 1px solid #bbb !important;
-}
-.inline-related.tabular th:last-child, 
-.inline-related.tabular td:last-child {
-    -moz-border-radius-bottomright: 0 !important; -webkit-border-bottom-right-radius: 0 !important;
-    border-right: 1px solid #bbb !important;
-}
-.inline-related.tabular tbody tr:first-child td:first-child {
-    -moz-border-radius-topleft: 5px !important; -webkit-border-top-left-radius: 5px !important;
-}
-.inline-related.tabular tbody tr:first-child td:last-child {
-    -moz-border-radius-topright: 5px !important; -webkit-border-top-right-radius: 5px !important;
-}
-.inline-related.tabular tbody tr:last-child td:first-child {
-    -moz-border-radius-bottomleft: 5px !important; -webkit-border-bottom-left-radius: 5px !important;
-}
-.inline-related.tabular tbody tr:last-child td:last-child {
-    -moz-border-radius-bottomright: 5px !important; -webkit-border-bottom-right-radius: 5px !important;
-}
-.inline-related.tabular td.original {
-    padding: 0 !important;
-    width: auto !important;
-    vertical-align: middle;
-}
-.inline-related.tabular td.original p {
-    margin: -12px 0 0 0 !important; padding: 0 0 0 10px !important;
-    border: none !important;
-}
-.inline-related.tabular td.original p b {
-    color: #a1a8ab;
-}
-.inline-related.tabular td.inline-item-tools {
-    padding: 1px 10px !important;
-    width: auto; height: 26px !important;
-    text-align: right;
-}
-.inline-related.tabular td.inline-item-tools ul.inline-item-tools {
-    position: relative; float: right; clear: both !important; top: 0; right: 0;
-    padding-right: 0 !important;
-}
-.inline-related.tabular table tbody tr:last-child td:last-child {
-    width: 100%;
-    -moz-border-radius-bottomright: 5px !important; -webkit-border-bottom-right-radius: 5px !important;
-}
 .tabular .module input[type=text], .tabular .module textarea {
     width: 150px;
 }
 .inline-related.tabular table .errorlist li {
     padding-left: 0;
 }
+.inline-related.tabular h3 {
+    padding-left: 10px !important;
+    background: none;
+}
+
+.inline-group.collapsed .legend {
+    display: none;
+}
+.inline-group .legend {
+    margin: 5px 0 -3px 0;
+    color: #aaaaaa; font-size: 11px; font-weight: bold;
+}
+.inline-group .legend .form-cell {
+    padding: 2px 0 2px 10px;
+}
+.inline-group .form-cell {
+    display: table-cell;
+    padding: 5px 0 5px 10px;
+    width: 158px;
+}
+
+.inline-related.tabular .module {
+    background-image: none !important;
+}
+
 
 /* UI Sortable: Placeholder & Sortable Helper ----------------------- */
 .inline-group.collapsed .items {
     display: none;
 }
-.inline-group .items, .inline-group .tabular {
+.inline-group .items {
     margin-top: 4px !important;
 }
 .placeholder {
     margin: 5px 0;
     height: 26px;
 }
-tbody.placeholder td {
-    background: #ddd !important;
-    height: 40px !important;
-}
-.inline-related.tabular tbody.placeholder td, 
-.inline-related.tabular tbody.placeholder td {
-    border: none !important;
-    background: none !important;
-}
 
 .sortablehelper {
     position:absolute; top: -1000px; display: block;
     margin: 0; padding: 0;
     color: #666 !important;
 }
-.inline-related.tabular .sortablehelper {
-    /*margin: 0 -1px;*/ padding: 0 !important;
-}
-.inline-group .items .sortablehelper h2, 
-.inline-related.tabular table .sortablehelper h2 {
+.inline-group .items .sortablehelper h3 {
     margin: 0 !important; padding: 5px 0 4px 37px;
-    font-size: 11px; line-height: 15px;
+    color: #fff; font-size: 11px; line-height: 15px;
     border: 1px solid #bebebe !important;
     border-bottom: 1px solid #bebebe !important;
     -moz-border-radius: 5px; -webkit-border-radius: 5px;
-    background: #fff !important;
+    background: #65a3c2 !important;
+}
+.inline-group[name="inlinegrouptabular"] .items .sortablehelper h3 {
+    padding-left: 10px !important;
 }
 
 
 /* Inline-Related Predelete
 ----------------------------------------------------------------------- */
 
-.predelete-items > div:first-child {
-    margin-top: 4px !important;
-}
 .predelete-items .inline-related, .predelete-items .inline-related.collapsed:hover {
     background: transparent url(../img_grappelli/bg_inline-related_predelete_reverse.gif) 0 0 repeat-x !important;
 }
 .predelete-items .inline-related.collapsed {
     background: transparent url(../img_grappelli/bg_inline-related_predelete_open.gif) 0 0 repeat-x !important;
 }
-.predelete-items .inline-related fieldset, .predelete-items .inline-related .form-row, tbody.predelete-item td {
+.predelete-items .inline-related fieldset {
     background: #faebeb !important;
 }
 .predelete-items .inline-related .form-row {
     border-top-color: #faf5f5 !important;
     border-bottom-color: #ebe4e4 !important;
 }
-.inline-related.tabular tbody.predelete-item tr:first-child td {
-    border-bottom-color: #ebe4e4 !important;
-}
-.inline-related.tabular tbody.predelete-item tr:last-child td {
-    border-top-color: #faf5f5 !important;
-}
 
 .predelete-items .inline-related.collapsed h3.collapse-toggle {
     background-image: url(../img_grappelli/icon_inline-related_predelete_open.gif) !important;

File media/img_grappelli/bg_inline-group.gif

Old
Old image
New
New image

File media/img_grappelli/bg_inline-group_reverse.gif

Old
Old image
New
New image

File media/img_grappelli/icon_inline-item-tools_deletelink.png

Added
New image

File media/img_grappelli/icon_inline-item-tools_draghandler.png

Added
New image

File media/img_grappelli/icon_inline-item-tools_draghandler_hover.png

Added
New image

File media/img_grappelli/icon_inline-item-tools_viewsitelink.png

Added
New image