Skip to content

Commit

Permalink
继续完善 Build 页面
Browse files Browse the repository at this point in the history
  • Loading branch information
@leenjewel
leenjewel committed Sep 16, 2015
1 parent 0cbfc3f commit e984dde
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 5 deletions.
2 changes: 2 additions & 0 deletions apk.builder/pyMySDKWebFrontEnd/module/ui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def render(self, entry, **kwargs) :
kwargs["show_add"] = False
if not kwargs.has_key("has_add") :
kwargs["has_add"] = False
if not kwargs.has_key("is_build") :
kwargs["is_build"] = False
if not kwargs.has_key("meta_data") :
kwargs["meta_data"] = {}
return AUIModule.render(self, entry, **kwargs)
Expand Down
56 changes: 51 additions & 5 deletions apk.builder/pyMySDKWebFrontEnd/templates/project.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,29 @@ <h3 class="panel-title">{{ project_name }} <span class="badge">{{ workspa
{% end %}
<div class="form-group">
<label for="projectName">Project Name:</label>
{% if is_build_project %}
<input type="text" class="form-control" name="project_name" id="project-name" placeholder="Project Name" value="{{ workspace_project.context['project_name'] }}" readonly />
{% else %}
<input type="text" class="form-control" name="project_name" id="project-name" placeholder="Project Name" value="{{ workspace_project.context['project_name'] }}" />
{% end %}
</div>
<div class="form-group">
<label for="projectDesc">Description:</label>
{% if is_build_project %}
<textarea class="form-control" name="project_desc" id="project-desc" readonly>
{% else %}
<textarea class="form-control" name="project_desc" id="project-desc">
{% end %}
{{ workspace_project.context['project_desc'] }}
</textarea>
</div>
<div class="form-group">
<label for="androidPlatform">Android Platform:</label>
{% if is_build_project %}
<select class="form-control" name="new_project_platform" disabled>
{% else %}
<select class="form-control" name="new_project_platform">
{% end %}
{% for android_platform in workspace_project.context["android_platform_list"] %}
{% if android_platform == workspace_project.context.get("android_platform") %}
<option selected="true" value="{{ android_platform }}">{{ android_platform }}</option>
Expand Down Expand Up @@ -64,6 +76,7 @@ <h4 class="label label-info form-control">{{ workspace_project.context["keystore
<input type="file" class="form-control" name="new_project_keystore" id="new-project-keystore" placeholder="Keystore File" />
{% end %}
</div>
{% if not is_build_project %}
<div class="form-group">
<label for="storepass">Store Password:</label>
<input type="password" class="form-control" name="new_project_storepass" id="new-project-storepass" placeholder="Store password" value="{{ workspace_project.context.get('storepass','') }}" />
Expand All @@ -76,37 +89,61 @@ <h4 class="label label-info form-control">{{ workspace_project.context["keystore
<label for="keypass">Key Password:</label>
<input type="password" class="form-control" name="new_project_keypass" id="new-project-keypass" placeholder="Key password" value="{{ workspace_project.context.get('keypass', '') }}" />
</div>
{% end %}
<div class="container">
<div class="row">
{% for sdk_id, sdk_config in workspace_sdks.items() %}
<div class="col-md-4">
{% if sdk_id in workspace_project.context.get("sdk_id_list", []) %}
{% module SDKConfigEntry(sdk_config, show_add = (not is_build_project), has_add = True, meta_data = workspace_project.context.get("meta_data", {})) %}
{% module SDKConfigEntry(sdk_config, show_add = (not is_build_project), has_add = True, meta_data = workspace_project.context.get("meta_data", {}), is_build = is_build_project) %}
{% else %}
{% module SDKConfigEntry(sdk_config, show_add = (not is_build_project), meta_data = workspace_project.context.get("meta_data", {})) %}
{% module SDKConfigEntry(sdk_config, show_add = (not is_build_project), meta_data = workspace_project.context.get("meta_data", {}), is_build = is_build_project) %}
{% end %}
</div>
{% end %}
</div>
</div>
<div class="form-group">
{% if is_build_project %}
<div class="btn btn-primary btn-lg" onclick="mysdkBuildProject()">
<span class="glyphicon glyphicon-fire"></span>
<span class="btn-text">Build Project</span>
</div>
{% else %}
{% if is_create_project %}
<div class="btn btn-primary btn-lg" onclick="mysdkProject()">
<div class="btn btn-primary btn-lg" onclick="mysdkUpdateProject()">
<span class="glyphicon glyphicon-floppy-save"></span>
<span class="btn-text">Create Project</span>
</div>
{% else %}
<div class="btn btn-primary btn-lg" onclick="mysdkProject()">
<div class="btn btn-primary btn-lg" onclick="mysdkUpdateProject()">
<span class="glyphicon glyphicon-floppy-save"></span>
<span class="btn-text">Save Project</span>
</div>
{% end %}
{% end %}
</div>
</form>
</div>
</div>
<!-- Build Modal Begin -->
<div class="modal fade" id="mysdk-build-modal" tabindex="-1" role="dialog" aria-labelledby="mysdk-build-modal-label">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="mysdk-build-modal-label">Build Project</h4>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary btn-lg" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<!-- Build Modal End -->
<script type="text/javascript">
function mysdkProject() {
function mysdkUpdateProject() {
var projectForm = $("#mysdk-project-form");
projectForm.find("#mysdk-sdk-config-list").remove();
var sdkConfigInput = $('<div></div>');
Expand All @@ -124,6 +161,12 @@ <h4 class="label label-info form-control">{{ workspace_project.context["keystore
projectForm.submit();
}

function mysdkBuildProject() {
$("#mysdk-build-modal").modal({
backdrop : "static"
});
}

$(function(){
$(".mysdk-sdk-config").each(function(i, e){
$(e).find(".btn-add-sdk").bind("click", {sdkConfigDiv : $(e)}, function(evt){
Expand All @@ -144,5 +187,8 @@ <h4 class="label label-info form-control">{{ workspace_project.context["keystore
}
});
});
$("#mysdk-build-modal").on("shown.bs.modal", function(e){
console.dir(e);
});
});
</script>
4 changes: 4 additions & 0 deletions apk.builder/pyMySDKWebFrontEnd/templates/ui/sdkconfigentry.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ <h4 class="label label-default">Meta Data:</h4><br/><br/>
<div class="form-group">
<label for="metadata{{ meta_key }}" class="col-sm-6 control-label">{{ meta_key }}</label>
<div class="col-sm-6">
{% if is_build %}
<input type="text" class="mysdk-sdk-config-input form-control" name="sdk_config[{{ entry.get_config('id') }}][metadata][{{ meta_key }}]" value="{{ meta_data.get(meta_key, meta_conf.get('default','')) }}" disabled />
{% else %}
<input type="text" class="mysdk-sdk-config-input form-control" name="sdk_config[{{ entry.get_config('id') }}][metadata][{{ meta_key }}]" value="{{ meta_data.get(meta_key, meta_conf.get('default','')) }}" />
{% end %}
{% if meta_conf.get("require", False) %}
<span class="label label-danger">require!</span>
{% end %}
Expand Down

0 comments on commit e984dde

Please sign in to comment.