Commit Graph

132 Commits

Author SHA1 Message Date
7405e198eb Use .displayAs() instead of .show()
Needed for CSS display to be set as inline-block instead of show()'s inline.
2018-08-31 14:23:23 +02:00
c35fb6202b render_secondary_navigation: Bootstrap 4 tweaks 2018-08-28 15:51:56 +02:00
6ff4ee8fa1 Minor Dashboard style tweaks 2018-08-27 17:02:36 +02:00
aeaa03ed80 Handle embedded featured nodes to get node_id 2018-04-16 17:30:02 +02:00
3319a578b9 Move secondary navigation rendering to a macro 2018-04-16 16:23:19 +02:00
289dc39e50 Fixed T54149: Link markup in project description doesn't work
Don't convert MarkDown in JavaScript when we already do it in Python.
2018-04-03 16:23:58 +02:00
dcde2a4551 Merge branch 'master' into wip-asset-obscure 2018-03-28 12:42:42 +02:00
17792df85e Cleanup: Unused block 2018-03-27 19:13:14 +02:00
dfaac59e20 Cache Markdown'ed HTML in database
This is done via coercion rules. To cache the field 'content' in the
database, include this in your Eve schema:

    {'content': {'type': 'string', 'coerce': 'markdown'},
     '_content_html': {'type': 'string'}}

The `_content_html` field will be filled automatically when saving the
document via Eve.

To display the cached HTML, and fall back to display-time rendering if it
is not there, use `{{ document | markdowned('content') }}` in your template.

Still needs unit testing, a CLI command for regenerating the caches, and
a CLI command for migrating the node type definitions in existing projects.
2018-03-27 16:34:32 +02:00
12272750c3 T53890: Improving static content serving
Static files are now served with an 8-character hash before the last
extension. For example, `tutti.min.js` is now served as
`tutti.min.abcd1234.js`. When doing a request the hash is removed before
serving the static file.

The hash must be 8 characters long, and is taken from STATIC_FILE_HASH.
It is up to the deployment to change this configuration variable
whenever static files change. This forces browsers that download newly
deployed HTML to also refresh the dependencies (most importantly
JS/CSS).

For this to work, the URL must be built with `url_for('static_xxx',
filename='/path/to/file')`. The 'static' module still returns regular,
hashless URLs.
2018-03-23 17:36:14 +01:00
1ca2f336c4 Proper error handling for node type editor 2018-02-01 14:13:01 +01:00
08a814525b Implement project undelete as PATCH
This is done via a custom PATCH due to the lack of transactions of MongoDB;
we cannot undelete both project-referenced files and file-referenced
projects in one atomic operation.
2018-01-31 14:15:23 +01:00
d726e15ed8 Merge branch 'master' of git.blender.org:pillar into elastic 2017-12-29 12:19:47 +01:00
8f73dab36e Allow project undeletion, fixes T51244
Projects can be undeleted within a month of deletion.
2017-12-22 16:27:05 +01:00
6d37046933 Fixed "leave shared project" javascript
Now the project is actually removed from the page. This isn't optimal; see
T53546 for a followup.
2017-12-12 11:48:48 +01:00
b7773e69c7 Merge branch 'master' into elastic 2017-12-08 12:55:57 +01:00
9fdcfff4fc Direct users to renewal page on Store instead of /join
/join should only be used when someone can actually buy a new subscription.
/renew should be used when someone already has a subscription that needs
to be renewed.

