X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Ftemplate%2Fsystem.software.htm;h=5e27a9318b6f77091abe8abe7fca50631056a0e8;hb=24108a53232127daf90db3b6f798443fa23a4aa3;hp=f34e2c4f4d81011683c0d261cef6a0c31f8bc7b6;hpb=2f0e65dd27549ef4fde5b18588083968a59b66bd;p=project%2Fluci2%2Fui.git

diff --git a/luci2/htdocs/luci2/template/system.software.htm b/luci2/htdocs/luci2/template/system.software.htm
index f34e2c4..5e27a93 100644
--- a/luci2/htdocs/luci2/template/system.software.htm
+++ b/luci2/htdocs/luci2/template/system.software.htm
@@ -1,52 +1,71 @@
-<div class="cbi-form" id="tabs" style="display:none">
-	<ul class="cbi-tabmenu">
-		<li><a href="#status"><%:Packages%></a></li>
-		<li><a href="#config"><%:Configuration%></a></li>
-	</ul>
-	<fieldset id="status" class="cbi-section-node">
-		<div class="cbi-value">
-			<label class="cbi-value-title"><%:Used space%></label>
-			<div class="cbi-value-field">
-				<div id="package_space" style="padding-top: 7px"></div>
+<ul class="nav nav-tabs">
+	<li class="active"><a href="#status" data-toggle="tab"><%:Packages%></a></li>
+	<li><a href="#config" data-toggle="tab"><%:Configuration%></a></li>
+</ul>
+
+<div class="tab-content">
+	<div class="tab-pane active" id="status">
+		<div class="form-horizontal">
+			<div class="form-group">
+				<label class="col-lg-2 control-label"><%:Used space%></label>
+				<div class="col-lg-5">
+					<div id="package_space" class="form-control-static"></div>
+				</div>
+				<div class="col-lg-5"></div>
 			</div>
-		</div>
-		<div class="cbi-value">
-			<label class="cbi-value-title"><%:Update package lists%></label>
-			<div class="cbi-value-field">
-				<input id="package_update" type="button" class="cbi-button cbi-button-reload" value="<%:Start update …%>" />
+			<div class="form-group">
+				<label class="col-lg-2 control-label"><%:Update package lists%></label>
+				<div class="col-lg-5">
+					<button id="package_update" type="button" class="btn btn-default"><%:Start update …%></button>
+				</div>
+				<div class="col-lg-5"></div>
 			</div>
-		</div>
-		<div class="cbi-value">
-			<label class="cbi-value-title"><%:Install package directly%></label>
-			<div class="cbi-value-field">
-				<div class="cbi-splitbutton">
-					<input id="package_url" type="text" class="cbi-input-text" placeholder="<%:Enter URL or name …%>"
-					/><img id="package_install" src="<%=resource%>/icons/cbi/apply.gif" class="cbi-button" title="<%:Install …%>" />
+			<div class="form-group">
+				<label class="col-lg-2 control-label"><%:Install package directly%></label>
+				<div class="col-lg-5">
+					<div class="input-group">
+						<input id="package_url" type="text" class="form-control" placeholder="<%:Enter URL or name …%>" />
+						<span class="input-group-btn">
+							<button id="package_install" type="button" class="btn btn-info">»</button>
+						</span>
+					</div>
 				</div>
+				<div class="col-lg-5"></div>
 			</div>
-		</div>
-		<div class="cbi-value">
-			<label class="cbi-value-title"><%:Filter packages%></label>
-			<div class="cbi-value-field">
-				<div class="cbi-splitbutton">
-					<input id="package_filter" type="text" class="cbi-input-text" placeholder="<%:Filter packages …%>"
-					/><img src="<%=resource%>/icons/cbi/find.gif" class="cbi-button" />
+			<div class="form-group">
+				<label class="col-lg-2 control-label"><%:Filter packages%></label>
+				<div class="col-lg-5">
+					<div class="input-group">
+						<input id="package_filter" type="text" class="form-control" placeholder="<%:Filter packages …%>" />
+						<span class="input-group-btn">
+							<button" type="button" class="btn btn-default">×</button>
+						</span>
+					</div>
+					<label><input type="checkbox" id="package_which" style="vertical-align: middle; margin-top: 0" /> <%:Display only installed packages%></label>
 				</div>
-				<label><input type="checkbox" id="package_which" style="vertical-align: middle; margin-top: 0" /> <%:Display only installed packages%></label>
+				<div class="col-lg-5"></div>
 			</div>
 		</div>
 
-		<div>
-			<input id="package_prev" type="button" class="cbi-button" value="« 0 - 0" />
-			<input id="package_next" type="button" class="cbi-button" value="0 - 0 »" />
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<div class="btn-group">
+					<button id="package_prev" type="button" class="btn btn-default">« 0 - 0</button>
+					<button id="package_next" type="button" class="btn btn-default">0 - 0 »</button>
+				</div>
+			</div>
+
+			<div class="panel-body" id="package_table"></div>
 		</div>
+	</div>
 
-		<div id="package_table"></div>
-	</fieldset>
-	<div id="config">
-		<textarea style="width:100%"></textarea>
-		<div class="cbi-page-actions">
-			<input class="cbi-button cbi-button-save" type="button" value="<%:Save%>" />
+	<div class="tab-pane" id="config">
+		<div class="panel panel-default">
+			<textarea class="form-control"></textarea>
+		</div>
+		<div class="text-right">
+			<button class="btn btn-primary" type="button"><%:Save%></button>
 		</div>
 	</div>
+
 </div>