New REM client: REM-Client 81cf26a, 64-bit (base manager: CONTRACTS - item exchanges and courier contracts with bundles from all depots)
This commit is contained in:
Binary file not shown.
@@ -103,6 +103,18 @@
|
|||||||
.note.warn { color: #f2b13c; border-left-color: #f2b13c; }
|
.note.warn { color: #f2b13c; border-left-color: #f2b13c; }
|
||||||
.coins { font-size: 12dp; color: #8197ad; margin-top: 6dp; }
|
.coins { font-size: 12dp; color: #8197ad; margin-top: 6dp; }
|
||||||
.stats .v.txt { font-family: "Saira SemiCondensed"; font-size: 15dp; white-space: nowrap; overflow: hidden; }
|
.stats .v.txt { font-family: "Saira SemiCondensed"; font-size: 15dp; white-space: nowrap; overflow: hidden; }
|
||||||
|
/* CONTRACTS */
|
||||||
|
.row .ci { width: 26dp; height: 26dp; margin-right: 8dp; }
|
||||||
|
.row.con { align-items: center; }
|
||||||
|
.row.con .c1 .sub { font-size: 12dp; color: #8197ad; margin-top: 2dp; }
|
||||||
|
.con-head { display: flex; flex-direction: row; align-items: center; margin-bottom: 8dp; }
|
||||||
|
.con-head .hint { margin-left: auto; }
|
||||||
|
.con-head .btn { margin: 0 6dp 0 0; }
|
||||||
|
.con-form .namefield .label { width: 96dp; }
|
||||||
|
.con-form .namefield input.text { flex: 1; }
|
||||||
|
.chips { display: flex; flex-direction: row; flex-wrap: wrap; margin-bottom: 8dp; }
|
||||||
|
.chips .chip { margin: 0 6dp 6dp 0; }
|
||||||
|
.chips .chip.on { color: #f2b13c; border-color: #f2b13c; }
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body class="window">
|
<body class="window">
|
||||||
@@ -126,6 +138,7 @@
|
|||||||
<div class="item" data-class-active="page == 6" data-action="page" data-arg="6"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_construction.3db"/><span>System</span></div>
|
<div class="item" data-class-active="page == 6" data-action="page" data-arg="6"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_construction.3db"/><span>System</span></div>
|
||||||
<div class="item" data-class-active="page == 7" data-action="page" data-arg="7"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_ships.3db"/><span>Pilots</span><span class="badge" data-if="drones.size > 0">{{ drones.size }}</span></div>
|
<div class="item" data-class-active="page == 7" data-action="page" data-arg="7"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_ships.3db"/><span>Pilots</span><span class="badge" data-if="drones.size > 0">{{ drones.size }}</span></div>
|
||||||
<div class="item" data-class-active="page == 8" data-action="page" data-arg="8"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_cargo.3db"/><span>Couriers</span></div>
|
<div class="item" data-class-active="page == 8" data-action="page" data-arg="8"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_cargo.3db"/><span>Couriers</span></div>
|
||||||
|
<div class="item" data-class-active="page == 9" data-action="page" data-arg="9"><img class="ico" src="3db:INTERFACE/REM/IMAGES/icon_contracts.3db"/><span>Contracts</span><div class="tip">Trade bundles with other pilots - goods, equipment, ammunition and credits - or have them carried.</div></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" id="base-pages" data-model="base">
|
<div class="content" id="base-pages" data-model="base">
|
||||||
<div class="blocked" data-if="blocked != 0">
|
<div class="blocked" data-if="blocked != 0">
|
||||||
@@ -519,6 +532,125 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- ================================================= CONTRACTS -->
|
||||||
|
<div class="page col" data-if="blocked == 0 && page == 9">
|
||||||
|
<div class="subtabs">
|
||||||
|
<div class="tab" data-class-active="con_sub == 0" data-action="con-sub" data-arg="0">Browse</div>
|
||||||
|
<div class="tab" data-class-active="con_sub == 1" data-action="con-sub" data-arg="1">My contracts</div>
|
||||||
|
<div class="tab" data-class-active="con_sub == 2" data-action="con-sub" data-arg="2">Create</div>
|
||||||
|
</div>
|
||||||
|
<div class="page" data-if="con_sub != 2">
|
||||||
|
<div class="colm gap">
|
||||||
|
<div class="con-head">
|
||||||
|
<div class="btn" data-if="con_sub == 0" data-class-primary="con_kind_filter == 0" data-action="con-kind-filter" data-arg="0">All</div>
|
||||||
|
<div class="btn" data-if="con_sub == 0" data-class-primary="con_kind_filter == 1" data-action="con-kind-filter" data-arg="1">Item exchange</div>
|
||||||
|
<div class="btn" data-if="con_sub == 0" data-class-primary="con_kind_filter == 2" data-action="con-kind-filter" data-arg="2">Courier</div>
|
||||||
|
<span class="hint">{{ con_count }}</span>
|
||||||
|
</div>
|
||||||
|
<input class="text search" type="text" data-value="filter" maxlength="40"/>
|
||||||
|
<div class="table grow">
|
||||||
|
<div class="head"><span class="c1">Contract</span><span class="c2">Where</span><span class="c3" style="width: 110dp;">Price</span><span class="c3">{{ con_sub == 1 ? 'State' : 'Ends in' }}</span></div>
|
||||||
|
<div class="body">
|
||||||
|
<div class="empty" data-if="con_rows.size == 0">{{ con_empty }}</div>
|
||||||
|
<div class="row con" data-for="r : con_rows" data-class-selected="r.selected" data-action="con-pick" data-attr-data-arg="r.key">
|
||||||
|
<img class="ci" data-if="r.icon != ''" data-attr-src="r.icon"/><span class="c1">{{ r.a }}<div class="sub">{{ r.e }}</div></span><span class="c2">{{ r.b }}</span><span class="c3" style="width: 110dp;">{{ r.c }}</span><span class="c3">{{ r.d }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="colm side">
|
||||||
|
<div class="blocked" data-if="con_pick == ''">
|
||||||
|
<div class="t">Pick a contract</div>
|
||||||
|
<div class="hint">Its terms and its bundle show here.</div>
|
||||||
|
</div>
|
||||||
|
<div class="pane" data-if="con_pick != ''">
|
||||||
|
<div class="panel"><div class="t">{{ con_title }}</div><div class="hint">{{ con_kind_text }}</div></div>
|
||||||
|
<div class="note">{{ con_terms }}</div>
|
||||||
|
<div class="table grow">
|
||||||
|
<div class="head"><span class="c1">In the bundle</span><span class="c2">At</span><span class="c3">Amount</span></div>
|
||||||
|
<div class="body">
|
||||||
|
<div class="row con" data-for="r : con_items">
|
||||||
|
<img class="ci" data-if="r.icon != ''" data-attr-src="r.icon"/><span class="c1">{{ r.a }}</span><span class="c2">{{ r.b }}</span><span class="c3">{{ r.c }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="note warn" data-if="con_warn != ''">{{ con_warn }}</div>
|
||||||
|
<div class="actions">
|
||||||
|
<div class="btn primary" data-if="con_can_accept" data-action="con-accept">{{ con_accept_text }}</div>
|
||||||
|
<div class="btn primary" data-if="con_can_pickup" data-action="con-pickup">Pick up</div>
|
||||||
|
<div class="btn primary" data-if="con_can_deliver" data-action="con-deliver">Deliver</div>
|
||||||
|
<div class="btn" data-if="con_can_cancel" data-action="con-cancel">Withdraw<div class="tip">The items go back into your depots, the credits / the reward into your bank.</div></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="page" data-if="con_sub == 2">
|
||||||
|
<div class="colm gap">
|
||||||
|
<div class="col-h"><h3>Your depots</h3><span class="hint">pick items for the bundle</span></div>
|
||||||
|
<div class="chips">
|
||||||
|
<span class="chip" data-for="r : con_depots" data-class-on="r.selected" data-action="con-depot" data-attr-data-arg="r.key">{{ r.a }} ({{ r.c }})</span>
|
||||||
|
</div>
|
||||||
|
<input class="text search" type="text" data-value="filter" maxlength="40"/>
|
||||||
|
<div class="table grow">
|
||||||
|
<div class="head"><span class="c1">Item</span><span class="c2">Depot</span><span class="c3">Amount</span></div>
|
||||||
|
<div class="body">
|
||||||
|
<div class="empty" data-if="con_goods.size == 0">{{ con_goods_note }}</div>
|
||||||
|
<div class="row con" data-for="r : con_goods" data-class-selected="r.selected" data-action="con-good" data-attr-data-arg="r.key">
|
||||||
|
<img class="ci" data-if="r.icon != ''" data-attr-src="r.icon"/><span class="c1">{{ r.a }}</span><span class="c2">{{ r.b }}</span><span class="c3">{{ r.c }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="amount">
|
||||||
|
<span class="label">Amount</span>
|
||||||
|
<input class="range" type="range" min="1" step="1" data-attr-max="amount_max" data-value="amount"/>
|
||||||
|
<span class="v">{{ amount_text }}</span>
|
||||||
|
<div class="btn" data-action="amount-max">Max</div>
|
||||||
|
<div class="btn primary" data-action="con-add">Add to bundle</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="colm side con-form">
|
||||||
|
<div class="con-head">
|
||||||
|
<div class="btn" data-class-primary="con_kind == 0" data-action="con-kind" data-arg="0">Item exchange<div class="tip">Sell the bundle (and credits) for a price - or give it to a pilot.</div></div>
|
||||||
|
<div class="btn" data-class-primary="con_kind == 1" data-action="con-kind" data-arg="1">Courier<div class="tip">Have the bundle carried to another of your depots.</div></div>
|
||||||
|
</div>
|
||||||
|
<div class="col-h"><h3>Bundle</h3><span class="hint">{{ con_bundle_count }}</span></div>
|
||||||
|
<div class="table" style="height: 140dp; margin-bottom: 8dp;">
|
||||||
|
<div class="body">
|
||||||
|
<div class="empty" data-if="con_bundle.size == 0">Empty - add items from your depots.</div>
|
||||||
|
<div class="row con" data-for="r : con_bundle" data-class-selected="r.selected" data-action="con-bundle-pick" data-attr-data-arg="r.key">
|
||||||
|
<img class="ci" data-if="r.icon != ''" data-attr-src="r.icon"/><span class="c1">{{ r.a }}</span><span class="c2">{{ r.b }}</span><span class="c3">{{ r.c }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="namefield"><span class="label">Title</span><input class="text" type="text" data-value="con_title_in" maxlength="60"/></div>
|
||||||
|
<div data-if="con_kind == 0">
|
||||||
|
<div class="namefield"><span class="label">Price</span><input class="text" type="text" data-value="con_price" maxlength="12"/></div>
|
||||||
|
<div class="namefield"><span class="label">+ Credits</span><input class="text" type="text" data-value="con_credits" maxlength="12"/></div>
|
||||||
|
<div class="namefield"><span class="label">Only for</span><input class="text" type="text" data-value="con_for" maxlength="30"/></div>
|
||||||
|
</div>
|
||||||
|
<div data-if="con_kind == 1">
|
||||||
|
<div class="table" style="height: 90dp; margin-bottom: 8dp;">
|
||||||
|
<div class="head"><span class="c1">Goal (your depot)</span></div>
|
||||||
|
<div class="body">
|
||||||
|
<div class="empty" data-if="con_goals.size == 0">You have no other depot.</div>
|
||||||
|
<div class="row" data-for="r : con_goals" data-class-selected="r.selected" data-action="con-goal" data-attr-data-arg="r.key"><span class="c1">{{ r.a }}</span></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="namefield"><span class="label">Reward</span><input class="text" type="text" data-value="con_reward" maxlength="12"/></div>
|
||||||
|
<div class="namefield"><span class="label">Collateral</span><input class="text" type="text" data-value="con_coll" maxlength="12"/></div>
|
||||||
|
<div class="namefield"><span class="label">Insured</span><input class="text" type="text" data-value="con_ins" maxlength="12"/></div>
|
||||||
|
</div>
|
||||||
|
<div class="namefield"><span class="label">Days</span><input class="text" type="text" data-value="con_days" maxlength="2"/></div>
|
||||||
|
<div class="hint" style="margin-bottom: 8dp;">{{ con_create_info }}</div>
|
||||||
|
<div class="actions">
|
||||||
|
<div class="btn primary" data-action="con-post">Post contract</div>
|
||||||
|
<div class="btn" data-action="con-remove">Remove<div class="tip">Takes the picked item out of the bundle.</div></div>
|
||||||
|
<div class="btn" data-action="con-clear">Clear</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- ================================================= COURIERS -->
|
<!-- ================================================= COURIERS -->
|
||||||
<div class="page" data-if="blocked == 0 && page == 8">
|
<div class="page" data-if="blocked == 0 && page == 8">
|
||||||
<div class="colm gap">
|
<div class="colm gap">
|
||||||
|
|||||||
Reference in New Issue
Block a user