Since url_for('cloud.xxxx') makes no sense in Pillar, I just hard-coded
/renew instead.
2017-12-06 14:39:30 +01:00
b0d6f724ef Merge branch 'master' of git.blender.org:pillar into elastic 2017-12-01 16:24:56 +01:00
2ad65b0485 Project: Remove collapse of sidebar
Since projects went full-width it's not needed anymore.
2017-11-28 15:36:31 +01:00
ce7754ffe4 Renaming IDs to classes 2017-11-24 19:34:58 +01:00
9cd3d97c75 T53161 javascript search stuff almost complete. 2017-11-24 17:47:38 +01:00
7252055e4a Markdown: Convert Markdown via Jinja filter in the template
This gets rid of the use of javascript for converting node/post description.
Now we only use markdown.js for real time as-we-type stuff, like node/post
editing or commenting.
2017-11-23 16:49:19 +01:00
cb7a23bc69 Fixed home project menu 2017-11-21 14:48:59 +01:00
0cea8d622d Update cache for CSS/JS 2017-11-09 19:00:01 +01:00
3585443508 Use cache or jstree css 2017-10-25 17:27:55 +02:00
ed55a73d04 VideoJS: Upgrade and stuff
* Upgrade to the latest stable version 6.2.8
* Move JS files to blender-cloud
* Introducing Hotkeys support (a'la YouTube)
* Introducing Loop button (and a way to easily add new buttons)
* Fix Analytics plugin to work with the VideoJS 6
* Minor style tweaks to work with the latest update
2017-10-24 12:49:39 +02:00
4f3fc91c0a VideoJS: Upgrade and stuff
* Upgrade to the latest stable version 6.2.8
* Move JS files to blender-cloud
* Introducing Hotkeys support (a'la YouTube)
* Introducing Loop button (and a way to easily add new buttons)
* Minor style tweaks to work with the latest update
2017-10-24 12:38:11 +02:00
68c7a88fed Use the nifty new DocumentTitleAPI to update notification count
and page titles when browsing assets.

This removes the need for updateTitle()
2017-10-05 15:29:30 +02:00
1bf2a87726 Use a the updateTitle() function to update page titles 2017-10-02 19:48:37 +02:00
d3cd6a884e Use toastr notifications instead of statusBarSet() 2017-10-02 19:31:52 +02:00
ddc52b969e Make it possible for node types to have a 'custom view'
This 'custom view' means that the URL to view the node (as returned by
url_for_node(…)) cannot be loaded via XHR and embedded in the project
viewer, but should rather be used as the actual browser URL instead.

Currently only blogs use this.
2017-09-29 10:45:29 +02:00
f311dbbe30 Fix fluid headers on video 2017-09-21 19:04:55 +02:00
ebe3118f79 Project home video should not have vjs-fluid, it already is fluid 2017-09-20 16:35:19 +02:00
6af0cd2be8 Don't show "Create a project" button to non-subscribers, and make btn clickable 2017-09-18 13:51:31 +02:00
53ac29cfd1 Project: Show edit button in sidebar
So we can access it from everywhere and not only from project home
2017-09-17 20:11:13 +02:00
06dd24bcf9 Project Edit: Node types editing embedded 2017-09-04 16:19:17 +02:00
6a4f571b05 Organizations list styling 2017-08-31 16:35:31 +02:00
b6bd40f956 Theatre View: backdrop block not needed anymore 2017-08-30 15:34:13 +02:00
811236cff4 Migrate Jade to Pug template engine
Jade templates engine has been renamed to Pug.

We are using Pug already on the Blender Cloud repository, following is Flamenco and Attract
2017-08-30 14:04:15 +02:00
add2538655 Prevent JS error by sync-loading jquery.autocomplete….js 2017-08-25 12:03:52 +02:00
ff1b14d980 Project sharing: Simplified user selection JS code. 2017-08-25 12:03:52 +02:00
575a7ed1a7 Introduced role-based capability system.
It's still rather limited and hard-coded, but it works.
2017-08-18 14:47:42 +02:00
9aa73c5306 Moved project index_collection to blender-cloud repo 2017-07-26 16:52:05 +02:00
e430b2b9a1 Update url_for from main.join to cloud.join
This text should be moved to Blender Cloud.
2017-07-16 01:00:24 +02:00
4fd193ba2b Use (eek) the current_user_is_subscriber var injected by the BCloud extension 2017-06-14 16:26:57 +02:00
10e14e8c24 Project Edit: tweak to node types 2017-06-09 17:57:20 +02:00
6f7aa86e8b Project Edit: Set container size and header width 2017-06-09 17:57:01 +02:00
93087f7fa9 Project Edit: Use folder icon for sidebar instead of tree 2017-06-09 14:58:19 +02:00
41bc4b6a6f Project Edit: Nicer listing for node_type 2017-06-09 14:58:05 +02:00
5ce78a2fb3 Create <p> tag, do not use existing tags 2017-06-07 18:59:46 +02:00