Название вашего журнала (quwiero) wrote in changelog,
Название вашего журнала
quwiero
changelog

[ljcom] r13083: LJSUP-14473: Admin pages' style and code...

Committer: sboronchiev
LJSUP-14473: Admin pages' style and code refactoring
U   trunk/cgi-bin/LJ/Widget/WalletHistory.pm
U   trunk/htdocs/admin/accounts/paiddetails.bml
U   trunk/htdocs/admin/accounts/paidsearch.bml
U   trunk/htdocs/admin/accounts/wallet-history.bml
U   trunk/htdocs/admin/sendmail/query.bml
Modified: trunk/cgi-bin/LJ/Widget/WalletHistory.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/WalletHistory.pm	2012-12-27 14:26:19 UTC (rev 13082)
+++ trunk/cgi-bin/LJ/Widget/WalletHistory.pm	2012-12-28 08:38:59 UTC (rev 13083)
@@ -115,7 +115,7 @@
         '';
 
     my $ret = qq{
-        <table>
+        <table class='b-admin-table'>
             <thead>
                 <tr>
                     <th>$BML::ML{'.heading.date'}</th>

Modified: trunk/htdocs/admin/accounts/paiddetails.bml
===================================================================
--- trunk/htdocs/admin/accounts/paiddetails.bml	2012-12-27 14:26:19 UTC (rev 13082)
+++ trunk/htdocs/admin/accounts/paiddetails.bml	2012-12-28 08:38:59 UTC (rev 13083)
@@ -1,4 +1,6 @@
-<html><head>
+<!DOCTYPE html>
+<html>
+<head>
 <title>Paid Details</title>
 <style>
     h1 { font-size: 20pt; }
@@ -14,7 +16,13 @@
         width: 400px;
     }
 </style>
-</head><body>
+
+<link rel="stylesheet" href="/stc/lj_base.css?v=">
+<link rel="stylesheet" href="/stc/admin/general.css?v=">
+
+</head>
+<body>
+<div class="b-adminpage b-adminpage-list b-adminpage-max">
 <?_code
 {
 
@@ -221,7 +229,7 @@
 
         $ret .= "<h1>Authorize.net Transaction Log</h1>";
 
-        $ret .= "<table border='1' cellpadding='2'><tr>";
+        $ret .= "<table class='b-admin-table'><tr>";
         foreach (qw(date/ip cmd amt result extra)) {
             $ret .= "<td><b>$_</b></td>";
         }
@@ -325,4 +333,6 @@
  
 }
 _code?>
-</body></html>
+</div>
+</body>
+</html>

Modified: trunk/htdocs/admin/accounts/paidsearch.bml
===================================================================
--- trunk/htdocs/admin/accounts/paidsearch.bml	2012-12-27 14:26:19 UTC (rev 13082)
+++ trunk/htdocs/admin/accounts/paidsearch.bml	2012-12-28 08:38:59 UTC (rev 13083)
@@ -150,7 +150,7 @@
             $usedmailed = "Unpaid! Still in cart!";
         }
         
-        $ret .= "<TR VALIGN=TOP><TD ALIGN=CENTER><A HREF=\"paiddetails.bml?payid=$row->{'payid'}&userid=$row->{'userid'}\">#$row->{'payid'}</A></TD><TD><B><A HREF=\"/userinfo.bml?user=$row->{'user'}\">$row->{'user'}</A></B></TD><TD>$row->{'datesent'}<BR>$row->{'daterecv'}</TD><TD ALIGN=RIGHT>$amount</TD><TD ALIGN=RIGHT>$row->{'months'}</TD><TD ALIGN=CENTER>$usedmailed</TD><TD>$row->{'method'}</TD></TR>";
+        $ret .= "<tr><td><a target=\"_blank\" href=\"paiddetails.bml?payid=$row->{'payid'}&userid=$row->{'userid'}\">#$row->{'payid'}</a></td><td><b><a target=\"_blank\" href=\"/userinfo.bml?user=$row->{'user'}\">$row->{'user'}</a></b></td><td>$row->{'datesent'}<br>$row->{'daterecv'}</td><td>$amount</td><td>$row->{'months'}</td><td>$usedmailed</td><td>$row->{'method'}</td></tr>";
     }
     $ret .= "</table>\n";
 

