Merge pull request #4 from jeremy-farrance/fixes-and-conversions

Fixes and conversions for 1.09.00 rc2?
jeremy-farrance · Sep 14, 2023 · 42651d9 · 42651d9
2 parents 0a75203 + 461f33d
commit 42651d9
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 392 deletions.
diff --git a/.gitignore b/.gitignore
@@ -221,3 +221,7 @@ $RECYCLE.BIN/
 # DNN Logs
 [Ww]ebsite/[Pp]ortals/_default/[Ll]ogs/
 /MSBuildLog.txt
+
+# these get compiled now from Module.scss
+/Modules/UserManager/Module.css
+/Modules/UserManager/Module.min.css
diff --git a/Modules/UserManager/App_LocalResources/Index.resx b/Modules/UserManager/App_LocalResources/Index.resx
@@ -189,4 +189,7 @@
   <data name="Users.Text" xml:space="preserve">
     <value>Users</value>
   </data>
+  <data name="UserStatus.Text" xml:space="preserve">
+    <value>Status</value>
+  </data>
 </root>
diff --git a/Modules/UserManager/Module.css b/Modules/UserManager/Module.css
diff --git a/Modules/UserManager/Views/RolesManage/Index.cshtml b/Modules/UserManager/Views/RolesManage/Index.cshtml
@@ -94,8 +94,8 @@
                         </a>
                 </th>
                 <th>@Localization.GetString("Users", @ResourceFile)</th>
-                <th style="text-align:center">@Localization.GetString("Auto", @ResourceFile)</th>
-                <th style="text-align:center">@Localization.GetString("Actions", @ResourceFile)</th>
+                <th class="text-center">@Localization.GetString("Auto", @ResourceFile)</th>
+                <th class="text-center">@Localization.GetString("Actions", @ResourceFile)</th>
             </tr>
         </thead>
         <tbody>