Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-11 08:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed include of hallo-wagtail-toolbar.js, which only appeared to be broken and was almost identical to the core version

Browse source
This commit is contained in:
Dave Cranwell 2014-06-19 17:52:36 +01:00
parent 269dfe62f5
commit 73e7ca0098
5 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
View file

@ -33,6 +33,7 @@
}
},
_getPosition: function(event, selection) {
alert('here');
var offset, position, width;
if (!event) {
return;

7
wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
View file

@ -1,11 +1,14 @@
"use strict";
var halloPlugins = {
'halloformat': {},
'halloheadings': {formatBlocks: ["p", "h2", "h3", "h4", "h5"]},
'hallolists': {},
'hallohr': {},
'halloreundo': {},
'hallowagtaillink': {},
'hallowagtaillink': {}
};
function registerHalloPlugin(name, opts) {
halloPlugins[name] = (opts || {});
}
@ -197,7 +200,7 @@ function InlinePanel(opts) {
self.updateMoveButtonDisabledStates = function() {
if (opts.canOrder) {
forms = self.formsUl.children('li:visible');
var forms = self.formsUl.children('li:visible');
forms.each(function(i) {
$('ul.controls .inline-child-move-up', this).toggleClass('disabled', i === 0).toggleClass('enabled', i !== 0);
$('ul.controls .inline-child-move-down', this).toggleClass('disabled', i === forms.length - 1).toggleClass('enabled', i != forms.length - 1);

17
wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
View file

@ -497,19 +497,22 @@ li.focused > .help{
}
/* This is specifically for model that are a generated set of checkboxes/radios */
.model_multiple_choice_field .input li,
.choice_field .input li{
label{
display:block;
width:auto;
float:none;
}
}
.fields > li{
@include clearfix();
padding-top:0.5em;
padding-bottom:1.2em;
}
.field-content .input li{
label{
width:auto;
float:none;
}
}
.input{
clear:both;
}

3
wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss
View file

@ -3,7 +3,6 @@
.hallotoolbar{
position:absolute;
left:$mobile-nice-padding;
z-index:5;
margin-top:4em;
margin-left:0em;
@ -150,6 +149,6 @@
@media screen and (min-width: $breakpoint-mobile){
.hallotoolbar{
left:$menu-width + $desktop-nice-padding;
}
}

1
wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
View file

@ -16,7 +16,6 @@
<script src="{{ STATIC_URL }}wagtailadmin/js/vendor/tag-it.js"></script>
<script src="{{ STATIC_URL }}wagtailadmin/js/expanding_formset.js"></script>
<script src="{{ STATIC_URL }}wagtailadmin/js/modal-workflow.js"></script>
<script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js"></script>
<script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js"></script>
<script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-hr.js"></script>
<script src="{{ STATIC_URL }}wagtailadmin/js/page-editor.js"></script>