Modified: trunk/htdocs/admin/accounts/wallet-history.bml
===================================================================
--- trunk/htdocs/admin/accounts/wallet-history.bml	2012-12-27 14:26:19 UTC (rev 13082)
+++ trunk/htdocs/admin/accounts/wallet-history.bml	2012-12-28 08:38:59 UTC (rev 13083)
@@ -157,37 +157,43 @@
     );
 
     my $form = qq{
-        <form class="b-adminpage-form" action="" method="get">
+        <form class="b-adminpage-header" action="" method="get">
             $hidden
-            <table class="b-admin-table">
+            <table class="b-form-table-layout">
                 <tr>
-                    <td>
+                    <td class="b-form-table-layout-cell">
                         $ML{'.label.mintime'}
+                    </td>
+                    <td class="b-form-table-layout-cell">
                         $inputs{'mintime'}
                     </td>
-                    <td>
+                    <td class="b-form-table-layout-cell">
                         $ML{'.label.maxtime'}
+                    </td>
+                    <td class="b-form-table-layout-cell">
                         $inputs{'maxtime'}
                     </td>
-                    <td>
+                    <td class="b-form-table-layout-cell">
                         $checkboxes{'sup'}
                     </td>
-                    <td>
+                    <td class="b-form-table-layout-cell">
                         $checkboxes{'paid'}
                     </td>
-                    <td rowspan="2">
+                    <td class="b-form-table-layout-cell" rowspan="2">
                         $btn_submit
                     </td>
                 </tr>
                 <tr>
-                    <td colspan="2">
+                    <td class="b-form-table-layout-cell">
                         <label for="username">$ML{'.label.username'}</label>
+                    </td>
+                    <td class="b-form-table-layout-cell" colspan="3">
                         $inputs{'username'}
                     </td>
-                    <td>
+                    <td class="b-form-table-layout-cell">
                         $checkboxes{'nonsup'}
                     </td>
-                    <td>
+                    <td class="b-form-table-layout-cell">
                         $checkboxes{'nonpaid'}
                     </td>
                     
@@ -223,18 +229,9 @@
 
     return qq{
         <div class="b-adminpage">
-            <table class="b-admin-table">
-                <tr>
-                    <td>
-                        $form
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        $widget
-                    </td>
-                </tr>
-            </table>
+            $form
+
+            $widget
         </div>
     };
 }

Modified: trunk/htdocs/admin/sendmail/query.bml
===================================================================
--- trunk/htdocs/admin/sendmail/query.bml	2012-12-27 14:26:19 UTC (rev 13082)
+++ trunk/htdocs/admin/sendmail/query.bml	2012-12-28 08:38:59 UTC (rev 13083)
@@ -101,7 +101,7 @@
          $ret .= LJ::bad_input('You are not authorized to view this message');
      }
  } else {
-     $ret .= "<div class='b-adminpage b-adminpage-wide'>\n";
+     $ret .= "<div class='b-adminpage b-adminpage-list b-adminpage-max'>\n";
      $ret .= '<form method="GET" action="query.bml">';
      $ret .= '<input type="hidden" name="mode" value="list" />';
 
@@ -207,8 +207,8 @@
                  }
                  $row_html .= "<td>$row->{'status'}</td>";
                  $row_html .= "<td>$row->{'type'}</td>";
-                 $row_html .= "<td>$row->{'timesent'}</td><td>$row->{'mailto'}</td>";
-                 $row_html .= "<td>$row->{'subject'}</td></tr>";
+                 $row_html .= "<td class=\'b-nowrap\'>$row->{'timesent'}</td><td>$row->{'mailto'}</td>";
+                 $row_html .= "<td class=\'b-nowrap\'>$row->{'subject'}</td></tr>";
              }
          }
          if ($row_ct eq 0) { $ret .= "<?p No Results Returned p?>"; return $ret; }

Tags: bml, ljcom, pm, quwiero, sboronchiev
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments