init

janfaracik · Jan 4, 2024 · 4341e57 · 4341e57
1 parent 2dd9e32
commit 4341e57
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 29 deletions.
diff --git a/core/src/main/resources/hudson/model/Computer/builds.jelly b/core/src/main/resources/hudson/model/Computer/builds.jelly
@@ -28,12 +28,11 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <l:breadcrumb title="${%Build History}" />
     <l:main-panel>
-      <h1>
-        ${%title(it.displayName)}
-      </h1>
-      <p>
-        <em>${%disclaimer}</em>
-      </p>
+      <l:app-bar title="${%title(it.displayName)}">
+        <t:rssBar />
+      </l:app-bar>
+
+      <p class="jenkins-description">${%disclaimer}</p>
 
       <t:buildListTable builds="${it.builds}"/>
     </l:main-panel>

diff --git a/core/src/main/resources/hudson/model/User/builds.jelly b/core/src/main/resources/hudson/model/User/builds.jelly
@@ -27,9 +27,9 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <l:breadcrumb title="${%Builds}" />
     <l:main-panel>
-      <h1>
-        ${%title(it)}
-      </h1>
+      <l:app-bar title="${%title(it)}">
+        <t:rssBar />
+      </l:app-bar>
 
       <t:buildListTable builds="${it.builds}"/>
     </l:main-panel>

diff --git a/core/src/main/resources/hudson/model/View/builds.jelly b/core/src/main/resources/hudson/model/View/builds.jelly
@@ -29,13 +29,9 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <l:breadcrumb title="${%Build History}" />
     <l:main-panel>
-      <div class="jenkins-app-bar">
-        <div class="jenkins-app-bar__content">
-          <h1>
-            ${%buildHistory(it.class.name=='hudson.model.AllView' ? app.displayName : it.displayName)}
-          </h1>
-        </div>
-      </div>
+      <l:app-bar title="${%buildHistory(it.class.name=='hudson.model.AllView' ? app.displayName : it.displayName)}">
+        <t:rssBar />
+      </l:app-bar>
 
       <t:buildListTable builds="${it.builds}"/>
     </l:main-panel>

diff --git a/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs.jelly b/core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs.jelly
@@ -24,13 +24,15 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <!-- view tab bar -->
-  <l:tabBar>
-    <j:forEach var="v" items="${it.sort(views)}">
-      <l:tab name="${v.displayName}" active="${v==currentView}" href="${rootURL}/${v.url}" />
-    </j:forEach>
-    <j:if test="${currentView.hasPermission(currentView.CREATE)}">
-      <l:tabNewItem href="${rootURL}/${currentView.owner.url}newView" title="${%New View}" />
-    </j:if>
-  </l:tabBar>
+  <div style="display: grid; grid-template-columns: 1fr auto; align-items: center">
+    <l:tabBar>
+      <j:forEach var="v" items="${it.sort(views)}">
+        <l:tab name="${v.displayName}" active="${v==currentView}" href="${rootURL}/${v.url}" />
+      </j:forEach>
+      <j:if test="${currentView.hasPermission(currentView.CREATE)}">
+        <l:tabNewItem href="${rootURL}/${currentView.owner.url}newView" title="${%New View}" />
+      </j:if>
+    </l:tabBar>
+    <t:rssBar/>
+  </div>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly
@@ -39,7 +39,6 @@ THE SOFTWARE.
     <l:icon src="symbol-status-disabled" id="disabled" />
     <l:icon src="symbol-terminal" id="console" />
   </template>
-
   <t:setIconSize/>
   <st:adjunct includes="hudson.model.Job.buildTimeTrend_resources" />
   <j:new var="handler" className="jenkins.widgets.BuildListTable"/>
@@ -60,5 +59,5 @@ THE SOFTWARE.
     </thead>
     <tbody></tbody>
   </table>
-  <t:rssBar-with-iconSize/>
+  <t:iconSize></t:iconSize>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -84,7 +84,7 @@ THE SOFTWARE.
             <t:projectViewRow jobBaseUrl="${relativeLinkToJob.substring(0, relativeLinkToJob.length() - job.shortUrl.length())}"/>
           </j:forEach>
         </table>
-        <t:iconSize><t:rssBar/></t:iconSize>
+        <t:iconSize />
       </div>
 
       <div class="jenkins-jobs-list jenkins-mobile-show">

diff --git a/core/src/main/resources/lib/hudson/rssBar.jelly b/core/src/main/resources/lib/hudson/rssBar.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:dd="/lib/layout/dropdowns" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
   <div id="rss-bar" class="jenkins-buttons-row jenkins-buttons-row--invert">
-    <l:overflowButton clazz="jenkins-button--tertiary">
+    <l:overflowButton>
       <dd:item icon="symbol-information-circle" id="button-icon-legend" text="${%Legend}" />
       <dd:separator />
       <dd:submenu icon="symbol-rss" text="${%Atom feed}">