Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
3fb34ab
changed navigation to tabs
Jul 27, 2016
46837d1
added container
Jul 27, 2016
5a6a1ea
removed pills styles
Jul 27, 2016
80d576c
removed merging
Jul 27, 2016
998f0d1
removed container
Jul 27, 2016
86737b8
added container
Jul 27, 2016
4baa2d7
removed old header
Jul 27, 2016
f0b0742
removed old navigation
Jul 27, 2016
83056e9
moved and updated navigation
Jul 27, 2016
3445f45
new header and styles
Jul 27, 2016
56ef56a
changed api name title
Jul 27, 2016
1d4d155
fixed tab name jump
Jul 27, 2016
1cf8662
removed icons from panel heading; changed buttons; cleaned up
Jul 28, 2016
9a079c2
initial settings panels
Jul 28, 2016
9e3a22d
last panel margin fix
Jul 28, 2016
0e7f0f7
initial overridings for settings panels
Jul 28, 2016
20e6643
moved font
Jul 28, 2016
838cee5
pass apiBackend
Jul 28, 2016
182b16c
delete event moved
Jul 28, 2016
fcfc711
moved buttons to settings tab
Jul 28, 2016
5ec2d24
changed color
Jul 28, 2016
d483172
margin for section
Jul 28, 2016
9122c55
moved fields for settings
Jul 28, 2016
1b5e29e
moved logo section
Jul 28, 2016
1e98ae2
removed moved code
Jul 28, 2016
53ba974
added meta details block
Jul 28, 2016
15d18a9
more styles
Jul 29, 2016
26dc713
updated logo
Jul 29, 2016
826a38a
added bookmarks and stars
Jul 29, 2016
d2e1f3f
added hr; changed texts
Jul 29, 2016
3d7993f
removed rating; removed add date
Jul 29, 2016
3cd0f3c
renamed clas
Jul 29, 2016
484d3d2
cleaned up instructions
Jul 29, 2016
6bf14c3
initial details redesign
Jul 29, 2016
65e987b
changed bookmark style
Aug 1, 2016
0ee623a
added star button
Aug 1, 2016
1a2e286
updated boomark view block
Aug 1, 2016
11c15b1
got back lost method
Aug 1, 2016
827c0bb
updated details tab
Aug 1, 2016
6e4b8e3
helper to hide/show description
Aug 1, 2016
fe26433
removed old heading
Aug 1, 2016
5728c85
different view for stars
Aug 1, 2016
1d640b7
fixed margin
Aug 2, 2016
3e49c65
removed unused file
Aug 2, 2016
e1d3c4d
cleaned up
Aug 2, 2016
e56dd37
tooltip message when copied
Aug 2, 2016
a0966ba
clean up
Aug 2, 2016
c413469
moved folder
Aug 2, 2016
53aaeef
cleaned up
Aug 2, 2016
665d437
i18n strings
Aug 2, 2016
4db74a2
permissions for settings tab
Aug 2, 2016
275b3ec
number of stars single page
Aug 2, 2016
7bba333
ems
Aug 2, 2016
b528637
temp fix for no bookmarks
Aug 2, 2016
efd36e0
one title style
Aug 3, 2016
965b86c
fixed counter position
Aug 3, 2016
912a414
content wrapper
Aug 3, 2016
c7d70c9
border fix
Aug 3, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions apis/client/add/wizard.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<template name="addApiBackendWizard">
<h1>
{{_ "addApiBackendWizard_heading" }}
</h1>
{{> wizard
id="add-api-backend-wizard"
route="addApiBackend-wizard"
steps=steps
buttonClasses="btn btn-default"
stepsTemplate="steps_bootstrap3"
clearOnDestroy=true
backButton=backButtonText
nextButton=nextButtonText
confirmButton=confirmButtonText
}}
<div class="container">
<h1 class="page-main-title">
{{_ "addApiBackendWizard_heading" }}
</h1>
{{> wizard
id="add-api-backend-wizard"
route="addApiBackend-wizard"
steps=steps
buttonClasses="btn btn-default"
stepsTemplate="steps_bootstrap3"
clearOnDestroy=true
backButton=backButtonText
nextButton=nextButtonText
confirmButton=confirmButtonText
}}
</div>
</template>
134 changes: 68 additions & 66 deletions apis/client/edit/form/editApiBackendForm.html
Original file line number Diff line number Diff line change
@@ -1,73 +1,75 @@
<template name="editApiBackendForm">
<div class="api-backends-content">
<h1>{{_ "apiBackends_Edit_API_Title"}}</h1>
{{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
{{>showHelp 'api_name'}}
{{> afQuickField name='name'}}
<span class="help-block">{{_ "apiBackends_Title_Help"}}</span>
{{> afQuickField name='description'}}
<legend>{{_ "editApiBackendForm-uploadLogo"}}</legend>
{{> uploadApiLogo apiBackend=apiBackend }}
<legend>{{_ "apiBackends_Backend_Title"}}</legend>
<span class="help-block">{{_ "apiBackends_Backend_Help"}}</span>
{{> afQuickField name='backend_protocol' options="allowed"}}
{{>showHelp 'servers'}}
{{> afQuickField name='servers'}}
<legend>{{_ "apiBackends_Host_Title"}}</legend>
<div class="row">
<div class="col-lg-4">
{{>showHelp 'frontend_host'}}
{{> afQuickField name='frontend_host'}}
<div class="container">
<div class="api-backends-content">
<h1>{{_ "apiBackends_Edit_API_Title"}}</h1>
{{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
{{>showHelp 'api_name'}}
{{> afQuickField name='name'}}
<span class="help-block">{{_ "apiBackends_Title_Help"}}</span>
{{> afQuickField name='description'}}
<legend>{{_ "editApiBackendForm-uploadLogo"}}</legend>
{{> uploadApiLogo apiBackend=apiBackend }}
<legend>{{_ "apiBackends_Backend_Title"}}</legend>
<span class="help-block">{{_ "apiBackends_Backend_Help"}}</span>
{{> afQuickField name='backend_protocol' options="allowed"}}
{{>showHelp 'servers'}}
{{> afQuickField name='servers'}}
<legend>{{_ "apiBackends_Host_Title"}}</legend>
<div class="row">
<div class="col-lg-4">
{{>showHelp 'frontend_host'}}
{{> afQuickField name='frontend_host'}}
</div>
<div class="col-lg-4 arrow">
<i class="fa fa-arrow-right fa-2x"></i>
<div>{{_ "apiBackends_HostRewrite"}}</div>
</div>
<div class="col-lg-4">
{{>showHelp 'backend_host'}}
{{> afQuickField name='backend_host'}}
</div>
</div>
<div class="col-lg-4 arrow">
<i class="fa fa-arrow-right fa-2x"></i>
<div>{{_ "apiBackends_HostRewrite"}}</div>
<legend>{{_ "apiBackends_Matching_Title"}}</legend>
<span class="help-block">{{_ "apiBackends_Matching_Title_Help"}}</span>
{{>showHelp 'url_matches'}}
{{> afQuickField name='url_matches'}}
<legend data-toggle="collapse" data-target="#global-request-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_GlobalRequestSettings_Title"}}</legend>
<div id="global-request-block" class="collapse in">
{{>showHelp 'append_query_string'}}
{{> afQuickField name='append_query_string'}}
{{>showHelp 'set_headers'}}
{{> afQuickField name='set_headers'}}
{{>showHelp 'http_basic_auth'}}
{{> afQuickField name='http_basic_auth'}}
{{>showHelp 'require_https'}}
{{> afQuickField name='require_https' options="allowed"}}
{{>showHelp 'api_key_verification_level'}}
{{> afQuickField name='api_key_verification_level' options="allowed"}}
{{> afQuickField name='required_roles'}}
{{> afQuickField name='pass_api_key_header'}}
{{> afQuickField name='pass_api_key_query_param'}}
{{> afQuickField name='rate_limit_mode' options="allowed"}}
{{#if afFieldValueIs name='rate_limit_mode' value="Custom rate limits"}}
{{> afQuickField name='custom_rate_limits'}}
{{/if}}
{{>showHelp 'settings'}}
{{> afQuickField name='settings'}}
</div>
<div class="col-lg-4">
{{>showHelp 'backend_host'}}
{{> afQuickField name='backend_host'}}
<legend data-toggle="collapse" data-target="#advanced-rewriting-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_AdvancedRequestsRewriting"}}</legend>
<div id="advanced-rewriting-block" class="collapse in">
<span class="help-block">{{_ "apiBackends_AdvancedRequestsRewriting_Help"}}</span>
{{> afQuickField name='rewrite'}}
</div>
<legend data-toggle="collapse" data-target="#advanced-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_AdvancedSettings"}}</legend>
<div id="advanced-block" class="collapse in">
{{>showHelp 'balance_algorithm'}}
{{> afQuickField name='balance_algorithm' options="allowed"}}
{{> afQuickField name='error_templates'}}
</div>
<div id="form-buttons">
<button type="submit" class="btn btn-lg btn-success" id="add-apibackends">{{_ "apiBackends_Submit"}}</button>
</div>
{{/autoForm}}
</div>
<legend>{{_ "apiBackends_Matching_Title"}}</legend>
<span class="help-block">{{_ "apiBackends_Matching_Title_Help"}}</span>
{{>showHelp 'url_matches'}}
{{> afQuickField name='url_matches'}}
<legend data-toggle="collapse" data-target="#global-request-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_GlobalRequestSettings_Title"}}</legend>
<div id="global-request-block" class="collapse in">
{{>showHelp 'append_query_string'}}
{{> afQuickField name='append_query_string'}}
{{>showHelp 'set_headers'}}
{{> afQuickField name='set_headers'}}
{{>showHelp 'http_basic_auth'}}
{{> afQuickField name='http_basic_auth'}}
{{>showHelp 'require_https'}}
{{> afQuickField name='require_https' options="allowed"}}
{{>showHelp 'api_key_verification_level'}}
{{> afQuickField name='api_key_verification_level' options="allowed"}}
{{> afQuickField name='required_roles'}}
{{> afQuickField name='pass_api_key_header'}}
{{> afQuickField name='pass_api_key_query_param'}}
{{> afQuickField name='rate_limit_mode' options="allowed"}}
{{#if afFieldValueIs name='rate_limit_mode' value="Custom rate limits"}}
{{> afQuickField name='custom_rate_limits'}}
{{/if}}
{{>showHelp 'settings'}}
{{> afQuickField name='settings'}}
</div>
<legend data-toggle="collapse" data-target="#advanced-rewriting-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_AdvancedRequestsRewriting"}}</legend>
<div id="advanced-rewriting-block" class="collapse in">
<span class="help-block">{{_ "apiBackends_AdvancedRequestsRewriting_Help"}}</span>
{{> afQuickField name='rewrite'}}
</div>
<legend data-toggle="collapse" data-target="#advanced-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_AdvancedSettings"}}</legend>
<div id="advanced-block" class="collapse in">
{{>showHelp 'balance_algorithm'}}
{{> afQuickField name='balance_algorithm' options="allowed"}}
{{> afQuickField name='error_templates'}}
</div>
<div id="form-buttons">
<button type="submit" class="btn btn-lg btn-success" id="add-apibackends">{{_ "apiBackends_Submit"}}</button>
</div>
{{/autoForm}}
</div>
</template>
1 change: 0 additions & 1 deletion apis/client/export/export.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">
<i class="fa fa-cloud-download"></i>
{{_ "view_ApiBackend_Export_Title"}}
</h2>
</div>
Expand Down
152 changes: 77 additions & 75 deletions apis/client/manage/manage.html
Original file line number Diff line number Diff line change
@@ -1,84 +1,86 @@
<template name='manageApiBackends'>
<h1 class="page-heading">{{_ "manage_ApiBackends_Title"}}</h1>
{{# each managedApis }}
<div class="panel panel-default managed-apis">
<div class="panel-heading">
<h2 class="panel-title">
{{ name }}
<div class="btn-group pull-right">
<a
href="{{ pathFor route='viewApiBackend' }}"
class="btn btn-success">
{{_ "manage_ApiBackends_View"}}
</a>
<a
href="{{ pathFor route='editApiBackend' }}"
class="btn btn-warning">
{{_ "manage_ApiBackends_Edit"}}
</a>
<a
href="#"
class="btn btn-danger"
id="deleteModal">
{{_ "manageApiBackends_deleteButton"}}
</a>
</div>
<div class="clearfix"></div>
</h2>
</div>
<div class="panel-body">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<div class="container">
<h1 class="page-main-title">{{_ "manage_ApiBackends_Title"}}</h1>
{{# each managedApis }}
<div class="panel panel-default managed-apis">
<div class="panel-heading">
<h2 class="panel-title">
{{ name }}
<div class="btn-group pull-right">
<a
data-toggle="collapse"
data-target="#api-id-{{ _id }}-backend"
class="api-panel-title">
<h3 class="panel-title">
{{ backend_host }} ({{ backend_protocol }})
</h3>
href="{{ pathFor route='viewApiBackend' }}"
class="btn btn-success">
{{_ "manage_ApiBackends_View"}}
</a>
<a
href="{{ pathFor route='editApiBackend' }}"
class="btn btn-warning">
{{_ "manage_ApiBackends_Edit"}}
</a>
</div><!-- /.panel-heading -->
<div id="api-id-{{ _id }}-backend" class="panel-body collapse">
<h4>Servers</h4>
<ul class="list-group">
{{# each servers }}
<li class="list-group-item">{{ host }} : {{ port }}</li>
{{/ each }}
</ul>
</div><!-- /.panel-body -->
</div><!-- /.panel -->
</div>
<div class="col-md-4 arrow text-center">
<i class="fa fa-arrow-right fa-2x"></i>
<span>{{_ "manage_ApiBackends_Rewrite"}}</span>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<a
data-toggle="collapse"
data-target="#api-id-{{ _id }}-frontend"
class="api-panel-title">
<h3 class="panel-title">
{{ frontend_host }}
</h3>
href="#"
class="btn btn-danger"
id="deleteModal">
{{_ "manageApiBackends_deleteButton"}}
</a>
</div><!-- /.panel-heading -->
<div id="api-id-{{ _id }}-frontend" class="panel-body collapse">
<h4>{{_ "manage_ApiBackends_Matches"}}</h4>
<ul class="list-group">
{{# each url_matches }}
<li class="list-group-item">
<span>{{_ "manage_ApiBackends_Backend"}} {{ backend_prefix }}</span><br />
<span>{{_ "manage_ApiBackends_Frontend"}} {{ frontend_prefix }}</span>
</li>
{{/ each }}
</ul>
</div><!-- /.panel-body -->
</div><!-- /.panel -->
</div>
<div class="clearfix"></div>
</h2>
</div>
<div class="panel-body">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<a
data-toggle="collapse"
data-target="#api-id-{{ _id }}-backend"
class="api-panel-title">
<h3 class="panel-title">
{{ backend_host }} ({{ backend_protocol }})
</h3>
</a>
</div><!-- /.panel-heading -->
<div id="api-id-{{ _id }}-backend" class="panel-body collapse">
<h4>Servers</h4>
<ul class="list-group">
{{# each servers }}
<li class="list-group-item">{{ host }} : {{ port }}</li>
{{/ each }}
</ul>
</div><!-- /.panel-body -->
</div><!-- /.panel -->
</div>
<div class="col-md-4 arrow text-center">
<i class="fa fa-arrow-right fa-2x"></i>
<span>{{_ "manage_ApiBackends_Rewrite"}}</span>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<a
data-toggle="collapse"
data-target="#api-id-{{ _id }}-frontend"
class="api-panel-title">
<h3 class="panel-title">
{{ frontend_host }}
</h3>
</a>
</div><!-- /.panel-heading -->
<div id="api-id-{{ _id }}-frontend" class="panel-body collapse">
<h4>{{_ "manage_ApiBackends_Matches"}}</h4>
<ul class="list-group">
{{# each url_matches }}
<li class="list-group-item">
<span>{{_ "manage_ApiBackends_Backend"}} {{ backend_prefix }}</span><br />
<span>{{_ "manage_ApiBackends_Frontend"}} {{ frontend_prefix }}</span>
</li>
{{/ each }}
</ul>
</div><!-- /.panel-body -->
</div><!-- /.panel -->
</div>
</div>
</div>
{{/ each }}
</div>
{{/ each }}
</template>
3 changes: 1 addition & 2 deletions apis/client/view/backlog/backlog.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="panel-heading">
{{#if currentUserCanEditBacklog }}
<button type="button"
class="btn btn-info btn-sm pull-right"
class="btn btn-info btn-xs pull-right"
data-toggle="modal"
data-target="#apiBacklogFormModal"
data-backdrop="static"
Expand All @@ -13,7 +13,6 @@
</button>
{{/if}}
<h2 class="panel-title clearfix">
<i class="fa fa-check-square-o"></i>
{{_ "apiBacklog_mainTitle"}}
</h2>
</div>
Expand Down
Loading