archive/flamenco-manager
Archived
0
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removing last bits of brender mentions

Browse Source 
and replacing them with flamenco
This commit is contained in:
Olivier Amrein
2015-05-23 17:27:22 +02:00
committed by Eibriel
parent 001b959468
commit fb38331e7e
17 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/Makefile
+4 -4
View File
@@ -85,17 +85,17 @@ qthelp:
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/brender.qhcp"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/flamenco.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/brender.qhc"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/flamenco.qhc"
devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/brender"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/brender"
@echo "# mkdir -p $$HOME/.local/share/devhelp/flamenco"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/flamenco"
@echo "# devhelp"
epub:
flamenco/dashboard/application/static/css/brender.css
+1 -1
View File
@@ -27,7 +27,7 @@ hr {
color: #333;
}
#brender-navbar-collapse-2 .navbar-brand {
#flamenco-navbar-collapse-2 .navbar-brand {
color: #666;
}
flamenco/dashboard/application/templates/about.html
+5 -5
View File
@@ -1,16 +1,16 @@
<div class="text-center">
<img class="img-responsive" src="{{ url_for('static', filename='img/logo/logo_minimal.png') }}">
<p>Brender Version: 2.0alpha</p>
<p>Website: <a href="http://www.brender-farm.org/">www.brender-farm.org</a></p>
<p>Documentation: <a href="http://www.brender-farm.org/">www.brender-farm.org</a></p>
<p>Report issues: <a href="https://github.com/fsiddi/brender/issues">GitHub</a></p>
<p>Flamenco Version: 2.0 beta</p>
<p>Website: <a href="http://www.flamenco.io/docs/">www.flamenco.io</a></p>
<p>Documentation: <a href="http://www.flamenco.io/docs/">www.flamenco.io/docs/</a></p>
<p>Report issues: <a href="https://github.com/fsiddi/flamenco/issues">GitHub</a></p>
<p>Licensed under: GNU GPL 2.0 - 2010-2015</p>
</div>
<script>
$(document).ready(function() {
$('#brenderModalLabel').text('About brender');
$('#flamencoModalLabel').text('About flamenco');
$('.modal-footer').children('.btn-primary').hide();
});
flamenco/dashboard/application/templates/browse_modal.html
+1 -1
View File
@@ -11,7 +11,7 @@
<script>
$(document).ready(function() {
$('#brenderModalLabel').text('Select a blendfile');
$('#flamencoModalLabel').text('Select a blendfile');
// Support for AJAX loaded modal window.
// Focuses on first input textbox after it loads the window.
flamenco/dashboard/application/templates/jobs/add_modal.html
+2 -2
View File
@@ -94,9 +94,9 @@
$(document).ready(function() {
{% if projects %}
$('#brenderModalLabel').text('Add job for {{projects[settings['active_project']]['name']}}');
$('#flamencoModalLabel').text('Add job for {{projects[settings['active_project']]['name']}}');
{% else %}
$('#brenderModalLabel').text('Error');
$('#flamencoModalLabel').text('Error');
$('#addJob').html('Currently no project has been created. Go to the settings section and add one.');
$('.modal-footer').children('.btn-primary').hide();
{% endif %}
flamenco/dashboard/application/templates/layout.html
+5 -5
View File
@@ -13,12 +13,12 @@
<link href="{{ url_for('static', filename='ico/favicon.ico') }}" rel="shortcut icon">{% block header_scripts %}{% endblock %}
</head>
<body>{% block modal %}
<div id="brenderModal" tab-index="-1" role="dialog" aria-labelledby="brenderModalLabel" aria-hidden="true" class="modal fade">
<div id="flamencoModal" tab-index="-1" role="dialog" aria-labelledby="flamencoModalLabel" aria-hidden="true" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" data-dismiss="modal" aria-hidden="true" class="close">&times;</button>
<h4 id="brenderModallabel" class="modal-title">Modal title</h4>
<h4 id="flamencoModallabel" class="modal-title">Modal title</h4>
</div>
<div class="modal-body"></div>
<div class="modal-footer">
@@ -34,7 +34,7 @@
<div class="navbar-header">
<button data-target=".navbar-collapse" data-toggle="collapse" type="button" class="navbar-toggle"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button>
</div>
<nav id="brender-navbar-collapse-1" class="navbar-collapse collapse">{% block nav %}{% endblock %}
<nav id="flamenco-navbar-collapse-1" class="navbar-collapse collapse">{% block nav %}{% endblock %}
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ url_for('managers.index') }}">Managers</a></li>
<li><a href="{{ url_for('workers.index') }}">Workers</a></li>
@@ -67,7 +67,7 @@
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js" type="text/javascript"></script>
<script src="//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js" type="text/javascript"></script>
<script src="{{ url_for('static', filename='js/dataTables.bootstrap.min.js') }}" type="text/javascript"></script>
<script src="{{url_for('static', filename='js/jquery.brender.js')}}" type="text/javascript"></script>
<script src="{{url_for('static', filename='js/jquery.flamenco.js')}}" type="text/javascript"></script>
<script src="{{ url_for('static', filename='js/jquery.readmore-readless.js') }}" type="text/javascript"></script>
<script src="{{ url_for('static', filename='js/bootstrap-growl.min.js') }}" type="text/javascript"></script>{% block footer_scripts %}{% endblock %}
<script>
@@ -93,7 +93,7 @@
});
$('.modal-footer').children('.btn-primary').text('Add Job');
$('#brenderModal').modal('show');
$('#flamencoModal').modal('show');
});
});
flamenco/dashboard/application/templates/projects/add_modal.html
+1 -1
View File
@@ -91,7 +91,7 @@
<script>
$(document).ready(function() {
$('#brenderModalLabel').text('Add project');
$('#flamencoModalLabel').text('Add project');
$('.modal-footer').children('.btn-primary').text('Add project');
$('#name').keyup(function(){
$('#new_project_name').text($(this).val());
flamenco/dashboard/src/jade/layout.jade
+5 -5
View File
@@ -19,13 +19,13 @@ html(lang="en")
body
| {% block modal %}
#brenderModal.modal.fade(tab-index="-1", role="dialog", aria-labelledby="brenderModalLabel", aria-hidden="true")
#flamencoModal.modal.fade(tab-index="-1", role="dialog", aria-labelledby="flamencoModalLabel", aria-hidden="true")
.modal-dialog
.modal-content
.modal-header
button.close(type="button", data-dismiss="modal", aria-hidden="true")
| &times;
h4#brenderModallabel.modal-title Modal title
h4#flamencoModallabel.modal-title Modal title
.modal-body
.modal-footer
input#modal_variable(type="hidden", name="modal_variable", value="")
@@ -45,7 +45,7 @@ html(lang="en")
span.icon-bar
span.icon-bar
nav#brender-navbar-collapse-1.navbar-collapse.collapse
nav#flamenco-navbar-collapse-1.navbar-collapse.collapse
| {% block nav %}{% endblock %}
ul.nav.navbar-nav.navbar-right
li
@@ -92,7 +92,7 @@ html(lang="en")
script(src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js", type="text/javascript")
script(src="//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js", type="text/javascript")
script(src="{{ url_for('static', filename='js/dataTables.bootstrap.min.js') }}", type="text/javascript")
script(src="{{url_for('static', filename='js/jquery.brender.js')}}", type="text/javascript")
script(src="{{url_for('static', filename='js/jquery.flamenco.js')}}", type="text/javascript")
script(src="{{ url_for('static', filename='js/jquery.readmore-readless.js') }}", type="text/javascript")
script(src="{{ url_for('static', filename='js/bootstrap-growl.min.js') }}", type="text/javascript")
@@ -121,7 +121,7 @@ html(lang="en")
});
$('.modal-footer').children('.btn-primary').text('Add Job');
$('#brenderModal').modal('show');
$('#flamencoModal').modal('show');
});
});
flamenco/dashboard/src/sass/main.sass
+1 -1
View File
@@ -28,7 +28,7 @@ hr
color: #333
#brender-navbar-collapse-2 .navbar-brand
#flamenco-navbar-collapse-2 .navbar-brand
color: #666
flamenco/manager/application/__init__.py
+2 -2
View File
@@ -46,7 +46,7 @@ try:
logging.error("The server {0} seems be unavailable.".format(app.config['FLAMENCO_SERVER']))
exit(3)
except KeyError:
logging.error("Please, configure Brender Paths browsing Dashboard->Server->Settings")
logging.error("Please, configure Flamenco Paths browsing Dashboard->Server->Settings")
exit(3)"""
else:
app.config.update(
@@ -85,7 +85,7 @@ except ImportError:
logging.error("The server {0} seems be unavailable.".format(app.config['FLAMENCO_SERVER']))
exit(3)
except KeyError:
logging.error("Please, configure Brender Paths browsing Dashboard->Server->Settings")
logging.error("Please, configure Flamenco Paths browsing Dashboard->Server->Settings")
exit(3)"""
flamenco/manager/application/task_compilers/tiled_blender_render_simple_mix.template
+1 -1
View File
@@ -128,7 +128,7 @@ def relink(out, new_out):
#MAIN
tiles_path='/render/brender/render_test/137/tiled_{0}_0001.exr'
tiles_path='/render/flamenco/render_test/137/tiled_{0}_0001.exr'
tiles=4
##VARS_INSERTED_HERE##
flamenco/manager/tests.py
+1 -1
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
Welcome to the brender test suite. Simply run python test.py and check
Welcome to the flamenco test suite. Simply run python test.py and check
that all tests pass.
Individual tests can be run with the following syntax:
flamenco/server/application/modules/projects/model.py
+1 -1
View File
@@ -7,7 +7,7 @@ class Project(db.Model):
"""Production project folders
This is a temporary table to get quickly up and running with project
support in brender. In the future, project definitions could come from
support in flamenco. In the future, project definitions could come from
attract or it could be defined in another way.
"""
id = db.Column(db.Integer, primary_key=True)
flamenco/server/application/modules/settings/model.py
+1 -1
View File
@@ -1,7 +1,7 @@
from application import db
class Setting(db.Model):
"""General brender settings
"""General flamenco settings
At the moment the structure of this table is very generic. This could
even be turned into a config file later on.
flamenco/server/application/modules/tasks/model.py
+1 -1
View File
@@ -9,7 +9,7 @@ class Task(db.Model):
* Check out SVN revision 1954
* Clean the /tmp folder
* Render frames 1 to 5 of scene_1.blend
* Send email with results to user@brender-farm.org
* Send email with results to user@flamenco-farm.org
"""
id = db.Column(db.Integer, primary_key=True)
job_id = db.Column(db.Integer, db.ForeignKey('job.id'))
flamenco/server/application/utils.py
+3 -3
View File
@@ -73,7 +73,7 @@ def frame_percentage(item):
# Create the required databases during installation.
# Based on the classes specified above. This function is embedded in
# the install_brender function.
# the install_flamenco function.
# """
# Workers.create_table()
# Shows.create_table()
@@ -106,7 +106,7 @@ def frame_percentage(item):
# Checks if the database exists
# We check for the existence of the file on disc. If the file is not
# found we create one and we populate it with the brender schema from
# found we create one and we populate it with the flamenco schema from
# this file.
# """
@@ -115,7 +115,7 @@ def frame_percentage(item):
# # connect to database found in DATABASE
# db.init(DATABASE)
# except IOError:
# print('[Info] Creating brender.sqlite database')
# print('[Info] Creating server.sqlite database')
# open(DATABASE, 'a').close()
# # before creating tables we should connect to it
# db.init(DATABASE)
flamenco/server/tests.py
+5 -5
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
Welcome to the brender test suite. Simply run python test.py and check
Welcome to the flamenco test suite. Simply run python test.py and check
that all tests pass.
Individual tests can be run with the following syntax:
@@ -109,13 +109,13 @@ class ServerTestCase(unittest.TestCase):
def test_settings_create(self):
cr = self.app.post('/settings',
data=dict(
blender_path_linux='/home/brender/blender',
render_settings_path_linux='/home/brender/render'))
blender_path_linux='/home/flamenco/blender',
render_settings_path_linux='/home/flamenco/render'))
assert cr.status_code == 204
ed = self.app.get('/settings')
settings = json.loads(ed.data)
assert settings['blender_path_linux'] == '/home/brender/blender'
assert settings['render_settings_path_linux'] == '/home/brender/render'
assert settings['blender_path_linux'] == '/home/flamenco/blender'
assert settings['render_settings_path_linux'] == '/home/flamenco/render'
def test_job_create(self):
project_id = self.utils.add_project(is_active=True)