settings: bootstrap3 and djangocms-blog
+ Now BLOG_USE_PLACEHOLDER is False, this should give us a HTML Text field for the article body. + The URLs for the bootstrap and jquery cnd location changed, now there should not be problem fetching them over https Signed-off-by: rscnt <rascnt@gmail.com>
This commit is contained in:
		
					parent
					
						
							
								fc2d09d9ac
							
						
					
				
			
			
				commit
				
					
						181ca7cb59
					
				
			
		
					 1 changed files with 75 additions and 2 deletions
				
			
		| 
						 | 
					@ -250,8 +250,6 @@ if LOGOUT_URL is None:
 | 
				
			||||||
if LOGIN_REDIRECT_URL is None:
 | 
					if LOGIN_REDIRECT_URL is None:
 | 
				
			||||||
    LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT
 | 
					    LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Static files (CSS, JavaScript, Images)
 | 
					# Static files (CSS, JavaScript, Images)
 | 
				
			||||||
# https://docs.djangoproject.com/en/1.7/howto/static-files/
 | 
					# https://docs.djangoproject.com/en/1.7/howto/static-files/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -319,6 +317,81 @@ TEXT_SAVE_IMAGE_FUNCTION='cmsplugin_filer_image.integrations.ckeditor.create_ima
 | 
				
			||||||
TEXT_ADDITIONAL_TAGS = ('iframe',)
 | 
					TEXT_ADDITIONAL_TAGS = ('iframe',)
 | 
				
			||||||
TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
 | 
					TEXT_ADDITIONAL_ATTRIBUTES = ('scrolling', 'allowfullscreen', 'frameborder')
 | 
				
			||||||
USE_X_FORWARDED_HOST = True
 | 
					USE_X_FORWARDED_HOST = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Django Bootstrap - Settings
 | 
				
			||||||
 | 
					# Added Configuration for bootstrap static files to load over https.
 | 
				
			||||||
 | 
					BOOTSTRAP3 = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # The URL to the jQuery JavaScript file
 | 
				
			||||||
 | 
					    'jquery_url': '//code.jquery.com/jquery.min.js',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # The Bootstrap base URL
 | 
				
			||||||
 | 
					    'base_url': '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # The complete URL to the Bootstrap CSS file (None means derive it from base_url)
 | 
				
			||||||
 | 
					    'css_url': None,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # The complete URL to the Bootstrap CSS file (None means no theme)
 | 
				
			||||||
 | 
					    'theme_url': None,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # The complete URL to the Bootstrap JavaScript file (None means derive it from base_url)
 | 
				
			||||||
 | 
					    'javascript_url': None,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Put JavaScript in the HEAD section of the HTML document (only relevant if you use bootstrap3.html)
 | 
				
			||||||
 | 
					    'javascript_in_head': False,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
 | 
				
			||||||
 | 
					    'include_jquery': False,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Label class to use in horizontal forms
 | 
				
			||||||
 | 
					    'horizontal_label_class': 'col-md-3',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Field class to use in horizontal forms
 | 
				
			||||||
 | 
					    'horizontal_field_class': 'col-md-9',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Set HTML required attribute on required fields
 | 
				
			||||||
 | 
					    'set_required': True,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Set HTML disabled attribute on disabled fields
 | 
				
			||||||
 | 
					    'set_disabled': False,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Set placeholder attributes to label if no placeholder is provided
 | 
				
			||||||
 | 
					    'set_placeholder': True,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Class to indicate required (better to set this in your Django form)
 | 
				
			||||||
 | 
					    'required_css_class': '',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Class to indicate error (better to set this in your Django form)
 | 
				
			||||||
 | 
					    'error_css_class': 'has-error',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Class to indicate success, meaning the field has valid input (better to set this in your Django form)
 | 
				
			||||||
 | 
					    'success_css_class': 'has-success',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Renderers (only set these if you have studied the source and understand the inner workings)
 | 
				
			||||||
 | 
					    'formset_renderers':{
 | 
				
			||||||
 | 
					        'default': 'bootstrap3.renderers.FormsetRenderer',
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    'form_renderers': {
 | 
				
			||||||
 | 
					        'default': 'bootstrap3.renderers.FormRenderer',
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    'field_renderers': {
 | 
				
			||||||
 | 
					        'default': 'bootstrap3.renderers.FieldRenderer',
 | 
				
			||||||
 | 
					        'inline': 'bootstrap3.renderers.InlineFieldRenderer',
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# djangocms_blog config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					BLOG_ENABLE_COMMENTS = False
 | 
				
			||||||
 | 
					BLOG_USE_PLACEHOLDER = False
 | 
				
			||||||
 | 
					BLOG_IMAGE_THUMBNAIL_SIZE = {'size': '120x120', 'crop': True,'upscale': False}
 | 
				
			||||||
 | 
					BLOG_IMAGE_FULL_SIZE = {'size': '640x120', 'crop': True,'upscale': False}
 | 
				
			||||||
 | 
					BLOG_PAGINATION = 4
 | 
				
			||||||
 | 
					BLOG_LATEST_POSTS = BLOG_PAGINATION
 | 
				
			||||||
 | 
					BLOG_POSTS_LIST_TRUNCWORDS_COUNT = 100
 | 
				
			||||||
 | 
					BLOG_MULTISITE = True
 | 
				
			||||||
 | 
					BLOG_AUTHOR_DEFAULT = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
try:
 | 
					try:
 | 
				
			||||||
    from .local.local_settings import *
 | 
					    from .local.local_settings import *
 | 
				
			||||||
except ImportError as e:
 | 
					except ImportError as e:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue