From e12175359448cb1969c1536af576bafac1ab5363 Mon Sep 17 00:00:00 2001 From: liquibyte Date: Wed, 29 Jan 2014 01:45:49 -0500 Subject: [PATCH 1/7] Rewrote admin.widgets.js to allow external styling. Added drop functionality to available widgets to accept installed widgets drop to delete. Added two classes to admin.css to style hover colors of available widgets, installed widgets and trashcan. Signed-off-by: liquibyte --- admin/panels/widgets/admin.widgets.js | 156 ++++++++++++++++++ .../themes/leggero/flatmaas-rev/res/admin.css | 23 +++ .../themes/leggero/leggero/res/admin.css | 27 +++ 3 files changed, 206 insertions(+) diff --git a/admin/panels/widgets/admin.widgets.js b/admin/panels/widgets/admin.widgets.js index 2749296..0fcbd46 100644 --- a/admin/panels/widgets/admin.widgets.js +++ b/admin/panels/widgets/admin.widgets.js @@ -3,6 +3,161 @@ * Based on original flatpress' code * Require jQuery and jQuery UI (Core, Draggable, Droppable and Effects Core) * Coded by Piero VDFN +<<<<<<< HEAD + * Re-Coded by liquibyte + * Colors weren't resetting on mouseout and position:absolute didn't work. + * Position:absolute changed to position:fixed. I also changed the + * hardcoded values to a variable that is stored and recalled so that the + * users stylesheet is used for styling. Colors were hardcoded so I fixed + * this to be styled from the users admin.css. Available widgets now + * accepts drag and drop from installed widgets to remove. + * Released under GNU GPL v2 + */ +var FlatPress = { + winstancedrag : function() { + $('.widget-class').draggable({ + 'scroll' : true, + 'helper' : function(event) { + return $(this).clone().appendTo('body').removeClass('widget-class').css({ + 'position': 'fixed', + 'cursor' : 'move', + 'list-style-type' : 'none', + 'margin' : '0', + 'padding' : '0', + 'width' : $(this).width(), + 'height' : $(this).height() + }) + .addClass('widget-available'); + } + }); + $('.widget-instance').draggable({ + 'scroll' : true, + 'helper' : function(event) { + return $(this).clone().appendTo('body').removeClass('widget-instance').css({ + 'position': 'fixed', + 'cursor' : 'move', + 'list-style-type' : 'none', + 'width' : $(this).width(), + 'height' : $(this).height() + }) + .addClass('widget-installed'); + } + }); + }, + wplaceholder : function() { + $('.widget-placeholder').droppable({ + 'accept' : '.widget-class, .widget-instance', + 'activeClass' : 'ui-state-highlight', + 'over' : function(event, ui) { + $(this).effect("highlight", { 'color' : $('.widget-installed, .widget-available').css('background-color') }, 1000); + }, + 'drop' : function(event, ui) { + var parent = ui.draggable.parent(); + var where = $(this).parent().attr('id').split('-')[1]; + var replace = null; + if (ui.draggable.hasClass('widget-instance')) { + replace = ui.draggable; + } + else { + replace = $('
  • ').append(ui.draggable.children().clone()); + replace.removeClass('widget-class').addClass('widget-instance'); + } + replace.children('input').attr('name', 'widgets[' + where + '][]'); + $(this).replaceWith(replace); + + if (parent.children().length < 1) { + parent.append('
  • Drop here
    • '); + } + FlatPress.wreload(); + } + }); + }, + winstancedrop : function() { + $('.widget-instance').droppable({ + 'accept' : '.widget-class, .widget-instance', + 'activeClass' : 'ui-state-highlight', + 'over' : function(event, ui) { + $(this).effect("highlight", { 'color' : $('.widget-available, .widget-installed').css('background-color') }, 1000); + }, + 'drop' : function(event, ui) { + var parent = ui.draggable.parent(); + var where = $(this).parent().attr('id').split('-')[1]; + var replace = null; + if (ui.draggable.hasClass('widget-instance')) { + replace = ui.draggable; + } + else { + replace = $('
  • ').append(ui.draggable.children().clone()); + replace.removeClass('widget-class').addClass('widget-instance'); + } + replace.children('input').attr('name', 'widgets[' + where + '][]'); + $(this).after(replace); + if (parent.children().length < 1) { + parent.append('
  • Drop here
    • '); + } + FlatPress.wreload(); + } + }); + }, + wtrash : function() { + $('#widget-trashcan').droppable({ + 'accept' : '.widget-instance', + 'activeClass' : 'ui-state-highlight', + 'over' : function(event, ui) { + $(this).fadeTo('slow', 0.2).fadeTo('slow', 1.0); + }, + 'drop' : function(event, ui) { + var parent = ui.draggable.parent(); + var draggable = $(ui.draggable); + // we can't remove() draggable here, because of a bug with jquery UI + IE8 + // we'll defer it + $('.widget-installed').remove(); + // last element has not been removed, + // so there is still one in the list, soon to be deleted ' + if(parent.children().length < 2) { + parent.append('
  • Drop here
    • '); + } + // deferred removal takes place here + setTimeout(function() { + draggable.remove(); + }); + FlatPress.wreload(); + } + }); + $('.widget-class').droppable({ + 'accept' : '.widget-instance', + 'activeClass' : 'ui-state-highlight', + 'over' : function(event, ui) { + $(this).effect("highlight", { 'color' : $('#widget-trashcan').css('background-color') }, 1000); + }, + 'drop' : function(event, ui) { + var parent = ui.draggable.parent(); + var draggable = $(ui.draggable); + // we can't remove() draggable here, because of a bug with jquery UI + IE8 + // we'll defer it + $('.widget-installed').remove(); + // last element has not been removed, + // so there is still one in the list, soon to be deleted + if(parent.children().length < 2) { + parent.append('
  • Drop here
    • '); + } + // deferred removal takes place here + setTimeout(function() { + draggable.remove(); + }); + FlatPress.wreload(); + } + }); + + }, + wreload : function(){ + this.winstancedrag(); + this.winstancedrop(); + this.wplaceholder(); + } +} +FlatPress.wreload();FlatPress.wtrash(); +======= * Released under GNU GPL v2 */ @@ -141,3 +296,4 @@ wreload: function(){ //$(document).ready(wreload); FlatPress.wreload();FlatPress.wtrash(); +>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 diff --git a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css index aae3f4d..a6acb4b 100755 --- a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css +++ b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css @@ -485,8 +485,13 @@ li.admin-widgetset { text-align: left; } +<<<<<<< HEAD +#widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/ + background-color: rgba(170, 34, 34, 0.7); +======= #widget-trashcan { background-color: #a22; +>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 color: #ddd; font-size: 120%; font-weight: bold; @@ -496,6 +501,24 @@ li.admin-widgetset { margin: 2em; } +<<<<<<< HEAD +.widget-available { /*colors for available widgets while dragging*/ + cursor: move; + color: #fff; + background-color: rgba(34, 102, 0, 0.7); + border: 2px solid #2f0; + z-index: 2000; +} + +.widget-installed { /*colors for installed widgets while dragging*/ + cursor: move; + color: #fff; + background-color: rgba(0, 34, 102, 0.7); + border: 2px solid #00f; + z-index: 2000; +} +======= +>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 #available-widgets ul, .admin-widgetset ul { padding-left: 0; margin-left: 0; diff --git a/fp-interface/themes/leggero/leggero/res/admin.css b/fp-interface/themes/leggero/leggero/res/admin.css index a71ac37..d90207d 100755 --- a/fp-interface/themes/leggero/leggero/res/admin.css +++ b/fp-interface/themes/leggero/leggero/res/admin.css @@ -14,7 +14,10 @@ Module: admin.css @import url(common.css); @import url(globals.css); +<<<<<<< HEAD +======= +>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 /* ===== VARIOUS ===== */ .buttonbar input { padding: .3em; @@ -378,8 +381,13 @@ li.admin-widgetset { text-align: left; } +<<<<<<< HEAD +#widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/ + background-color: rgba(170, 34, 34, 0.7); +======= #widget-trashcan { background-color: #a22; +>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 color: #ddd; font-size: 120%; font-weight: bold; @@ -389,6 +397,25 @@ li.admin-widgetset { margin: 2em; } +<<<<<<< HEAD +.widget-available { /*colors for available widgets while dragging*/ + cursor: move; + color: #fff; + background-color: rgba(34, 102, 0, 0.7); + border: 2px solid #2f0; + z-index: 2000; +} + +.widget-installed { /*colors for installed widgets while dragging*/ + cursor: move; + color: #fff; + background-color: rgba(0, 34, 102, 0.7); + border: 2px solid #00f; + z-index: 2000; +} + +======= +>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 #available-widgets ul, .admin-widgetset ul { padding-left: 0; margin-left: 0; From c9bf4a8d2695a6a7975cbeb2f88dda16f3eeb9fa Mon Sep 17 00:00:00 2001 From: liquibyte Date: Wed, 29 Jan 2014 23:00:41 -0500 Subject: [PATCH 2/7] I don't understand how people say git is easy. Thing seems to be messing up my commits. Signed-off-by: liquibyte --- .../themes/leggero/flatmaas-rev/res/admin.css | 9 +-------- fp-interface/themes/leggero/leggero/res/admin.css | 12 ------------ 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css index a6acb4b..f199f11 100755 --- a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css +++ b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css @@ -485,13 +485,8 @@ li.admin-widgetset { text-align: left; } -<<<<<<< HEAD #widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/ background-color: rgba(170, 34, 34, 0.7); -======= -#widget-trashcan { - background-color: #a22; ->>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 color: #ddd; font-size: 120%; font-weight: bold; @@ -501,7 +496,6 @@ li.admin-widgetset { margin: 2em; } -<<<<<<< HEAD .widget-available { /*colors for available widgets while dragging*/ cursor: move; color: #fff; @@ -517,8 +511,7 @@ li.admin-widgetset { border: 2px solid #00f; z-index: 2000; } -======= ->>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 + #available-widgets ul, .admin-widgetset ul { padding-left: 0; margin-left: 0; diff --git a/fp-interface/themes/leggero/leggero/res/admin.css b/fp-interface/themes/leggero/leggero/res/admin.css index d90207d..8d21e6b 100755 --- a/fp-interface/themes/leggero/leggero/res/admin.css +++ b/fp-interface/themes/leggero/leggero/res/admin.css @@ -14,10 +14,6 @@ Module: admin.css @import url(common.css); @import url(globals.css); -<<<<<<< HEAD -======= - ->>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 /* ===== VARIOUS ===== */ .buttonbar input { padding: .3em; @@ -381,13 +377,8 @@ li.admin-widgetset { text-align: left; } -<<<<<<< HEAD #widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/ background-color: rgba(170, 34, 34, 0.7); -======= -#widget-trashcan { - background-color: #a22; ->>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 color: #ddd; font-size: 120%; font-weight: bold; @@ -397,7 +388,6 @@ li.admin-widgetset { margin: 2em; } -<<<<<<< HEAD .widget-available { /*colors for available widgets while dragging*/ cursor: move; color: #fff; @@ -414,8 +404,6 @@ li.admin-widgetset { z-index: 2000; } -======= ->>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 #available-widgets ul, .admin-widgetset ul { padding-left: 0; margin-left: 0; From 136076644d29cfed5d85c95a39aafb88d1d27570 Mon Sep 17 00:00:00 2001 From: liquibyte Date: Wed, 29 Jan 2014 23:07:25 -0500 Subject: [PATCH 3/7] This file is also needed to make the hover effects work. The older jquery just doesn't cut it. Signed-off-by: liquibyte --- fp-plugins/jquery/plugin.jquery.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 fp-plugins/jquery/plugin.jquery.php diff --git a/fp-plugins/jquery/plugin.jquery.php b/fp-plugins/jquery/plugin.jquery.php old mode 100644 new mode 100755 index 907baec..6888642 --- a/fp-plugins/jquery/plugin.jquery.php +++ b/fp-plugins/jquery/plugin.jquery.php @@ -18,8 +18,10 @@ function plugin_jquery_head() { $pdir=plugin_geturl('jquery'); echo << - - + + + + JSUTILS; } From f97f35dd5e569709f978729eb4a1eda34e2e6db3 Mon Sep 17 00:00:00 2001 From: liquibyte Date: Wed, 29 Jan 2014 23:43:52 -0500 Subject: [PATCH 4/7] Doing a re-commit to make sure things are working right. Signed-off-by: liquibyte --- admin/panels/widgets/admin.widgets.js | 157 +---- .../themes/leggero/flatmaas-rev/res/admin.css | 7 +- .../themes/leggero/leggero/res/admin.css | 574 ++++++++++++++++++ fp-plugins/jquery/plugin.jquery.php | 0 4 files changed, 585 insertions(+), 153 deletions(-) mode change 100755 => 100644 fp-plugins/jquery/plugin.jquery.php diff --git a/admin/panels/widgets/admin.widgets.js b/admin/panels/widgets/admin.widgets.js index 0fcbd46..a234433 100644 --- a/admin/panels/widgets/admin.widgets.js +++ b/admin/panels/widgets/admin.widgets.js @@ -1,9 +1,8 @@ /* - * Flatpress widget js admin - * Based on original flatpress' code + * nibble widget js admin + * Based on original nibble' code * Require jQuery and jQuery UI (Core, Draggable, Droppable and Effects Core) * Coded by Piero VDFN -<<<<<<< HEAD * Re-Coded by liquibyte * Colors weren't resetting on mouseout and position:absolute didn't work. * Position:absolute changed to position:fixed. I also changed the @@ -13,7 +12,7 @@ * accepts drag and drop from installed widgets to remove. * Released under GNU GPL v2 */ -var FlatPress = { +var nibble = { winstancedrag : function() { $('.widget-class').draggable({ 'scroll' : true, @@ -68,7 +67,7 @@ var FlatPress = { if (parent.children().length < 1) { parent.append('
  • Drop here
    • '); } - FlatPress.wreload(); + nibble.wreload(); } }); }, @@ -95,7 +94,7 @@ var FlatPress = { if (parent.children().length < 1) { parent.append('
  • Drop here
    • '); } - FlatPress.wreload(); + nibble.wreload(); } }); }, @@ -121,7 +120,7 @@ var FlatPress = { setTimeout(function() { draggable.remove(); }); - FlatPress.wreload(); + nibble.wreload(); } }); $('.widget-class').droppable({ @@ -145,7 +144,7 @@ var FlatPress = { setTimeout(function() { draggable.remove(); }); - FlatPress.wreload(); + nibble.wreload(); } }); @@ -156,144 +155,4 @@ var FlatPress = { this.wplaceholder(); } } -FlatPress.wreload();FlatPress.wtrash(); -======= - * Released under GNU GPL v2 - */ - -var FlatPress = { -wclass: function() { - $('.widget-class').draggable({ - 'scroll' : true, - 'helper':function(event) { - return $(this).clone().appendTo('body').removeClass('widget-class').css({ - 'position': 'absolute', - 'opacity' : 0.7, - 'background-color' : '#b31', - 'top' : event.pageY-10, - 'left' : event.pageX-($(this).width()/4), - 'list-style-type' : 'none', - 'width' : $(this).width() - }).addClass('widget-dragger'); - } - }); -}, - -winstancedrag: function() { - $('.widget-instance').draggable({ - 'scroll' : true, - 'helper':function(event) { - return $(this).clone().appendTo('body').removeClass('widget-class').css({ - 'position': 'absolute', - 'opacity' : 0.7, - 'background-color' : '#b31', - 'list-style-type' : 'none', - 'width' : $(this).width() - }).addClass('widget-dragger'); - } - }); -}, -wplaceholder: function() { - $('.widget-placeholder').droppable({ - 'accept' : '.widget-class, .widget-dragger, .widget-instance', - 'over' : function(event, ui) { - $(this).animate({'background-color' : '#78ba91'}) - }, - 'out' : function(event, ui) { - $(this).animate({'background-color' : '#fff'}) - }, - 'drop' : function(event, ui) { - var parent=ui.draggable.parent(); - var where=$(this).parent().attr('id').split('-')[1]; - var replace = null; - if(ui.draggable.hasClass('widget-instance')) { - replace=ui.draggable; - } else { - replace=$('
  • ').append(ui.draggable.children().clone()); - replace.removeClass('widget-class').addClass('widget-instance'); - } - replace.children('input').attr('name', 'widgets['+where+'][]'); - $(this).replaceWith(replace); - if(parent.children().length<1) { - parent.append('
  • Drop here
    • '); - } - FlatPress.wreload(); - } - }); -}, -winstancedrop: function() { - $('.widget-instance').droppable({ - 'accept' : '.widget-class, .widget-dragger, .widget-instance', - 'over' : function(event, ui) { - $(this).animate({'background-color' : '#78ba91'}) - }, - 'out' : function(event, ui) { - $(this).animate({'background-color' : '#fff'}) - }, - 'drop' : function(event, ui) { - var parent=ui.draggable.parent(); - var where=$(this).parent().attr('id').split('-')[1]; - var replace = null; - if(ui.draggable.hasClass('widget-instance')) { - replace=ui.draggable; - } else { - replace=$('
  • ').append(ui.draggable.children().clone()); - replace.removeClass('widget-class').addClass('widget-instance'); - } - replace.children('input').attr('name', 'widgets['+where+'][]'); - $(this).after(replace); - $(this).animate({'background-color' : '#fff'}); - if(parent.children().length<1) { - parent.append('
  • Drop here
    • '); - } - FlatPress.wreload(); - } - }); -}, -wtrash: function() { - $('#widget-trashcan').droppable({ - 'accept' : '.widget-instance', - 'over' : function(event, ui) { - $(this).animate({'background-color' : '#faa'}) - }, - 'out' : function(event, ui) { - $(this).animate({'background-color' : '#a22'}) - }, - 'drop' : function(event, ui) { - var parent=ui.draggable.parent(); - var draggable = $(ui.draggable); - - // we can't remove() draggable here, because of a bug with jquery UI + IE8 - // we'll defer it - draggable.fadeOut(); - $('.widget-dragger').remove(); - - // last element has not been removed, - // so there is still one in the list, soon to be deleted ' - // (parent.children().lenght==1) - if(parent.children().length<2) { - parent.append('
  • Drop here
    • '); - } - $(this).animate({'background-color' : '#a22'}); - - // deferred removal takes place here - setTimeout(function() { - draggable.remove(); - }); - - FlatPress.wreload(); - } - }); -}, -wreload: function(){ - this.wclass(); - this.winstancedrag(); - this.wplaceholder(); - this.winstancedrop(); - //wtrash(); -} -} -//$(document).ready(wreload); -FlatPress.wreload();FlatPress.wtrash(); - ->>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 +nibble.wreload();nibble.wtrash(); \ No newline at end of file diff --git a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css index f199f11..301fd2f 100755 --- a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css +++ b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css @@ -7,7 +7,7 @@ Home page: http://www.maas-online.nl ------------------- Name: FlatMaas -Author: Luciano Porro (drudo) +Author: liquibyte Version: 0.0.1 Module: admin.css */ @@ -124,7 +124,7 @@ input#subject { #admin-content { - background: url(../imgs/fp-logo.png) bottom right no-repeat; + background: url(../imgs/nib-logo.png) bottom right no-repeat; } @@ -299,7 +299,7 @@ textarea.code { -/* #admin-content { background: url(../imgs/fp-logo.png) bottom right no-repeat } */ +/* #admin-content { background: url(../imgs/nib-logo.png) bottom right no-repeat } */ #admin-content table { width: 100%; border-collapse: collapse } @@ -511,7 +511,6 @@ li.admin-widgetset { border: 2px solid #00f; z-index: 2000; } - #available-widgets ul, .admin-widgetset ul { padding-left: 0; margin-left: 0; diff --git a/fp-interface/themes/leggero/leggero/res/admin.css b/fp-interface/themes/leggero/leggero/res/admin.css index 8d21e6b..c10027e 100755 --- a/fp-interface/themes/leggero/leggero/res/admin.css +++ b/fp-interface/themes/leggero/leggero/res/admin.css @@ -14,6 +14,10 @@ Module: admin.css @import url(common.css); @import url(globals.css); +<<<<<<< HEAD +======= + +>>>>>>> 109664842ba0aaec1b8e462a3fdcee470110a499 /* ===== VARIOUS ===== */ .buttonbar input { padding: .3em; @@ -572,6 +576,576 @@ a.link-general:hover, .main-cell a:hover { +/* ===== NOTIFICATIONS ===== */ +.hint { + cursor: help; +} + +.draft { background-color: #333 } + +/* (already defined in common, here we put just some tuning settings) */ +#admin-content ul.msgs { + margin:0; +} +/* +=================== +Leggero CSS Styles +=================== +Ispired by: http://pluxml.org theme default +------------------- + +Name: Leggero +Author: NoWhereMan & drudo +Version: 0.1 +Module: admin.css +*/ + +@import url(common.css); +@import url(globals.css); + + +/* ===== VARIOUS ===== */ +.buttonbar input { + padding: .3em; + background: #bdbdbd url(../imgs/buttonsh.png) repeat-x; +} +.buttonbar input:hover { + padding: .3em; + background: #d3d3d3 url(../imgs/buttonsh2.png) repeat-x; +} + +/* ===== HEADERS TAGS ===== */ +h1, +h2 { + font-family: 'book antiqua', georgia, garamond, times, 'times new roman', serif; + margin: auto; +} + +h2 { + border-bottom: 1px solid #ddd; +} + +body { background: #eee; } + +/* === Redefines some stuff in inline mode === */ +body#inline-body { + background: white; +} + +body#inline-body input { + +} + +/* === Conflict with inner h1 === */ +#admin-content h1 { color: black } + + + +/* DIV CONTAINER ALL ADMIN DIV BLOCK */ +#cpmain { padding: 10px } + + + +/* ===== SMALL NAVBAR (home and logout links) ===== */ +ul#admin-small-nav { + font-size: 80%; + float: right; + list-style-type: none +} + +ul#admin-small-nav li { display: inline; margin: 5px } + + + +/* ===== TAB MENU ===== */ +ul#admin-tabmenu { + margin: 1em 0 0 0; + padding: .5em; + background: #000; + -moz-border-radius-topleft:3px; + -moz-border-radius-topright:3px; +} + +ul#admin-tabmenu li { + display: inline; + font-size: 85%; + font-weight: normal; + text-decoration: none +} + +ul#admin-tabmenu li a { + color: #fff; + line-height: 2em; + font-weight: normal; + text-decoration: none; + padding: 0.5em; + margin: .1em; +} + +ul#admin-tabmenu li a.admin-tab-current, +ul#admin-tabmenu li a:hover { + color: black; + font-weight: normal; + background-color: #ddd; + -moz-border-radius: 2px; +} + +ul#admin-tabmenu li a.admin-tab-current { + font-weight: bold; +} + +/* ===== submenu ====== */ + +#admin-submenu { + background: #eee; + padding: .5em; + border: 1px solid #ccc; +} + +#admin-submenu li { + display:inline; + font-size: 80%; +} + +#admin-submenu li a { + padding: 0 1em ; + color: #000; + border-left: 1px solid #eee; + border-right: 1px solid #eee; + font-weight: normal; +} + +#admin-submenu li a:hover, +#admin-submenu li a.active { + color: #eee; + background: #555; + padding: .1em 1em .3em; + -moz-border-radius: 3px; + text-decoration: none; +} + +#admin-submenu li a.active { + font-weight: bold; +} + + + +/* ===== MAIN MENU ITEM ===== */ +#admin-content { padding: 1em } + +.admin-mainmenu-item { + display: block; + padding: 1em; + clear: both +} + +.admin-mainmenu-item img { padding-right: 1em } + +.admin-mainmenu-item .admin-icon-descr { + font-size: 80%; + font-style: italic +} + + + +/* ===== ADMIN ENTRY ===== */ +input#subject { + width: 99%; + font-size: 1.3em; + color: #333333; + font-weight: bold +} + +textarea.code { + font-family: Lucida Console, Monaco, monospace; + font-size: 90% +} + +#admin-entry-categories ul { + display:block; + list-style-type: none; + margin-right: 10px; + padding-left: 1em +} + +#admin-bbcode-toolbar p { display: inline } + +#admin-bbcode-toolbar select { width: 10em } + + + +#admin-content table { width: 100%; } + +#admin-content td { + font-size: 0.8em; + /* + with display:block on the main-cell link, let's disable this + padding: .9em; + */ + background: #e6e6e6; + text-align: center; +} + +#admin-content .enabled td { + background: inherit; +} + +#admin-content td.main-cell { + width: 30%; + text-align: left; +} + +#admin-content th { + font-size: 0.75em; + font-style: italic; + background: #ccc; + text-align: center; + padding: 8px +} + +input.maxsize, select.maxsize { width: 100% } + + +#admin-bbcode-toolbar { + margin: 0; + padding: 0; + padding-right: 0.7%; + border: none +} + +#admin-bbcode-toolbar legend { display: none } + +#admin-content ul, +#admin-content ol { margin-left: 2em } + +#admin-entry-uploader iframe { + border: none; + width: 99%; + margin: auto; + height: 11em; +} + + +.admin-entry-commentlist td , +.admin-widgets-blockparser td , +.admin-plugin-default td { + padding: 1em .6em; +} + +#admin-drafts { + border-top: 1px solid #bbb; + border-bottom: 1px solid #bbb; + padding: .4em; + color: #555; + background-color: #ddd; + overflow: auto; +} + +#admin-drafts p { + font-weight: bold; + float: left; + padding: 0; + margin: 0; +} + +#admin-content #admin-drafts ul { + margin: 0; padding: 0; +} + +#admin-drafts li { + float:left; + list-style-position: inside; + margin: 0; padding-left: 1em; +} + + +/* ===== PREVIEW SETTINGS ===== */ +#post-preview .entry { padding: 2em; max-height: 20em; overflow: auto } + +#post-preview ul { list-style: none; padding: 0 0 0 1.6em } + +#post-preview ol { list-style-position: inside; Padding: 0 1.6em 0 1.6em } + + +/* ===== UPLOAD PANEL ===== */ +#admin-uploader-filelist { + margin: 1em auto; +} + +#admin-uploader-thumbs { + list-style-type: none; +} + +#admin-uploader-thumbs li.thumb { + float:left; + width: 110px; + height: 110px; + padding: 1em 4px; + margin: 1em; +} + + +/* (applies only to the inline version */ +#upload { + margin-top: .5em +} + + +/* ===== THEME PANEL ===== */ + +#current-theme h5, +#available-themes h5 { + font-size: 1em; +} + +#current-theme { + margin-bottom: 4em; + overflow:hidden; +} + + +#current-theme img { + float:left; + border: 1px solid #ddd; + margin-right: 2em; +} + +#available-themes { + clear: both; +} + + +#available-themes img { + border: 1px solid #eee +} + +#available-themes ul { + list-style-type: none; +} + +#available-themes ul li { + float:left; + padding: 1em; + border: 1px solid #fff; + text-align: center; + width: 300px; +} + +#available-themes ul li:hover { + background: #eee; + border: 1px solid #ddd; +} + +/* ===== WIDGET PANEL ====== */ + +#admin-widgetset-list { + width: 30em; +} + +#admin-widgetset-list ul { + list-style-type: none; + margin: 0; + margin-bottom: 2em; + text-align: left; +} + +li.admin-widgetset { + padding: .5em; + margin-bottom: 2em; + border: 1px solid #ddd; +} + +#available-widgets { + font-size: 80%; + float:right; + border: 1px solid #ddd; + background: #eee; + padding: 1em; + width: 30%; + z-index: 1000; + position: relative; + text-align: left; +} + +#widget-trashcan { + background-color: #a22; + color: #ddd; + font-size: 120%; + font-weight: bold; + padding: 2em; + text-align: center; + border: 2px solid #f00; + margin: 2em; +} + +#available-widgets ul, .admin-widgetset ul { + padding-left: 0; + margin-left: 0; +} + + +li.widget-instance, +li.widget-class { + cursor: move; + border: 1px solid #bbb; + margin: 2px; + padding: .5em; + height: 30px; + background-color: white; + list-style-type: none; +} + + +.admin-widgetset h3 { + margin-bottom:1em; + padding: .3em; + background: #eee; + border: 1px solid #ddd; +} + +#available-widgets h2 { + cursor: move; + color: white; + margin-bottom:1em; + padding: .3em; + border: 1px solid #eee; + background: #999; +} + +.widget-instance .textinput { + padding: .4em; + background: transparent; + font-weight: bold; + font-style: oblique; + color: blue; + border: #fff 2px solid; + text-align: right; +} + +.widget-instance .textinput:hover { + border: #d00 2px solid; + background-color:white; +} + + +.widget-instance .textinput:focus { + font-style: normal; + border: #f00 2px solid; + background-color:white; + text-align: left; +} + + +.widgetname a, +.widgetname a:link, +.widgetname a:visited { + color: #ddd; +} + +.widget-placeholder { + padding: .5em; + font-style: oblique; + text-align: center; + border: 1px dashed #ddd; +} + +.widget-dragger { + text-align: left; + z-index: 1000; + padding: .5em; + height: 30px !important; +} + + +/* ===== CONFIG PANEL ===== */ + +.option-set .option-list { + margin-bottom: 4em; +} + +.option-set dt { + width: 33%; + text-align:right; + margin-top: 1.8em; + line-height: 1.5em; + font-weight: bold; +} + +.option-set dt label { + padding-top: .2em; +} + +.option-set dd { + margin-left: 35%; + margin-top: -1.7em; + line-height: 1.5em; +} + + +.option-set dd p { + margin: 0; +} + + +.option-set dd input{ + margin-bottom: .2em; +} + +.textinput, .bigtextinput, .smalltextinput { + padding: .5em; +} + +.textinput:focus, .bigtextinput:focus, .smalltextinput:focus { + font-weight: bold; +} + +.widetextinput { + width: 99%; + font-size: 1.3em; + color: #333333; +} + +.option-set input.textinput , +.option-set select.textinput { + width: 20em; +} + + +.option-set input.bigtextinput { + width: 30em; +} + + +.option-set input.smalltextinput { + width: 5em; +} + +/* ===== SPECIAL HOVERS ====== */ +a.link-disable, +a.link-delete, +a.link-enable, +a.link-general { + padding: .9em; +} + +td.main-cell a.link-general {display:block} + +a.link-disable:hover, a.link-delete:hover { + background-color: red; + color: white; +} +a.link-enable:hover { + background-color: green; + color: white; +} + +a.link-general:hover, .main-cell a:hover { + background-color: #aaa; + color: black; +} + + + /* ===== NOTIFICATIONS ===== */ .hint { cursor: help; diff --git a/fp-plugins/jquery/plugin.jquery.php b/fp-plugins/jquery/plugin.jquery.php old mode 100755 new mode 100644 From 0f6e40c7da019b3fd5d90b3b237e18875e130ba4 Mon Sep 17 00:00:00 2001 From: liquibyte Date: Wed, 29 Jan 2014 23:50:55 -0500 Subject: [PATCH 5/7] Things just don't seem to work right with git. Signed-off-by: liquibyte --- admin/panels/widgets/admin.widgets.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/admin/panels/widgets/admin.widgets.js b/admin/panels/widgets/admin.widgets.js index a234433..39442fb 100644 --- a/admin/panels/widgets/admin.widgets.js +++ b/admin/panels/widgets/admin.widgets.js @@ -1,6 +1,6 @@ /* - * nibble widget js admin - * Based on original nibble' code + * FlatPress widget js admin + * Based on original FlatPress' code * Require jQuery and jQuery UI (Core, Draggable, Droppable and Effects Core) * Coded by Piero VDFN * Re-Coded by liquibyte @@ -12,7 +12,7 @@ * accepts drag and drop from installed widgets to remove. * Released under GNU GPL v2 */ -var nibble = { +var FlatPress = { winstancedrag : function() { $('.widget-class').draggable({ 'scroll' : true, @@ -67,7 +67,7 @@ var nibble = { if (parent.children().length < 1) { parent.append('
  • Drop here
    • '); } - nibble.wreload(); + FlatPress.wreload(); } }); }, @@ -94,7 +94,7 @@ var nibble = { if (parent.children().length < 1) { parent.append('
  • Drop here
    • '); } - nibble.wreload(); + FlatPress.wreload(); } }); }, @@ -120,7 +120,7 @@ var nibble = { setTimeout(function() { draggable.remove(); }); - nibble.wreload(); + FlatPress.wreload(); } }); $('.widget-class').droppable({ @@ -144,7 +144,7 @@ var nibble = { setTimeout(function() { draggable.remove(); }); - nibble.wreload(); + FlatPress.wreload(); } }); @@ -155,4 +155,4 @@ var nibble = { this.wplaceholder(); } } -nibble.wreload();nibble.wtrash(); \ No newline at end of file +FlatPress.wreload();FlatPress.wtrash(); \ No newline at end of file From 2eecd943076b7ebfcc7dc25a448fb27e1159a474 Mon Sep 17 00:00:00 2001 From: liquibyte Date: Wed, 29 Jan 2014 23:58:10 -0500 Subject: [PATCH 6/7] I swear this thing is pulling files from nowhere. I keep seeing changes I didn't make. Signed-off-by: liquibyte --- fp-interface/themes/leggero/flatmaas-rev/res/admin.css | 3 ++- fp-interface/themes/leggero/leggero/res/admin.css | 2 +- fp-plugins/jquery/plugin.jquery.php | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css index 301fd2f..0f11624 100755 --- a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css +++ b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css @@ -4,10 +4,11 @@ FlatMaas CSS Styles =================== Ispired by: http://csszengarden.com/?cssfile=http://maas-online.nl/zengarden/layout.css Home page: http://www.maas-online.nl +mod by liquibyte ------------------- Name: FlatMaas -Author: liquibyte +Author: Luciano Porro (drudo) Version: 0.0.1 Module: admin.css */ diff --git a/fp-interface/themes/leggero/leggero/res/admin.css b/fp-interface/themes/leggero/leggero/res/admin.css index c10027e..89bd6e9 100755 --- a/fp-interface/themes/leggero/leggero/res/admin.css +++ b/fp-interface/themes/leggero/leggero/res/admin.css @@ -4,7 +4,7 @@ Leggero CSS Styles =================== Ispired by: http://pluxml.org theme default ------------------- - +mod by liquibyte Name: Leggero Author: NoWhereMan & drudo Version: 0.1 diff --git a/fp-plugins/jquery/plugin.jquery.php b/fp-plugins/jquery/plugin.jquery.php index 6888642..ed5b3da 100644 --- a/fp-plugins/jquery/plugin.jquery.php +++ b/fp-plugins/jquery/plugin.jquery.php @@ -6,6 +6,7 @@ Plugin URI: http://www.vdfn.altervista.org/ Description: provides jQuery Author: Piero VDFN Author URI: http://www.vdfn.altervista.org/ +JQuery and JQueryUI version bump by liquibyte */ ## Original author: NoWhereMan (http://www.nowhereland.it) From 60442e00e33e325c55258bc21cd0a5555389a48c Mon Sep 17 00:00:00 2001 From: MarcThibeault Date: Fri, 28 Feb 2014 21:13:14 -0500 Subject: [PATCH 7/7] Changed 'Archive' to 'Categories' in entry editor Noticed that when editing an entry, the categories checkbox container's name was 'Archive'. I modified the template and the lang file so that it's 'Categories' from now on. --- admin/panels/entry/admin.entry.write.tpl | 2 +- fp-interface/lang/en-us/lang.admin.entry.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl index 890e8f1..c477b3d 100755 --- a/admin/panels/entry/admin.entry.write.tpl +++ b/admin/panels/entry/admin.entry.write.tpl @@ -51,7 +51,7 @@ {* end of inline form *} -
    {$panelstrings.archive} +
    {$panelstrings.categories} {list_categories type=form selected=$categories}
    diff --git a/fp-interface/lang/en-us/lang.admin.entry.php b/fp-interface/lang/en-us/lang.admin.entry.php index 237dd51..9d7b7c0 100755 --- a/fp-interface/lang/en-us/lang.admin.entry.php +++ b/fp-interface/lang/en-us/lang.admin.entry.php @@ -43,7 +43,7 @@ 'submit' => 'Publish', 'preview' => 'Preview', 'savecontinue' => 'Save&Continue', - 'archive' => 'Archive', + 'categories' => 'Categories', 'nocategories' => 'No categories set. Create your own '. 'categories from the main entry panel. '. 'Save your entry first.',