Skip to content

alligned #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wolf1o1 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

alligned #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00fb27f
now alligned
wolf1o1 Mar 29, 2012
e5ba2ad
now alligned
wolf1o1 Mar 29, 2012
155eafe
now alligned
wolf1o1 Mar 29, 2012
1ab5648
now alligned
wolf1o1 Mar 29, 2012
e5a1e5a
now alligned
wolf1o1 Mar 29, 2012
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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added resources/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added resources/public/.DS_Store
View file
Open in desktop
Binary file not shown.
27 changes: 27 additions & 0 deletions resources/public/NiCtest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[
{
"navn": "Grundpakke",
"pgt": "0",
"sortering": "10",
"varenr": "1101001",
"salgsstart": "2012-03-29",
"sorteringsgruppe": "TV-GA",
"vaegt": "10",
"pg": "GP",
"fo": "TV",
"pl": "1"
}
,
{
"navn": "Grundpakke",
"pgt": "0",
"sortering": "10",
"varenr": "1101001",
"salgsstart": "2012-03-29",
"sorteringsgruppe": "TV-GA",
"vaegt": "10",
"pg": "GP",
"fo": "TV",
"pl": "1"
}
]
11 changes: 11 additions & 0 deletions resources/public/NiCtest_simple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"navn": "Grundpakke",
"varenr": "1101001",
}
,
{
"navn": "Mellempakke",
"varenr": "1101002",
}
]
54 changes: 39 additions & 15 deletions resources/public/detaljer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,48 @@
<script type="text/javascript" src="javascripts/ppc.js"></script>
</head>
<body>

<!-- container -->
<div style="padding-top:10px;" class="container">
<div class="row">
<div class="six columns">
<p><label for="varenr">Varenummer:</label><input id="varenr" type="text" readonly="true" /></p>
<p><label for="navn">Navn:</label><input id="navn" type="text" /></p>
<p><label for="fo">Forretningsområde:</label><input id="fo" readonly="true" type="text" /></p>
<p><label for="pl">Produktlinie:</label><input id="pl" type="text" /></p>
<p><label for="vaegt">Vægt:</label><input id="vaegt" type="text" /></p>
</div>
<div class="six columns">
<p><label for="pgt">Produkt type:</label><input id="pgt" type="text" /></p>
<p><label for="pg">Produkt gruppe:</label><input id="pg" type="text" /></p>
<p><label for="sorteringsgruppe">Sorteringsgruppe:</label><input id="sorteringsgruppe" readonly="true" type="text" /></p>
<p><label for="sortering">Sortering:</label><input id="sortering" type="text" /></p>
<p><label for="salgsstart">Salgs start:</label><input id="salgsstart" type="text" /></p>
</div>

<div class="row">

<ul class="block-grid four-up">
<li><label for="varenr">Varenummer:</label></li>
<li><input id="varenr" readonly="true" /></li>

<li><label for="navn">Navn:</label></li>
<li><input id="navn" type="text" /></li>

<li><label for="fo">Forretningsområde:</label></li>
<li><input id="fo" readonly="true" /></li>

<li><label for="pl">Produktlinie:</label></li>
<li><input id="pl" type="text" /></li>

<li><label for="vaegt">Vægt:</label></li>
<li><input id="vaegt" readonly="true" /></li>

<li><label for="pgt">Produkt type:</label></li>
<li><input id="pgt" type="text" /></li>

<li><label for="pg">Produkt gruppe:</label></li>
<li><input id="pg" readonly="true" /></li>

<li><label for="sorteringsgruppe">Sorteringsgruppe:</label></li>
<li><input id="sorteringsgruppe" type="text" /></li>

<li><label for="sortering">Sortering:</label></li>
<li><input id="sortering" readonly="true" /></li>

<li><label for="salgsstart">Salgs start:</label></li>
<li><input id="salgsstart" type="text" /></li>


</ul>

</div>

<div class="row">
<div class="nine columns"></div>
<div class="three columns"><a href="#" id="opdater" class="nice blue button">Opdater</a></div>
Expand Down
Binary file added resources/public/graphix/bg_body.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<script type="text/javascript" src="javascripts/app.js"></script>
<script type="text/javascript" src="javascripts/ppc.js"></script>
<script type="text/javascript" src="javascripts/modernizr.foundation.js"></script>

</head>
<body>
<!-- container -->
Expand Down
Empty file modified resources/public/javascripts/jquery-ui-1.8.18.custom.min.js
100644 → 100755
View file
Open in desktop
Empty file.
28 changes: 28 additions & 0 deletions resources/public/javascripts/ppc2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

var prod = {
// init:function() {

NicTest:function() {
console.log("in function");
// $.get('../NiCtest_simple.json', function(d){console.log() ;});
// console.log("in function");

$.getJSON('../NiCtest_simple.json', function(data) {
console.log("in callback");
var items = [];

$.each(data, function(key, val) {
items.push('<tr><td>' + key + '">' + val + '</li>');
});

$('<ul/>', {
'class': 'my-new-list',
html: items.join('')
}).appendTo('body');
}


);
}

}
1 change: 1 addition & 0 deletions resources/public/stylesheets/yousee.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
body {background-image:url("http://yousee.dk/img/bg_body.png");}
Binary file added src/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added test/.DS_Store
View file
Open in desktop
Binary file not shown.
27 changes: 27 additions & 0 deletions test/NiCtest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[
{
"navn": "Grundpakke",
"pgt": "0",
"sortering": "10",
"varenr": "1101001",
"salgsstart": "2012-03-29",
"sorteringsgruppe": "TV-GA",
"vaegt": "10",
"pg": "GP",
"fo": "TV",
"pl": "1"
}
,
{
"navn": "Grundpakke",
"pgt": "0",
"sortering": "10",
"varenr": "1101001",
"salgsstart": "2012-03-29",
"sorteringsgruppe": "TV-GA",
"vaegt": "10",
"pg": "GP",
"fo": "TV",
"pl": "1"
}
]
11 changes: 11 additions & 0 deletions test/NiCtest_simple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"navn": "Grundpakke",
"varenr": "1101001",
}
,
{
"navn": "Mellempakke",
"varenr": "1101002",
}
]