Skip to content

Commit

Permalink
issue #7
Browse files Browse the repository at this point in the history
  • Loading branch information
rsoika committed Dec 29, 2015
1 parent 5c7e5a9 commit 2bf8c5a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 17 deletions.
13 changes: 11 additions & 2 deletions src/main/webapp/css/imixs.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,20 @@ body.loading .imixs-wait {
min-height: 600px;
}

#footer1, #footer2 {
#footer2 {
text-align: right;
margin-right: 2em;
}
#footer1{
text-align: left;
margin-right: 2em;
}

#footer1 a{
color: #428BCE;
}


/**********************************************
* IMIXS Styles
**********************************************/
Expand Down Expand Up @@ -182,7 +191,7 @@ dl dd input[type="text"],dl dd select, .imixs-form-section-2 dd input[type="pass

dd textarea {
width: 100%;
height: 5em;
height: 8em;
}

.imixs-form-section dd, .imixs-form-section-2 dd {
Expand Down
22 changes: 10 additions & 12 deletions src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@
<ul>
<li style="font-weight: bold;"><a href="./">Imixs-Admin</a></li>

<li><a href="http://blog.imixs.org" target="_blank">imixs.org</a></li>
<li><a href="http://www.imixs.org" target="_blank">imixs.org</a></li>
<li><a href="http://www.imixs.com" target="_blank">imixs.com</a></li>

<li><a href="http://blog.imixs.org" target="_blank">blog</a></li>

<li><a href="https://github.com/imixs/imixs-workflow"
target="_blank">github</a></li>


</ul>
Expand Down Expand Up @@ -66,7 +64,9 @@
<!-- END header -->

<div id="container">
<div data-ben-template="content"></div>
<form autocomplete="on">
<div data-ben-template="content"></div>
</form>
</div>


Expand All @@ -75,14 +75,12 @@
<!-- END container -->

<div id="footer">
<div id="footer1">
&#169; 2006-2014 Imixs Software Solutions GmbH | <a
href="mailto:[email protected]">Contact</a> | <a
href="http://www.imixs.com/?page_id=56">Impressum</a>
</div>
<div id="footer1">Version 4.0.0</div>
<div id="footer2">
Webdesign: <a href="http://www.creatix.org">www.creatix.org</a> |
fotos: © gordon bussiek | photocase.com

&#169; 2006-2014 <a href="http://www.imixs.com" target="_blank">Imixs
Software Solutions GmbH</a> | <a href="mailto:[email protected]">Contact</a>
| Webdesign: <a href="http://www.creatix.org">www.creatix.org</a>
</div>
</div>
<!-- END footer -->
Expand Down Expand Up @@ -118,7 +116,7 @@
$body.removeClass("loading");
}
});

adminclient.start();

});
Expand Down
7 changes: 6 additions & 1 deletion src/main/webapp/js/imixs-admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,12 @@ IMIXS.org.imixs.workflow.adminclient = (function() {
+ "'...");

var url = restServiceController.model.baseURL;
url = url + "/entity/entitiesbyquery/" + worklistController.model.query;
var query = worklistController.model.query;
// replace new lines..
query = query.replace(/(\r\n|\n|\r)/gm, " ");


url = url + "/entity/entitiesbyquery/" + query;
url = url + "?start=" + worklistController.model.start + "&count="
+ worklistController.model.count;

Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/view_restservice.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h1>Rest Service</h1>
<dt>URL:</dt>
<dd>
<input type="text" placeholder="Enter Rest Service Base Address"
data-ben-model="baseURL" />
data-ben-model="baseURL" autocomplete="on"/>
</dd>


Expand All @@ -14,7 +14,7 @@ <h1>Rest Service</h1>


<input type="button" value="Connect" onclick="adminclient.restServiceController.connect()"
class="btn" />
class="btn" />


</div>
Expand Down

0 comments on commit 2bf8c5a

Please sign in to comment.