Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Boxiang Sun
slapos.toolbox
Commits
ea7bd536
Commit
ea7bd536
authored
Mar 02, 2012
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Webrunner: Update typography
parent
f6f2435f
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
48 additions
and
61 deletions
+48
-61
slapos/runner/static/css/styles.css
slapos/runner/static/css/styles.css
+1
-0
slapos/runner/static/images/menu_dropdown.png
slapos/runner/static/images/menu_dropdown.png
+0
-0
slapos/runner/static/js/scripts/repo.js
slapos/runner/static/js/scripts/repo.js
+27
-43
slapos/runner/templates/cloneRepository.html
slapos/runner/templates/cloneRepository.html
+2
-2
slapos/runner/templates/index.html
slapos/runner/templates/index.html
+4
-4
slapos/runner/templates/manageProject.html
slapos/runner/templates/manageProject.html
+2
-6
slapos/runner/templates/softwareFolder.html
slapos/runner/templates/softwareFolder.html
+4
-2
slapos/runner/templates/updateInstanceProfile.html
slapos/runner/templates/updateInstanceProfile.html
+4
-2
slapos/runner/templates/updateSoftwareProfile.html
slapos/runner/templates/updateSoftwareProfile.html
+4
-2
No files found.
slapos/runner/static/css/styles.css
View file @
ea7bd536
...
...
@@ -638,6 +638,7 @@ a.lshare img{
width
:
30px
;
height
:
22px
;
}
.list
{
background
:
url(../images/menu_dropdown.png)
left
center
no-repeat
;
padding-left
:
10px
;}
.alert_message
{
background
:
url(../images/alert.png)
center
no-repeat
;
height
:
26px
;}
.error_message
{
background
:
url(../images/exit.png)
center
no-repeat
;
height
:
26px
;}
...
...
slapos/runner/static/images/menu_dropdown.png
View replaced file @
f6f2435f
View file @
ea7bd536
221 Bytes
|
W:
|
H:
214 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
slapos/runner/static/js/scripts/repo.js
View file @
ea7bd536
...
...
@@ -27,51 +27,11 @@ $(document).ready( function() {
});
});
$
(
"
#addbranch
"
).
click
(
function
(){
if
(
$
(
"
input#branchname
"
).
val
()
==
""
||
$
(
"
input#branchname
"
).
val
()
==
"
Enter the branch name...
"
){
$
(
"
#error
"
).
Popup
(
"
Please Enter the new branch name
"
,
{
type
:
'
alert
'
,
duration
:
3000
});
return
false
;
}
var
project
=
$
(
"
#project
"
).
val
();
var
branch
=
$
(
"
input#branchname
"
).
val
();
$
.
ajax
({
type
:
"
POST
"
,
url
:
$SCRIPT_ROOT
+
'
/newBranch
'
,
data
:
{
project
:
$
(
"
input#workdir
"
).
val
()
+
"
/
"
+
project
,
name
:
branch
,
create
:
'
1
'
},
success
:
function
(
data
){
if
(
data
.
code
==
1
){
$
(
"
input#branchname
"
).
val
(
"
Enter the branch name...
"
);
gitStatus
();
}
else
{
$
(
"
#error
"
).
Popup
(
data
.
result
,
{
type
:
'
error
'
});
}
}
});
checkout
(
"
1
"
);
return
false
;
});
$
(
"
#docheckout
"
).
click
(
function
(){
if
(
$
(
"
input#checkout
"
).
val
()
==
""
||
$
(
"
input#checkout
"
).
val
()
==
"
Existing branch name...
"
){
$
(
"
#error
"
).
Popup
(
"
Please Enter your branch name
"
,
{
type
:
'
alert
'
,
duration
:
3000
});
return
false
;
}
var
project
=
$
(
"
#project
"
).
val
();
var
branch
=
$
(
"
input#checkout
"
).
val
();
$
.
ajax
({
type
:
"
POST
"
,
url
:
$SCRIPT_ROOT
+
'
/newBranch
'
,
data
:
{
project
:
$
(
"
input#workdir
"
).
val
()
+
"
/
"
+
project
,
name
:
branch
,
create
:
'
0
'
},
success
:
function
(
data
){
if
(
data
.
code
==
1
){
$
(
"
input#checkout
"
).
val
(
"
Existing branch name...
"
);
gitStatus
();
}
else
{
$
(
"
#error
"
).
Popup
(
data
.
result
,
{
type
:
'
error
'
});
}
}
});
checkout
(
"
0
"
);
return
false
;
});
$
(
"
#commit
"
).
click
(
function
(){
...
...
@@ -102,7 +62,7 @@ $(document).ready( function() {
gitStatus
();
}
else
{
$
(
"
#error
"
).
Popup
(
data
.
result
,
{
type
:
'
error
'
,
duration
:
5000
});
$
(
"
#error
"
).
Popup
(
data
.
result
,
{
type
:
'
error
'
});
}
$
(
"
#imgwaitting
"
).
hide
()
$
(
"
#commit
"
).
empty
();
...
...
@@ -185,6 +145,30 @@ $(document).ready( function() {
}
});
}
function
checkout
(
mode
){
if
(
$
(
"
input#branchname
"
).
val
()
==
""
||
$
(
"
input#branchname
"
).
val
()
==
"
Enter the branch name...
"
){
$
(
"
#error
"
).
Popup
(
"
Please Enter the branch name
"
,
{
type
:
'
alert
'
,
duration
:
3000
});
return
false
;
}
var
project
=
$
(
"
#project
"
).
val
();
var
branch
=
$
(
"
input#branchname
"
).
val
();
$
.
ajax
({
type
:
"
POST
"
,
url
:
$SCRIPT_ROOT
+
'
/newBranch
'
,
data
:
{
project
:
$
(
"
input#workdir
"
).
val
()
+
"
/
"
+
project
,
name
:
branch
,
create
:
mode
},
success
:
function
(
data
){
if
(
data
.
code
==
1
){
$
(
"
input#branchname
"
).
val
(
"
Enter the branch name...
"
);
gitStatus
();
}
else
{
$
(
"
#error
"
).
Popup
(
data
.
result
,
{
type
:
'
error
'
});
}
}
});
return
false
;
}
function
loadBranch
(
branch
){
$
(
"
#activebranch
"
).
empty
();
for
(
i
=
0
;
i
<
branch
.
length
;
i
++
){
...
...
slapos/runner/templates/cloneRepository.html
View file @
ea7bd536
...
...
@@ -28,8 +28,8 @@
<div
style=
"background:#fff; padding:10px; min-height:100px; font-size:14px;"
>
<div
id=
"box0"
>
<h2>
Clone Repository without using HTTPS and SSH
</h2><br/>
<p>
Choose this mode if you have login and password for the repository and you if you don't have the possibility to
use SSH authentication. Otherwise use your public key or your login and password to clone your project. Note
<p>
Choose this mode if you
don't
have login and password for the repository and you if you don't have the possibility to
use SSH authentication. Otherwise use your public key or your login and password to clone your project
by choosing https or ssh mode
. Note
that, with readonly mode you can not be able to push your changes.
</p>
<br/>
</div>
...
...
slapos/runner/templates/index.html
View file @
ea7bd536
...
...
@@ -4,16 +4,16 @@
<div
id=
"home_box"
>
<div
class=
"inner_box"
>
<div
class=
"lmenu"
>
<h2><a
href=
"{{ url_for('configRepo')}}"
>
Clone a
n
Repository into your local Workspace
</a></h2>
<h2><a
href=
"{{ url_for('configRepo')}}"
>
Clone a Repository into your local Workspace
</a></h2>
<p>
Your repository will be cloned into your project folder, you will need the url of the repository.
This allows you to open and edit your local project copy and synchonize content with online repository.
This allows you to open and edit your local project copy and synch
r
onize content with online repository.
</p>
<img
src=
"{{ url_for('static', filename='images/folder_html.png') }}"
/>
<div
class=
"clear"
></div>
</div>
<div
class=
"smenu"
>
<h2><a
href=
"{{ url_for('openProject', method='open')}}"
>
Open Software Release
</a></h2>
<p>
Once you have cloned your repository, you can now edi
t existing Software Release.
</p>
<p>
If you have cloned your repository, you can now edit and tes
t existing Software Release.
</p>
<img
src=
"{{ url_for('static', filename='images/mydocuments.png') }}"
/>
<div
class=
"clear"
></div>
</div>
...
...
@@ -26,7 +26,7 @@
<div
class=
"lmenu"
>
<h2><a
href=
"{{ url_for('openProject', method='new')}}"
>
Create your new Software Release
</a></h2>
<p>
To create a new Software Release, choose the project directory in which you want to create your software. You will then be able to edit and
run the new software release
on SlapOS using slapgrid
.
run the new software release.
</p>
<img
src=
"{{ url_for('static', filename='images/folder_blue.png') }}"
/>
<div
class=
"clear"
></div>
...
...
slapos/runner/templates/manageProject.html
View file @
ea7bd536
...
...
@@ -32,12 +32,8 @@
</select>
<label
for=
'branchname'
>
Branch Name:
</label>
<input
type=
"text"
name=
"branchname"
id=
"branchname"
size=
'22'
value=
"Enter the branch name..."
/>
<input
type=
"submit"
name=
"addbranch"
id =
"addbranch"
value=
"Add"
class=
"button"
/>
<div
style=
"margin-left:166px;"
>
<label
for=
'checkout'
>
Checkout existing branch:
</label>
<input
type=
"text"
name=
"checkout"
id=
"checkout"
size=
'22'
value=
"Existing branch name..."
/>
<input
type=
"submit"
name=
"docheckout"
id =
"docheckout"
value=
"Checkout"
class=
"button"
/>
</div>
<input
type=
"submit"
name=
"addbranch"
id =
"addbranch"
value=
"Add"
class=
"button"
title=
'add new branch: git checkout -b branch'
/>
<input
type=
"submit"
name=
"docheckout"
id =
"docheckout"
value=
"Checkout"
class=
"button"
title=
'add existing branch: git checkout branch'
/>
<br/>
<!--<label for='pullbranch'>Update your local repository: </label>-->
<!--<input type="submit" name="pullbranch" id ="pullbranch" value="Pull" class="button"/>-->
...
...
slapos/runner/templates/softwareFolder.html
View file @
ea7bd536
...
...
@@ -45,7 +45,7 @@
</pre>
</div>
<input
type=
submit
value=
Update
id=
"save"
class=
"button"
>
<input
type=
submit
value=
"Save"
id=
"save"
class=
"button"
>
</div>
</div>
...
...
@@ -59,8 +59,10 @@
</tr><tr>
<td
class=
"left"
></td>
<td><div
class=
"popup-contents"
>
<span
class=
"list"
>
MD5 SUM for the current file
</span>
<div
style=
"margin-top:3px; margin-bottom:5px;border-bottom: 1px dashed #666666; heigth:1px"
></div>
<a
id=
'getmd5'
href=
"#"
>
Get or Update md5sum
</a>
<br/>
Add Project to Develop
<br/>
<br/>
<span
class=
"list"
>
Add Project to Develop
</span>
<br/>
<div
style=
"margin-top:3px;border-bottom: 1px dashed #666666; heigth:1px"
></div>
<ul
id=
"plist"
>
{% for name in projectList%}
...
...
slapos/runner/templates/updateInstanceProfile.html
View file @
ea7bd536
...
...
@@ -19,7 +19,7 @@
<input
type=
"hidden"
name=
"workdir"
id=
"workdir"
value=
"{{workDir}}"
/>
</div>
</dd>
<dd><input
type=
submit
value=
Updat
e
id=
"save"
class=
"button"
></dd>
<dd><input
type=
submit
value=
Sav
e
id=
"save"
class=
"button"
></dd>
</dl>
</form>
<div
class=
"popup"
>
...
...
@@ -31,8 +31,10 @@
</tr><tr>
<td
class=
"left"
></td>
<td><div
class=
"popup-contents"
>
<span
class=
"list"
>
MD5 SUM for the current file
</span>
<div
style=
"margin-top:3px; margin-bottom:5px;border-bottom: 1px dashed #666666; heigth:1px"
></div>
<a
id=
'getmd5'
href=
"#"
>
Get or Update md5sum
</a>
<br/>
Add Project to Develop
<br/>
<br/>
<span
class=
"list"
>
Add Project to Develop
</span>
<br/>
<div
style=
"margin-top:3px;border-bottom: 1px dashed #666666; heigth:1px"
></div>
<ul
id=
"plist"
>
{% for name in projectList%}
...
...
slapos/runner/templates/updateSoftwareProfile.html
View file @
ea7bd536
...
...
@@ -19,7 +19,7 @@
<input
type=
"hidden"
name=
"profile"
id=
"profile"
value=
"{{ profile|safe }}"
/>
<input
type=
"hidden"
name=
"workdir"
id=
"workdir"
value=
"{{workDir}}"
/>
</dd>
<dd><input
type=
submit
value=
Updat
e
id=
"save"
class=
"button"
></dd>
<dd><input
type=
submit
value=
Sav
e
id=
"save"
class=
"button"
></dd>
</dl>
</form>
<div
class=
"popup"
>
...
...
@@ -31,8 +31,10 @@
</tr><tr>
<td
class=
"left"
></td>
<td><div
class=
"popup-contents"
>
<span
class=
"list"
>
MD5 SUM for the current file
</span>
<div
style=
"margin-top:3px; margin-bottom:5px;border-bottom: 1px dashed #666666; heigth:1px"
></div>
<a
id=
'getmd5'
href=
"#"
>
Get or Update md5sum
</a>
<br/>
Add Project to Develop
<br/>
<br/>
<span
class=
"list"
>
Add Project to Develop
</span>
<br/>
<div
style=
"margin-top:3px;border-bottom: 1px dashed #666666; heigth:1px"
></div>
<ul
id=
"plist"
>
{% for name in projectList%}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment